impaktapps-ui-builder 0.0.296 → 0.0.298

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

@@ -7,13 +7,13 @@ import { schema } from "../build/buildUiSchema";
 
 interface funcParamsProps {
   store: any,
-   dynamicData: any,
-   config: any,
-  submitHandler:any,
-  service:any
- }
-export default (funcParams:funcParamsProps) => {
-  const {store,dynamicData,config,submitHandler} = funcParams
+  dynamicData: any,
+  config: any,
+  submitHandler: any,
+  service: any
+}
+export default (funcParams: funcParamsProps) => {
+  const { store, dynamicData, config, submitHandler } = funcParams
   return {
     setPage: async function () {
       const formdata = await this.getFormdata();
@@ -26,13 +26,13 @@ export default (funcParams:funcParamsProps) => {
     getFormdata: async function () {
       const id = store.searchParams?.get("id");
       const formData = getFormdataFromLocalStorage()
-      if(formData){
-         return formData;
+      if (formData) {
+        return formData;
       }
       saveFormdataInLocalStorage(config)
-      return config 
+      return config
     },
-    getUiSchema: async function () {  
+    getUiSchema: async function () {
       return PageMasterUiSchema;
     },
     getSchema: () => {
@@ -53,8 +53,9 @@ export default (funcParams:funcParamsProps) => {
       );
     },
     submitPageHandler: async function () {
-      console.log(schema)
-      submitHandler(store,funcParams.service)
+      console.log()
+      if (_.isEmpty(funcParams.store.ctx.core.errors)) {
+        submitHandler(store, funcParams.service)
         .then((saveReturn: any) => {
           localStorage.removeItem("pageFormdata")
           store.navigate(-1)
@@ -63,6 +64,13 @@ export default (funcParams:funcParamsProps) => {
             Success: true,
           });
         })
+      } else {
+        funcParams.store.setValidation("ValidateAndShow");
+        funcParams.store.setNotify({
+          Fail:true,
+          FailMessage:"Errors on Page"
+        })
+      }
     },
     Edit_Components: Component(store, dynamicData).editComponents,
     Delete_Components: Component(store, dynamicData).deleteComponents,
@@ -75,14 +83,14 @@ export default (funcParams:funcParamsProps) => {
       const finalPath = `events[${store.formData.events.length}]`
       store.navigate(`/ComponentEvents?path=${finalPath}&id=${id}`)
     },
-    editEvent:async function () {
+    editEvent: async function () {
       const rowId = dynamicData.path.split(".")[1];
       const id = store.searchParams?.get("id");
       saveFormdataInLocalStorage(store.formData)
       const finalPath = `events[${rowId}]`
       store.navigate(`/ComponentEvents?path=${finalPath}&id=${id}`)
     },
-    deleteEvent:async function () {
+    deleteEvent: async function () {
       const rowId = dynamicData.path.split(".")[1];
       store.formData.events.splice(rowId, 1);
       const response = saveFormdataInLocalStorage(store.formData)

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

@@ -14,9 +14,6 @@ export const executeEvents = async (
     const response  = await executeEventsHandler(params)
     finalResponse = response;
     const SuccessEvent = params.config?.events.filter(e => e.eventType === "Success");
-    if(params.config.returnNeeded){
-      return finalResponse
-    }
     nextEvent = SuccessEvent;
   } catch (err) {
     const FailEvent = params.config?.events?.filter(e => e.eventType === "Fail")
@@ -121,7 +118,7 @@ async function mergeFormdata(handlerResponse: any, componentName: string, eventC
   }
   else {
     if (handlerResponse) {
-      store.setFormdata((pre) => { return { ...pre, [componentName]: handlerResponse.data } });
+      store.setFormdata((pre) => { return { ...pre, [componentName]:eventConfig.lazyLoading?handlerResponse.data.data: handlerResponse.data } });
     }
   }
 }

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

@@ -30,7 +30,7 @@ export const extractEvents = (eventConfig: any) => {
           return elem.eventType === "Success"
         })
         if (!(!!SuccessEvent) && event.eventType === "onLoad") {
-          event.events.push({ Handler: "mergeFormdata", eventType: "Success", type: compType })
+          event.events.push({ Handler: "mergeFormdata", eventType: "Success", type: compType,lazyLoading:eventConfig.lazyLoading==="YES"?true:false })
         }
         eventGroups[event.eventType][eventConfigObj.name].push({ ...event, type: compType })
       });
@@ -98,7 +98,8 @@ export default (funcParams: funcParamsProps) => {
         { key: "filters", value: paginationValues.columnFilters || [] },
         { key: "globalFilter", value: paginationValues.globalFilter ?? '' }
       ]
-      return await this.updateConfigApiBody(paginationValues, apiBody)
+      const response =  await this.updateConfigApiBody(paginationValues, apiBody);
+      return response?.data;
     },
     getSelectOptions: async function (param) {
       if (param.serachValue !== "" && param.serachValue !== undefined) {