impaktapps-ui-builder 1.0.134 → 1.0.135

package/src/impaktapps-ui-builder/builder/elements/UiSchema/Component/uiSchema.ts

@@ -92,67 +92,7 @@ export const componentBasicUiSchema: any = (theme) => {
             },
             {
               type: "Control",
-              scope: "#/properties/proc5",
-              config: {
-                layout: { xs: 6, sm: 6, md: 0, lg: 3 },
-              },
-              options: {
-                widget: "EmptyBox",
-              },
-            },
-             {
-              type: "Control",
-              scope: "#/properties/proc6",
-              config: {
-                layout: { xs: 6, sm: 6, md: 0, lg: 3 },
-              },
-              options: {
-                widget: "EmptyBox",
-              },
-            },
-             {
-              type: "Control",
-              scope: "#/properties/proc7",
-              config: {
-                layout: { xs: 6, sm: 6, md: 0, lg: 3 },
-              },
-              options: {
-                widget: "EmptyBox",
-              },
-            },
-             {
-              type: "Control",
-              scope: "#/properties/proc8",
-              config: {
-                layout: { xs: 6, sm: 6, md: 0, lg: 3 },
-              },
-              options: {
-                widget: "EmptyBox",
-              },
-            },
-             {
-              type: "Control",
-              scope: "#/properties/proc9",
-              config: {
-                layout: { xs: 6, sm: 6, md: 0, lg: 3 },
-              },
-              options: {
-                widget: "EmptyBox",
-              },
-            },
-             {
-              type: "Control",
-              scope: "#/properties/proc10",
-              config: {
-                layout: { xs: 6, sm: 6, md: 0, lg: 3 },
-              },
-              options: {
-                widget: "EmptyBox",
-              },
-            },
-            {
-              type: "Control",
-              scope: "#/properties/proc11",
+              scope: "#/properties/proc",
               config: {
                 layout: { xs: 6, sm: 6, md: 0, lg: 3 },
               },

package/src/impaktapps-ui-builder/builder/services/component.ts

@@ -162,29 +162,22 @@ export function refreshPage(type: string, store: any) {
         },
       },
     }
-    UiSchema.elements[0].elements[0].elements[10] = {
+  }
+  if(parentObj?.type === "LeaderBoard"){
+    UiSchema.elements[0].elements[0].elements[4] = 
+    {
       type: "Control",
-      scope: "#/properties/dateFormat",
+      scope: "#/properties/columnFormat",
       options: {
         widget: "SelectInputField",
       },
       config: {
         layout: { xs: 6, sm: 6, md: 4, lg: 3 },
         main: {
-          label: "Date Time Format",
+          label: "Column Format",
         },
       },
-    }
-    UiSchema.elements[0].elements[0].elements[11] = {
-      type: "Control",
-      scope: "#/properties/emptyBox",
-      options: {
-        widget: "EmptyBox",
-      },
-      config: {
-        layout: { xs: 0, sm: 0, md: 0, lg: 6 },
-      },
-    }
+    };
   }
 
   if (sessionStorage.getItem("copiedConfig") ) {

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

@@ -183,39 +183,28 @@ export default (funcParams: funcParamsProps) => {
         return response?.data;
       }
     },
-    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
-              }));
+    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 }));
+              }
             }
-          })
-        );
-      });
-
-      Promise.allSettled(promises);
+          }
+        }))
+      }
     },
     callExecuteEvents: async function (paramValue, apiBody, eventType: string) {
       let LastCallResponse = undefined;
@@ -261,33 +250,28 @@ export default (funcParams: funcParamsProps) => {
       }
     },
     callHandler: function (eventType: string, functionParameters?: any) {
-      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
-            }));
+      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
+            })
           }
-        });
-      });
-
-      Promise.allSettled(promises);
+        }))
+      }
     },
     downloadFile: downloadFile,
     downloadFileFromUrl: downloadFileFromUrl,