impaktapps-ui-builder 0.0.382-alpha.553 → 0.0.382-alpha.57

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

@@ -41,7 +41,7 @@ const sectionLabels = {
 
 
 export const refreshPage = (type:string,store:any) => {
-  const UiSchema = _.cloneDeep(componentBasicUiSchema)
+  const UiSchema = _.cloneDeep(componentBasicUiSchema(store.theme.myTheme))
   if(type){
   const sectionUiSchema = {
     Core: CoreSection,
@@ -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);
@@ -104,28 +104,20 @@ export default (store: any, dynamicData: any, submitHandler: any, service: any)
         store.navigate(`/Component?path=${`elements[${rowId}]`}&id=${id}`)
       }
     },
-    deleteComponents: function (shouldUpdateDialog: boolean = true) {
+    deleteComponents: function () {
       const path = store.searchParams?.get("path");
-      const rowId = localStorage.getItem('rowId');
+      const rowId = dynamicData.path.split(".")[1];
       store.formData.elements.splice(rowId, 1);
       const response = saveFormdataInLocalStorage(store.ctx.core.data, path)
       const data = path ? _.get(response, path) : response;
       store.setFormdata(data);
-      if(shouldUpdateDialog){
-        store.updateDialog("popUpComponentSection");
-      }
-      localStorage.removeItem('rowId');
     },
-    deleteEvent: function (shouldUpdateDialog: boolean = true) {
+    deleteEvent: function () {
       const path = store.searchParams?.get("path");
-      const rowId = localStorage.getItem('rowId');
+      const rowId = dynamicData.path.split(".")[1];
       store.formData.events.splice(rowId, 1);
       const response = saveFormdataInLocalStorage(store.ctx.core.data, path)
       store.setFormdata(_.get(response, path));
-      if(shouldUpdateDialog){
-        store.updateDialog("popUpEventSection")
-      }
-      localStorage.removeItem('rowId');
     },
     widgetAddClickHandler: function () {
       if (!Array.isArray(store.formData.elements)) {
@@ -160,16 +152,6 @@ export default (store: any, dynamicData: any, submitHandler: any, service: any)
     backHandler: function () {
       store.navigate(-1)
     },
-    deletePopUpComponent: function(){
-      const rowId = dynamicData.path.split(".")[1];
-      localStorage.setItem('rowId',rowId);
-      store.updateDialog("popUpComponentSection");
-    },
-    deletePopUpEvent: function(){
-      const rowId = dynamicData.path.split(".")[1];
-      localStorage.setItem('rowId',rowId);
-      store.updateDialog("popUpEventSection");
-    },
   }
 };
 

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;
@@ -89,17 +89,9 @@ export default (
       this.setPage()
 
     },
-    deleteEvent: async function () {
-      await Component(store, dynamicData, submitHandler, service).deleteEvent(false);
-      store.updateDialog("popUpEvent");
-    },
+    deleteEvent: Component(store, dynamicData, submitHandler, service).deleteEvent,
     backHandler: function () {
       store.navigate(-1)
     },
-    deletePopUpEvent: function(){
-      const rowId = dynamicData.path.split(".")[1];
-      localStorage.setItem('rowId',rowId);
-      store.updateDialog("popUpEvent");
-    }
   }
 };

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

@@ -34,7 +34,7 @@ export default (funcParams: funcParamsProps) => {
       return config
     },
     getUiSchema: function () {
-      return PageMasterUiSchema;
+      return PageMasterUiSchema(store.theme.myTheme);
     },
     getSchema: () => {
       return PageMasterSchema;
@@ -55,11 +55,7 @@ export default (funcParams: funcParamsProps) => {
     },
     saveHandler: async ()=> await saveHandler(store,service,submitHandler),
     Edit_Components: Component(store, dynamicData, submitHandler, service).editComponents,
-    
-    Delete_Components: async function() {
-      await Component(store, dynamicData, submitHandler, service).deleteComponents(false);
-      store.updateDialog("popUpPageMasterComponent");
-    },
+    Delete_Components: Component(store, dynamicData, submitHandler, service).deleteComponents,
     eventAddHandler: function () {
       const id = store.searchParams?.get("id");
       if (!Array.isArray(store.formData.events)) {
@@ -77,22 +73,10 @@ export default (funcParams: funcParamsProps) => {
       store.navigate(`/ComponentEvents?path=${finalPath}&id=${id}`)
     },
     deleteEvent: function () {
-      const rowId = localStorage.getItem('rowId');
+      const rowId = dynamicData.path.split(".")[1];
       store.formData.events.splice(rowId, 1);
       const response = saveFormdataInLocalStorage(store.ctx.core.data)
       store.setFormdata(response);
-      store.updateDialog("popUpPageMasterEvent");
-      localStorage.removeItem('rowId');
-    },
-    deletePopUpComponent: function(){
-      const rowId = dynamicData.path.split(".")[1];
-      localStorage.setItem('rowId',rowId);
-      store.updateDialog("popUpPageMasterComponent");
-    },
-    deletePopUpEvent: function(){
-      const rowId = dynamicData.path.split(".")[1];
-      localStorage.setItem('rowId',rowId);
-      store.updateDialog("popUpPageMasterEvent");
     },
   }
 };

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,12 +126,15 @@ 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) {
+      console.log("console3 : " , handlerResponse);
       store.setFormdata((pre) => { return { ...pre, [componentName]: eventConfig.lazyLoading ? handlerResponse.data.data : handlerResponse.data } });
       const demoData = await asyncOperation();
     }

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

@@ -66,9 +66,7 @@ export default (funcParams: funcParamsProps) => {
   };
   return {
     setPage: async function () {
-      funcParams.store.setFormdata((prev) => {
-        return {}
-      });
+      funcParams.store.setFormdata({});
       executeEventsParameters = {
         config: {}, componentName: "",
         store: funcParams.store, dynamicData: funcParams.dynamicData, userValue: funcParams.userValue, service: funcParams.service,
@@ -84,17 +82,6 @@ export default (funcParams: funcParamsProps) => {
       )
       funcParams.uiSchema.elements.push(notifyUiSchema);
       funcParams.store.setUiSchema(funcParams.uiSchema);
-
-
-      const simulateDelay = async(time) => {
-        // return new Promise(resolve => setTimeout(resolve,time));
-        return new Promise((resolve) => {
-          return setTimeout(resolve,time);
-        })
-      }
-
-      await simulateDelay(3000);
-
       await executeRefreshHandler({
         config: {}, componentName: "",
         store: funcParams.store, dynamicData: funcParams.dynamicData, userValue: funcParams.userValue, service: funcParams.service,
@@ -184,6 +171,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)