enhanced required attr propagation to multilang fld children

irontec · Jun 29, 2023 · 5a5c582 · 5a5c582
1 parent 0369234
commit 5a5c582
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/library/package.json b/library/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@irontec/ivoz-ui",
-  "version": "1.0.46",
+  "version": "1.0.47",
   "description": "UI library used in ivozprovider",
   "license": "GPL-3.0",
   "main": "index.js",

diff --git a/library/src/entities/DefaultEntityBehavior/Form/useFormHandler.tsx b/library/src/entities/DefaultEntityBehavior/Form/useFormHandler.tsx
@@ -77,10 +77,16 @@ const useFormHandler = (props: UseFormHandlerProps): useFormikType => {
 
       for (const name in allProperties) {
         if (name.includes('.')) {
-          const rootProperty = name.split('.').shift();
-          if (rootProperty && !visibleFields.includes(rootProperty)) {
+          const rootPropertyName = name.split('.').shift() || '';
+          if (!visibleFields.includes(rootPropertyName)) {
             continue;
           }
+
+          const rootProperty = allProperties[rootPropertyName];
+
+          if (rootProperty?.required) {
+            allProperties[name].required = true;
+          }
         } else {
           if (!visibleFields.includes(name)) {
             continue;

diff --git a/library/src/services/entity/EntityService.ts b/library/src/services/entity/EntityService.ts
@@ -56,12 +56,12 @@ export default class EntityService<T extends IvozStoreState = IvozStoreState> {
 
   // All API spec properties + properties declared in entity
   public getAllProperties(): PropertyList {
-    const response = this.properties;
-    const properties = this.entityConfig.properties;
+    const response = { ...this.properties };
+    const entityProperties = this.entityConfig.properties;
 
-    for (const idx in properties) {
-      const propertyOverwrite = properties[idx] || {};
-      const label = properties[idx].label || '';
+    for (const idx in entityProperties) {
+      const propertyOverwrite = entityProperties[idx] || {};
+      const label = entityProperties[idx].label || '';
 
       response[idx] = {
         ...this.properties[idx],