impaktapps-ui-builder 1.0.107 → 1.0.108

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

@@ -27,7 +27,7 @@ declare const _default: (funcParams: funcParamsProps) => {
     onBack: (functionParameters: any) => Promise<void>;
     onNext: (functionParameters: any) => Promise<void>;
     onReset: (functionParameters: any) => Promise<void>;
-    callHandler: (eventType: string, functionParameters?: any) => Promise<void>;
+    callHandler: (eventType: string, functionParameters?: any) => void;
     downloadFile: typeof downloadFile;
     downloadFileFromUrl: (response: any, service: any) => void;
 };

package/package.json

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

package/src/impaktapps-ui-builder/builder/build/buildCard.ts

@@ -7,9 +7,9 @@ export const buildCard = (config,componentScope,store) =>{
     if (config.style) {
       card.config.wrapperStyle = JSON.parse(config.style)
     }
-    card.elements[0].elements[0].elements[0].elements[1].scope = `#/properties/${config.name}/properties/value`
-    card.elements[1].scope = `#/properties/${config.name}/properties/url`
-    card.elements[0].elements[0].elements[1].scope = `#/properties/${config.name}/properties/description`
+    card.elements[0].elements[0].elements[0].elements[1].scope = `#/properties/${config.name}/properties/value`;
+    card.elements[1].scope = `#/properties/${config.name}/properties/url`;
+    card.elements[0].elements[0].elements[1].scope = `#/properties/${config.name}/properties/description`;
     if(config.layout){
       card.config.layout = createLayoutFormat(config.layout)
     }

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

@@ -31,18 +31,18 @@ export default (funcParams: funcParamsProps) => {
         return formData;
       }
       saveFormdataInSessionStorage(config)
-      return config
+      return { ...config, type: "page" }
     },
     getUiSchema: function () {
       const UiSchema = _.cloneDeep(PageMasterUiSchema(store.theme.myTheme));
-      if (sessionStorage.getItem("copiedConfig") ) {
+      if (sessionStorage.getItem("copiedConfig")) {
         Component(store, dynamicData, submitHandler, service).ElementPathSetter(UiSchema)
       }
       return UiSchema;
     },
     getSchema: () => {
       const schema = _.cloneDeep(PageMasterSchema);
-      if (sessionStorage.getItem("copiedConfig") ) {
+      if (sessionStorage.getItem("copiedConfig")) {
         schema.properties.RemoveItemButton.disabled = false;
       }
       return schema;
@@ -70,8 +70,8 @@ export default (funcParams: funcParamsProps) => {
     },
     saveHandler: async () => await saveHandler(store, service, submitHandler),
     Edit_Components: Component(store, dynamicData, submitHandler, service).editComponents,
-    
-    Delete_Components: async function() {
+
+    Delete_Components: async function () {
       await Component(store, dynamicData, submitHandler, service).deleteComponents(false);
       store.updateDialog("popUpPageMasterComponent");
     },
@@ -99,25 +99,25 @@ export default (funcParams: funcParamsProps) => {
       store.updateDialog("popUpPageMasterEvent");
       sessionStorage.removeItem('rowId');
     },
-    deletePopUpComponent: function(){
+    deletePopUpComponent: function () {
       const rowId = dynamicData.path.split(".")[1];
-      sessionStorage.setItem('rowId',rowId);
+      sessionStorage.setItem('rowId', rowId);
       store.updateDialog("popUpPageMasterComponent");
     },
-    deletePopUpEvent: function(){
+    deletePopUpEvent: function () {
       const rowId = dynamicData.path.split(".")[1];
-      sessionStorage.setItem('rowId',rowId);
+      sessionStorage.setItem('rowId', rowId);
       store.updateDialog("popUpPageMasterEvent");
     },
 
 
-    copyPasteElement:  function(){
-      Component(store, dynamicData, submitHandler, service).copyPasteElement(store,this.setPage.bind(this));
+    copyPasteElement: function () {
+      Component(store, dynamicData, submitHandler, service).copyPasteElement(store, this.setPage.bind(this));
     },
-    
-    RemoveItemButton: function(){
+
+    RemoveItemButton: function () {
       Component(store, dynamicData, submitHandler, service).RemoveItemButton(store)
     },
-    
+
   }
 };

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

@@ -1,4 +1,4 @@
-import _ from "lodash";
+import _, { isObject, mapKeys } from "lodash";
 import { handlersProps } from "./interface";
 export const executeEvents = (params: handlersProps) => {
   let nextEvent = [];
@@ -176,12 +176,16 @@ function mergeFormdata(handlerResponse: any, componentName: string, eventConfig:
     }
   }
   else if (eventConfig.type === "page") {
-    if (!(_.isEmpty(handlerResponse?.data) && handlerResponse?.data)) {
+    if (!(_.isEmpty(handlerResponse?.data) && handlerResponse?.data && isObject(handlerResponse.data))) {
       store.newData = {
         ...store.newData,
         ...handlerResponse?.data
       }
-      formDataHolder = { ...formDataHolder, ...handlerResponse?.data }
+      const keys = Object.keys(handlerResponse.data)
+      keys.map((e) => {
+        formDataHolder[e] = { ...formDataHolder, [e]: handlerResponse.data[e] }
+      })
+
     }
   }
   else if (eventConfig.type === "Table" && eventConfig.lazyLoading) {

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

@@ -62,7 +62,7 @@ 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,
@@ -92,7 +92,7 @@ export default (funcParams: funcParamsProps) => {
         functionsProvider: funcParams.functionsProvider,
         serviceHolder: this, eventGroups, formDataHolder,
       }
-    
+
       funcParams.store.setSchema(
         (pre: any) => {
           return {
@@ -225,38 +225,39 @@ export default (funcParams: funcParamsProps) => {
     },
     onBack: async function (functionParameters) {
       const path = funcParams.dynamicData?.tableButtonPath || funcParams.dynamicData.path.split(".")[0];
-      await this.callHandler("onBack", functionParameters)
+      this.callHandler("onBack", functionParameters)
       if (eventGroups?.["onBack"]?.[path] === undefined) {
         functionParameters?.handleBack()
       }
     },
     onNext: async function (functionParameters) {
       const path = funcParams.dynamicData?.tableButtonPath || funcParams.dynamicData.path.split(".")[0];
-      await this.callHandler("onNext", functionParameters)
+      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];
-      await this.callHandler("onReset", functionParameters)
+      this.callHandler("onReset", functionParameters)
       if (eventGroups?.["onReset"]?.[path] === undefined) {
         functionParameters?.handleReset()
       }
     },
-    callHandler: async function (eventType: string, functionParameters?: any) {
+    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) {
-       await Promise.all(eventGroups?.[eventType]?.[path].map(async (eventConfig) => {
+        (eventGroups?.[eventType]?.[path].map((eventConfig) => {
           executeEventsParameters.store.functionParameters = functionParameters
           if (eventConfig.Handler === "refresh") {
-            await executeRefreshHandler({
+            executeEvents({
               ...executeEventsParameters,
               config: eventConfig,
               componentName: path,
               formDataHolder: formDataHolder
-            })
-            funcParams.store.setFormdata((pre) => ({ ...pre, ...formDataHolder }));
+            }).then((res) => {
+              funcParams.store.setFormdata((pre) => ({ ...pre, ...formDataHolder }));
+            });
           } else {
             executeEvents({
               ...executeEventsParameters,