impaktapps-ui-builder 1.0.135 → 1.0.137

package/src/impaktapps-ui-builder/runtime/services/service.ts

@@ -183,28 +183,39 @@ export default (funcParams: funcParamsProps) => {
         return response?.data;
       }
     },
-    onChange: async function () {
-      if (eventGroups.onChange) {
-        const ChangeEventsKeysArray = Object.keys(eventGroups.onChange);
-        Promise.all(ChangeEventsKeysArray.map(async (componentName: string) => {
-          if (
-            funcParams.store?.formData[componentName] !== funcParams.store.newData[componentName] &&
-            funcParams.store?.newData[componentName] !== undefined
-          ) {
-            for (const eventConfig of eventGroups.onChange[componentName]) {
-              await executeEvents({
-                ...executeEventsParameters,
-                config: eventConfig,
-                componentName,
-                formDataHolder
-              })
-              if (eventConfig.Handler === "refresh") {
-                funcParams.store.setFormdata((pre) => ({ ...pre, ...formDataHolder }));
-              }
+    onChange: function () {
+      if (!eventGroups.onChange) return;
+
+      const ChangeEventsKeysArray = Object.keys(eventGroups.onChange);
+
+      const promises = ChangeEventsKeysArray.flatMap((componentName: string) => {
+        if (
+          funcParams.store?.formData[componentName] === funcParams.store.newData[componentName] ||
+          funcParams.store?.newData[componentName] === undefined
+        ) {
+          return [];
+        }
+
+        return eventGroups.onChange[componentName].map(eventConfig =>
+          Promise.resolve(
+            executeEvents({
+              ...executeEventsParameters,
+              config: eventConfig,
+              componentName,
+              formDataHolder
+            })
+          ).then(() => {
+            if (!isEmpty(formDataHolder)) {
+              funcParams.store.setFormdata(pre => ({
+                ...pre,
+                ...formDataHolder
+              }));
             }
-          }
-        }))
-      }
+          })
+        );
+      });
+
+      Promise.allSettled(promises);
     },
     callExecuteEvents: async function (paramValue, apiBody, eventType: string) {
       let LastCallResponse = undefined;
@@ -250,28 +261,33 @@ export default (funcParams: funcParamsProps) => {
       }
     },
     callHandler: function (eventType: string, functionParameters?: any) {
-      const path = funcParams.dynamicData?.tableButtonPath || funcParams.dynamicData.path.split(".")[funcParams.dynamicData.path.split(".").length - 1];
-      if (eventGroups?.[eventType]?.[path] !== undefined) {
-        (eventGroups?.[eventType]?.[path].map((eventConfig) => {
-          executeEventsParameters.store.functionParameters = functionParameters
-          if (eventConfig.Handler === "refresh") {
-            executeEvents({
-              ...executeEventsParameters,
-              config: eventConfig,
-              componentName: path,
-              formDataHolder: formDataHolder
-            }).then((res) => {
-              funcParams.store.setFormdata((pre) => ({ ...pre, ...formDataHolder }));
-            });
-          } else {
-            executeEvents({
-              ...executeEventsParameters,
-              config: eventConfig,
-              componentName: path
-            })
+      const path =
+        funcParams.dynamicData?.tableButtonPath ||
+        funcParams.dynamicData.path.split(".").pop();
+
+      if (!eventGroups?.[eventType]?.[path]) return;
+
+      const promises = eventGroups[eventType][path].map(eventConfig => {
+        executeEventsParameters.store.functionParameters = functionParameters;
+
+        return Promise.resolve(
+          executeEvents({
+            ...executeEventsParameters,
+            config: eventConfig,
+            componentName: path,
+            formDataHolder
+          })
+        ).then(() => {
+          if (!isEmpty(formDataHolder)) {
+            funcParams.store.setFormdata(pre => ({
+              ...pre,
+              ...formDataHolder
+            }));
           }
-        }))
-      }
+        });
+      });
+
+      Promise.allSettled(promises);
     },
     downloadFile: downloadFile,
     downloadFileFromUrl: downloadFileFromUrl,