Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-23 00:48:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Activate component property validation in viewer as well (#513)

Browse source
This commit is contained in:
Sherfin Shamsudeen 2024-07-17 15:29:47 +05:30 committed by Kavin Venkatachalam
parent 9637d561fb
commit f3ef465074
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
frontend/src/Editor/Middlewares/HydrateWithResolveReferences.jsx
View file

@ -28,19 +28,17 @@ const HydrateWithResolveReferences = ({ id, mode, component, customResolvables,
const resolvedGeneralStyles = resolveGeneralStyles(component, {}, null, customResolvables);
const [validatedProperties, propertyErrors] =
mode === 'edit' && component.validate
? validateProperties(resolvedProperties, componentMeta.properties)
: [resolvedProperties, []];
const [validatedProperties, propertyErrors] = component.validate
? validateProperties(resolvedProperties, componentMeta.properties)
: [resolvedProperties, []];
if (shouldAddBoxShadowAndVisibility.includes(component.component)) {
validatedProperties.visibility = validatedProperties.visibility !== false ? true : false;
}
const [validatedStyles, styleErrors] =
mode === 'edit' && component.validate
? validateProperties(resolvedStyles, componentMeta.styles)
: [resolvedStyles, []];
const [validatedStyles, styleErrors] = component.validate
? validateProperties(resolvedStyles, componentMeta.styles)
: [resolvedStyles, []];
if (!shouldAddBoxShadowAndVisibility.includes(component.component)) {
validatedStyles.visibility = validatedStyles.visibility !== false ? true : false;
@ -50,10 +48,9 @@ const HydrateWithResolveReferences = ({ id, mode, component, customResolvables,
? validateProperties(resolvedGeneralProperties, componentMeta.general)
: [resolvedGeneralProperties, []];
const [validatedGeneralStyles, generalStylesErrors] =
mode === 'edit' && component.validate
? validateProperties(resolvedGeneralStyles, componentMeta.generalStyles)
: [resolvedGeneralStyles, []];
const [validatedGeneralStyles, generalStylesErrors] = component.validate
? validateProperties(resolvedGeneralStyles, componentMeta.generalStyles)
: [resolvedGeneralStyles, []];
useEffect(() => {
const isEditorReady = useCurrentStateStore.getState().isEditorReady;