impaktapps-ui-builder 0.0.382-alpha.6 → 0.0.382-alpha.60

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

@@ -54,8 +54,8 @@ export const refreshPage = (type:string,store:any) => {
   
   }
   const elements = sectionLabels[type]?.map(e => sectionUiSchema[e]);
-  UiSchema.elements[1].config.main.tabLabels = sectionLabels[type] || ["Core", "style","Event","Validation"];
-  UiSchema.elements[1].elements = elements || [CoreSection, StyleSection,EventSection,ValidationSection];
+  UiSchema.elements[0].config.main.tabLabels = sectionLabels[type] || ["Core", "style","Event","Validation"];
+  UiSchema.elements[0].elements = elements || [CoreSection, StyleSection,EventSection,ValidationSection];
  
 }
 store.setUiSchema(UiSchema);

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

@@ -22,26 +22,26 @@ export default (
       this.refreshPage(formdata.Handler, store)
     },
     refreshPage: (handlerType: any, store: any) => {
-      const uiSchema = _.cloneDeep(EventUiSchema);
+      const uiSchema = _.cloneDeep(EventUiSchema(store.theme.myTheme));
       const schema: any = _.cloneDeep(EventSchema)
       if (handlerType) {
         if (handlerType === "custom") {
-          uiSchema.elements[1].elements[0].elements[2] = getTextArea("eventCode", "Write Custom Code", false)
+          uiSchema.elements[0].elements[0].elements[3] = getTextArea("eventCode", "Write Custom Code", false)
           schema.required = ["eventType", "Handler", "eventCode"]
 
         } else if (handlerType === "api") {
-          uiSchema.elements[1].elements[0].elements[2] = APISection;
+          uiSchema.elements[0].elements[0].elements[3] = APISection;
           schema.required = ["eventType", "Handler", "method", "path"]
         } else if (handlerType === "inBuiltFunction") {
-          uiSchema.elements[1].elements[0].elements[2] = getSelectField("inBuiltFunctionType", "Function Name", [
+          uiSchema.elements[0].elements[0].elements[2] = getSelectField("inBuiltFunctionType", "Function Name", [
             { label: "RankProvider", value: "RankProvider" },
             { label: "Download File", value: "downloadFile" },
             { label: "Download Blob File", value: "downloadBlobFile" }
           ])
-          uiSchema.elements[1].elements[0].elements[3] = getTextArea("funcParametersCode", "Write Custom Code for Functions Parameter", true, { xs: 12, sm: 12, md: 6 });
+          uiSchema.elements[0].elements[0].elements[3] = getTextArea("funcParametersCode", "Write Custom Code for Functions Parameter", true, 12);
           schema.required = ["eventType", "Handler", "inBuiltFunctionType"]
         } else if (handlerType === "refresh") {
-          uiSchema.elements[1].elements[0].elements[2] = refreshSectionUiSchema;
+          uiSchema.elements[0].elements[0].elements[3] = refreshSectionUiSchema;
           schema.properties.refreshElements.required = ["value"]
           schema.properties.refreshElements.items.required = ["value"]
           schema.required = ["eventType", "Handler", "refreshElements"]
@@ -52,8 +52,8 @@ export default (
     },
 
     getFormData: Component(store, dynamicData, submitHandler, service).getFormdata,
-    getUiSchema: function () {
-      return EventUiSchema;
+    getUiSchema: async function () {
+      return await EventUiSchema(store.theme.myTheme);
     },
     getSchema: () => {
       return EventSchema;

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

@@ -43,6 +43,7 @@ async function executeEventsHandler(params: handlersProps) {
     return await executeRefreshHandler(params)
   }
   else if (params.config.Handler === "mergeFormdata") {
+    console.log("params : " , params);
     const result = await mergeFormdata(
       params.parentEventOutput, params.componentName, params.config, params.store, params.service)
     return result;
@@ -125,13 +126,25 @@ async function mergeFormdata(handlerResponse: any, componentName: string, eventC
     })
   }
   else if (eventConfig.type === "page") {
+    console.log("console1 : " , handlerResponse);
     if (!(_.isEmpty(handlerResponse?.data) && handlerResponse?.data)) {
+      console.log("console2 : " , handlerResponse);
       store.setFormdata((pre: any) => { return { ...pre, ...handlerResponse?.data } })
     }
   }
   else {
     if (handlerResponse) {
-      store.setFormdata((pre) => { return { ...pre, [componentName]: eventConfig.lazyLoading ? handlerResponse.data.data : handlerResponse.data } });
+      console.log("console3 : " , handlerResponse);
+
+      let body;
+
+      if(handlerResponse.data instanceof Array){
+        body = [...handlerResponse.data]
+      }else if(handlerResponse.data instanceof Object){
+        body = {...handlerResponse.data};
+      }
+
+      store.setFormdata((pre) => { return { ...pre, [componentName]: eventConfig.lazyLoading ? handlerResponse.data.data : body } });
       const demoData = await asyncOperation();
     }
   }

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

@@ -119,6 +119,7 @@ export default (funcParams: funcParamsProps) => {
     },
     onChange: async function () {
       if (eventGroups.onChange) {
+        funcParams.dynamicData?.setLoading(true);
         const ChangeEventsKeysArray = Object.keys(eventGroups.onChange);
         Promise.all(ChangeEventsKeysArray.map(async (componentName: string) => {
           if (
@@ -134,6 +135,7 @@ export default (funcParams: funcParamsProps) => {
             }
           }
         }))
+        funcParams.dynamicData?.setLoading(false);
       }
     },
     updateConfigApiBody: async function (paramValue, apiBody) {
@@ -171,6 +173,9 @@ export default (funcParams: funcParamsProps) => {
         functionParameters?.handleNext()
       }
     },
+    backHandler:()=>{
+     funcParams.store.navigate(-1)
+    },
     onReset: async function (functionParameters) {
       const path = funcParams.dynamicData?.tableButtonPath || funcParams.dynamicData.path.split(".")[0];
       await this.callHandler("onReset", functionParameters)