fixed required property application on multilang fields

irontec · Jan 29, 2024 · 4a5e49e · 4a5e49e
1 parent 5dda194
commit 4a5e49e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/demo/src/entities/Feature/Feature.tsx b/demo/src/entities/Feature/Feature.tsx
@@ -14,7 +14,7 @@ const properties: FeatureProperties = {
   name: {
     label: _('Name'),
     multilang: true,
-    required: true,
+    required: false,
   },
 };
 

diff --git a/library/src/entities/DefaultEntityBehavior/Validator.ts b/library/src/entities/DefaultEntityBehavior/Validator.ts
@@ -26,7 +26,8 @@ const validator: EntityValidator = (
       continue;
     }
 
-    if (!validateEmbeddables && idx.indexOf('.') > 0) {
+    const isSubproperty = idx.indexOf('.') > 0;
+    if (!validateEmbeddables && isSubproperty) {
       continue;
     }
 
@@ -53,7 +54,15 @@ const validator: EntityValidator = (
       continue;
     }
 
-    const required = (properties[idx] as ScalarProperty)?.required;
+    let isRootPropertyRequired: undefined | boolean;
+    if (isSubproperty) {
+      const parentIdx = idx.substring(0, idx.lastIndexOf('.'));
+      const rootProperty = properties[parentIdx];
+      isRootPropertyRequired = rootProperty?.required;
+    }
+
+    const required =
+      isRootPropertyRequired ?? (properties[idx] as ScalarProperty)?.required;
     const pattern: RegExp | undefined = (properties[idx] as ScalarProperty)
       ?.pattern;
     if (pattern && !(values[idx] + '').match(pattern)) {

diff --git a/library/src/services/form/Field/Multilang.tsx b/library/src/services/form/Field/Multilang.tsx
@@ -52,7 +52,8 @@ const Multilang: React.FC<MultilangPropsInterface> = (props): JSX.Element => {
             const property = properties[name] as ScalarProperty;
             const multiline = property.format === 'textarea';
             const required =
-              rootProperty.required || property?.required || false;
+              rootProperty.required ?? property?.required ?? false;
+
             const touched =
               formik?.touched[_columnName] &&
               (formik?.touched[_columnName] as Record<string, boolean>)[locale];