impaktapps-ui-builder 1.0.111 → 1.0.113

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

@@ -1,4 +1,4 @@
-import _, { isObject, mapKeys } from "lodash";
+import _ from "lodash";
 import { handlersProps } from "./interface";
 export const executeEvents = (params: handlersProps) => {
   let nextEvent = [];
@@ -68,7 +68,8 @@ function executeEventsHandler(params: handlersProps) {
       params.componentName,
       params.config,
       params.store,
-      params.formDataHolder,
+      params.service,
+      params.formDataHolder
     );
   } else if (params.config.Handler === "onBackHandler") {
     return params.store.functionParameters?.handleBack();
@@ -143,7 +144,8 @@ function executeCustomHandler(params: handlersProps) {
   }
 
 }
-function mergeFormdata(handlerResponse: any, componentName: string, eventConfig: any, store: any, formDataHolder: any) {
+
+function mergeFormdata(handlerResponse: any, componentName: string, eventConfig: any, store: any, service: any, formDataHolder: any) {
   if (eventConfig.type === "Select" && handlerResponse?.data) {
     if (!_.isEmpty(handlerResponse?.data)) {
       store.setSchema((pre) => {
@@ -176,30 +178,28 @@ function mergeFormdata(handlerResponse: any, componentName: string, eventConfig:
     }
   }
   else if (eventConfig.type === "page") {
-    if (!(_.isEmpty(handlerResponse?.data) && handlerResponse?.data && isObject(handlerResponse.data))) {
+    if (!(_.isEmpty(handlerResponse?.data) && handlerResponse?.data)) {
       store.newData = {
         ...store.newData,
         ...handlerResponse?.data
       }
-      const keys = Object.keys(handlerResponse.data)
-      keys.map((e) => {
-        formDataHolder[e] = { ...formDataHolder, [e]: handlerResponse.data[e] }
-      })
-
+      store.setFormdata((pre: any) => { return { ...pre, ...handlerResponse?.data } })
     }
   }
   else if (eventConfig.type === "Table" && eventConfig.lazyLoading) {
     if (handlerResponse && handlerResponse?.data) {
       formDataHolder[componentName] = handlerResponse.data?.data
       formDataHolder[`${componentName}_RowCount`] = handlerResponse.data?.meta?.totalRowCount
+      store.setFormdata((pre) => { return { ...pre, ...formDataHolder } });
     }
   }
   else {
     if (handlerResponse) {
       formDataHolder[componentName] = handlerResponse.data
+      store.setFormdata((pre) => { return { ...pre, ...formDataHolder } });
     }
   }
-};
+}
 
 const buildBodyFormat = (body: any[], formData: any, userValue: any, store: any) => {
   let finalBody = { ...userValue?.payload };

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

@@ -1,5 +1,5 @@
 import _, { isEmpty } from "lodash";
-import { downloadFileFromUrl, downloadFile } from "./downloadFile";
+import { doDownload, downloadFile } from "./downloadFile";
 import { executeEvents, executeRefreshHandler } from "./events";
 import { handlersProps } from "./interface";
 let compType: string;
@@ -62,11 +62,11 @@ export const extractEvents = (eventConfig: any) => {
   return eventGroups;
 };
 export default (funcParams: funcParamsProps) => {
-  const formDataHolder = {};
+  const formDataHolder = {}
   let executeEventsParameters: handlersProps = {
     config: {}, componentName: "",
     store: funcParams.store, dynamicData: funcParams.dynamicData, userValue: funcParams.userValue, service: funcParams.service,
-    serviceHolder: { downloadFile, download: downloadFileFromUrl, ...funcParams.functionsProvider }, eventGroups,
+    serviceHolder: { downloadFile, download: doDownload, ...funcParams.functionsProvider }, eventGroups,
     functionsProvider: funcParams.functionsProvider, formDataHolder
   };
   return {
@@ -90,7 +90,7 @@ export default (funcParams: funcParamsProps) => {
         config: {}, componentName: "",
         store: funcParams.store, dynamicData: funcParams.dynamicData, userValue: funcParams.userValue, service: funcParams.service,
         functionsProvider: funcParams.functionsProvider,
-        serviceHolder: this, eventGroups, formDataHolder,
+        serviceHolder: this, eventGroups, formDataHolder
       }
 
       funcParams.store.setSchema(
@@ -104,33 +104,31 @@ export default (funcParams: funcParamsProps) => {
       await executeRefreshHandler({
         config: {}, componentName: "",
         store: funcParams.store, dynamicData: funcParams.dynamicData, userValue: funcParams.userValue, service: funcParams.service,
-        serviceHolder: this, eventGroups, formDataHolder: formDataHolder
+        serviceHolder: this, eventGroups, formDataHolder: {}
       })
-      funcParams.store.setFormdata((pre) => ({ ...pre, ...formDataHolder }))
+  
       uiSchema.elements.push(notifyUiSchema);
       funcParams.store.setUiSchema(uiSchema);
     },
     onCellRenderer: (cellParams) => {
-      const cloneEventGroup = _.cloneDeep(eventGroups)
-      if (cloneEventGroup.onCellRenderer) {
+      if (eventGroups.onCellRenderer) {
         let finalResponse = {};
         const path = funcParams.dynamicData?.tableButtonPath || funcParams?.dynamicData?.path?.split(".")[0];
-        if (cloneEventGroup?.onCellRenderer?.[path]) {
-          for (const eventConfig of cloneEventGroup?.onCellRenderer?.[path]) {
-            executeEventsParameters.store.functionParameters = cellParams
-            finalResponse = executeEvents({
-              ...executeEventsParameters,
-              config: eventConfig,
-              componentName: path
-            })
-          }
-          return finalResponse
+
+        for (const eventConfig of eventGroups?.onCellRenderer?.[path]) {
+          executeEventsParameters.store.functionParameters = cellParams
+          finalResponse = executeEvents({
+            ...executeEventsParameters,
+            config: eventConfig,
+            componentName: path
+          })
         }
+        return finalResponse
       }
       return {}
     },
-    onClick: async function () {
-      await this.callHandler("onClick")
+    onClick: function () {
+      this.callHandler("onClick")
     },
     onKeyDown: function () {
       this.callHandler("onKeyDown")
@@ -167,7 +165,7 @@ export default (funcParams: funcParamsProps) => {
         { key: "sorting", value: paginationValues.sorting || [] },
         { key: "filters", value: paginationValues.tableColumnConfig || [] },
         { key: "globalFilter", value: paginationValues.globalFilter ?? '' },
-        { key: "expandedRowIds", value: paginationValues.expandedRowIds ?? [] }
+        { key: "expandedRowIds", value: paginationValues.expandedRowIds ?? []}
       ]
       const response = await this.callExecuteEvents(paginationValues, apiBody, "onLoad");
       return response?.data;
@@ -232,14 +230,14 @@ export default (funcParams: funcParamsProps) => {
     },
     onNext: async function (functionParameters) {
       const path = funcParams.dynamicData?.tableButtonPath || funcParams.dynamicData.path.split(".")[0];
-       await this.callHandler("onNext", functionParameters)
+      await this.callHandler("onNext", functionParameters)
       if (eventGroups?.["onNext"]?.[path] === undefined) {
         functionParameters?.handleNext()
       }
     },
     onReset: async function (functionParameters) {
       const path = funcParams.dynamicData?.tableButtonPath || funcParams.dynamicData.path.split(".")[0];
-      this.callHandler("onReset", functionParameters)
+      await this.callHandler("onReset", functionParameters)
       if (eventGroups?.["onReset"]?.[path] === undefined) {
         functionParameters?.handleReset()
       }
@@ -247,29 +245,18 @@ export default (funcParams: funcParamsProps) => {
     callHandler: async 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(async (eventConfig) => {
+        Promise.all(eventGroups?.[eventType]?.[path].map((eventConfig) => {
           executeEventsParameters.store.functionParameters = functionParameters
-          if (eventConfig.Handler === "refresh") {
-            await executeRefreshHandler({
-              ...executeEventsParameters,
-              config: eventConfig,
-              componentName: path,
-              formDataHolder: formDataHolder
-            })
-            funcParams.store.setFormdata((pre) => ({ ...pre, ...formDataHolder }));
-
-          } else {
-            executeEvents({
-              ...executeEventsParameters,
-              config: eventConfig,
-              componentName: path
-            })
-          }
+          executeEvents({
+            ...executeEventsParameters,
+            config: eventConfig,
+            componentName: path
+          })
         }))
       }
     },
     downloadFile: downloadFile,
-    downloadFileFromUrl: downloadFileFromUrl,
+    download: doDownload,
     ...funcParams.functionsProvider
   };
 };