impaktapps-ui-builder 1.0.116 → 1.0.118

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "impaktapps-ui-builder",
-    "version": "1.0.116",
+    "version": "1.0.118",
     "scripts": {
         "dev": "vite",
         "build": "tsc && vite build",

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

@@ -181,11 +181,9 @@ function mergeFormdata(handlerResponse: any, componentName: string, eventConfig:
         ...store.newData,
         ...handlerResponse?.data
       }
-      const keys = Object.keys(handlerResponse.data)
-      keys.map((e) => {
-        formDataHolder[e] =  handlerResponse.data[e] 
+      Object.keys(handlerResponse.data).forEach((e) => {
+        formDataHolder[e] = handlerResponse.data[e]
       })
-
     }
   }
   else if (eventConfig.type === "Table" && eventConfig.lazyLoading) {
@@ -195,7 +193,7 @@ function mergeFormdata(handlerResponse: any, componentName: string, eventConfig:
     }
   }
   else {
-    if (handlerResponse) {
+    if (handlerResponse?.data) {
       formDataHolder[componentName] = handlerResponse.data
     }
   }

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

@@ -192,14 +192,23 @@ export default (funcParams: funcParamsProps) => {
             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 }));
+                await executeEvents({
+                  ...executeEventsParameters,
+                  config: eventConfig,
+                  componentName,
+                  formDataHolder: formDataHolder
+                })
+                if (!isEmpty(formDataHolder)) {
+                  funcParams.store.setFormdata((pre) => ({ ...pre, ...formDataHolder }));
+                }
+              } else {
+                await executeEvents({
+                  ...executeEventsParameters,
+                  config: eventConfig,
+                  componentName,
+                })
               }
             }
           }
@@ -254,21 +263,14 @@ export default (funcParams: funcParamsProps) => {
       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
-            })
+          executeEvents({
+            ...executeEventsParameters,
+            config: eventConfig,
+            componentName: path,
+            formDataHolder: formDataHolder
+          })
+          if (!isEmpty(formDataHolder)) {
+            funcParams.store.setFormdata((pre) => ({ ...pre, ...formDataHolder }));
           }
         }))
       }