impaktapps-ui-builder 0.0.346 → 0.0.348

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

@@ -5,7 +5,7 @@ declare const _default: (store: any, dynamicData: any, submitHandler: any, servi
     getFormdata: () => any;
     getSchema: () => any;
     okHandler: () => void;
-    savePageHandler: () => Promise<void>;
+    saveHandler: () => Promise<void>;
     onChange: () => void;
     editComponents: () => void;
     deleteComponents: () => void;

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

@@ -76,9 +76,9 @@ declare const _default: (store: any, dynamicData: any, submitHandler: any, servi
         };
         required: string[];
     };
-    savePageHandler: () => Promise<void>;
-    onChange: () => void;
     okHandler: () => void;
+    saveHandler: () => Promise<void>;
+    onChange: () => void;
     addEvent: () => void;
     editEvent: () => void;
     deleteEvent: () => void;

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

@@ -1,4 +1,6 @@
-export declare function saveHandler(store: any, service: any, submitHandler: any, config: any): Promise<boolean>;
+export declare function saveHandler(store: any, service: any, submitHandler: any, pageName?: string): Promise<void>;
+export declare const navigateHandler: (store: any, isSubmitted: any, pageName?: string | boolean) => void;
+export declare function okHandler(store: any): void;
 interface funcParamsProps {
     store: any;
     dynamicData: any;
@@ -50,7 +52,7 @@ declare const _default: (funcParams: funcParamsProps) => {
     };
     backHandler: () => void;
     onAddClickHandler: () => void;
-    savePageHandler: () => Promise<void>;
+    saveHandler: () => Promise<void>;
     Edit_Components: () => void;
     Delete_Components: () => void;
     eventAddHandler: () => void;

package/package.json

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

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

@@ -278,7 +278,7 @@ export const componentBasicUiSchema: any = {
           variant: "contained",
           color: "info",
           type: "text",
-          onClick: "savePageHandler",
+          onClick: "saveHandler",
           size: "small",
         },
         style: {

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

@@ -375,7 +375,7 @@ export const PageMasterUiSchema: any = {
           variant: "contained",
           color: "info",
           type: "text",
-          onClick: "savePageHandler",
+          onClick: "saveHandler",
           size: "small",
         },
         style: {

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

@@ -297,7 +297,7 @@ export const EventUiSchema: any = {
           variant: "contained",
           color: "info",
           type: "text",
-          onClick: "savePageHandler",
+          onClick: "saveHandler",
           size: "small",
         },
         style: {

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

@@ -9,7 +9,7 @@ import { StyleSection } from "../build/uischema/styleSection";
 import { TableSection } from "../build/uischema/tableSection";
 import { ValueTab } from "../build/uischema/valueTab";
 import { ValidationSection } from "../build/uischema/validationSections";
-import { saveHandler } from "./pageMaster";
+import { navigateHandler, okHandler, saveHandler } from "./pageMaster";
 const sectionLabels = {
   Select: ["Core", "Properties","Value", "style", "Event","Validation"],
   MultipleSelect: ["Core", "Properties","Value", "style", "Event","Validation"],
@@ -77,46 +77,8 @@ export default (store: any, dynamicData: any, submitHandler: any, service: any)
     getSchema: function () {
       return ComponentSchema;
     },
-    okHandler: function () {
-      const path = store.searchParams?.get("path");
-      console.log(store.ctx.core.errors)
-      if (_.isEmpty(store.ctx.core.errors)) {
-        saveFormdataInLocalStorage(store.ctx.core.data,path)
-          store.navigate(-1)
-          store.setNotify({
-            SuccessMessage: "Save Successfully",
-            Success: true,
-          });
-      } else {
-        store.setValidation("ValidateAndShow");
-         store.setNotify({
-          Fail:true,
-          FailMessage:"Errors on Page"
-        })
-      }
-    },
-    savePageHandler: async () => {
-      const id = store.searchParams?.get("id");
-      const path = store.searchParams?.get("path");
-      saveFormdataInLocalStorage(store.ctx.core.data, path);
-      const config = JSON.parse(localStorage.getItem("pageFormdata"));
-      const isSubmitted = await saveHandler(store, service, submitHandler,config);
-      if (isSubmitted) {
-        localStorage.removeItem("pageFormdata");
-        store.navigate(`/PageMaster?id=${id}`);
-        store.setNotify({
-          SuccessMessage: "Submit Successfully",
-          Success: true,
-        });
-      } else {
-        store.setValidation("ValidateAndShow");
-        store.setNotify({
-          Fail: true,
-          FailMessage: "Errors on Page"
-        });
-      }
-    },
-
+    okHandler:()=>okHandler(store),
+    saveHandler: async ()=> await saveHandler(store,service,submitHandler,"PageMaster"),
     onChange: function () {
       if (
         store?.formData?.type !== store?.newData?.type &&

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

@@ -1,9 +1,9 @@
-import { EventSchema } from "../elements/UiSchema/event/schema"; 
+import { EventSchema } from "../elements/UiSchema/event/schema";
 import { EventUiSchema } from "../elements/UiSchema/event/uiSchema";
 import Component from "./component";
 import { saveFormdataInLocalStorage } from "./saveHandler";
 import { APISection } from "../build/uischema/apiSection";
-import  { saveHandler } from "./pageMaster";
+import { okHandler, saveHandler } from "./pageMaster";
 import { getSelectField, getTextArea } from "../build/uischema/buildPropertiesSection";
 import { refreshSectionUiSchema } from "../build/uischema/refresh";
 import _ from "lodash";
@@ -11,7 +11,7 @@ import _ from "lodash";
 export default (
   store: any,
   dynamicData: any,
-  submitHandler: any, 
+  submitHandler: any,
   service: any
 ) => {
   return {
@@ -20,76 +20,54 @@ export default (
       store.setFormdata(formdata);
       const schema = await this.getSchema();
       store.setSchema(schema);
-     this.refreshPage(formdata.Handler,store)
+      this.refreshPage(formdata.Handler, store)
     },
     refreshPage: (handlerType: any, store: any) => {
       const uiSchema = _.cloneDeep(EventUiSchema);
-      const schema:any = _.cloneDeep(EventSchema)
+      const schema: any = _.cloneDeep(EventSchema)
       if (handlerType) {
         if (handlerType === "custom") {
           uiSchema.elements[1].elements[0].elements[2] = getTextArea("eventCode", "Write Custom Code", false)
-          schema.required = ["eventType","Handler","eventCode"]
+          schema.required = ["eventType", "Handler", "eventCode"]
 
         } else if (handlerType === "api") {
           uiSchema.elements[1].elements[0].elements[2] = APISection;
-          schema.required = ["eventType","Handler","method","path"]
+          schema.required = ["eventType", "Handler", "method", "path"]
         } else if (handlerType === "inBuiltFunction") {
           uiSchema.elements[1].elements[0].elements[2] = getSelectField("inBuiltFunctionType", "Function Name", [
             { label: "RankProvider", value: "RankProvider" },
             { label: "Download File", value: "downloadFile" },
           ])
           uiSchema.elements[1].elements[0].elements[3] = getTextArea("funcParametersCode", "Write Custom Code for Functions Parameter", true, { xs: 12, sm: 12, md: 6 });
-          schema.required = ["eventType","Handler","inBuiltFunctionType"]
+          schema.required = ["eventType", "Handler", "inBuiltFunctionType"]
         } else if (handlerType === "refresh") {
           uiSchema.elements[1].elements[0].elements[2] = refreshSectionUiSchema;
           schema.properties.refreshElements.required = ["value"]
           schema.properties.refreshElements.items.required = ["value"]
-          schema.required = ["eventType","Handler","refreshElements"]
+          schema.required = ["eventType", "Handler", "refreshElements"]
         }
       }
       store.setSchema(schema)
       store.setUiSchema(uiSchema)
     },
 
-    getFormData: Component(store, dynamicData,submitHandler,service).getFormdata,
+    getFormData: Component(store, dynamicData, submitHandler, service).getFormdata,
     getUiSchema: function () {
       return EventUiSchema;
     },
     getSchema: () => {
       return EventSchema;
     },
-    savePageHandler: async () => {
-      const id = store.searchParams?.get("id");
-      const path = store.searchParams?.get("path");
-      saveFormdataInLocalStorage(store.ctx.core.data,path);
-      const config = JSON.parse(localStorage.getItem("pageFormdata"));
-      const isSubmitted = await saveHandler(store, service, submitHandler,config);
-      if (isSubmitted) {
-        localStorage.removeItem("pageFormdata");
-        store.navigate(`/PageMaster?id=${id}`);
-        store.setNotify({
-          SuccessMessage: "Submit Successfully",
-          Success: true,
-        });
-      } else {
-        store.setValidation("ValidateAndShow");
-        store.setNotify({
-          Fail: true,
-          FailMessage: "Errors on Page"
-        });
-      }
-    },
-
+    okHandler: () => okHandler(store),
+    saveHandler: async () => await saveHandler(store, service, submitHandler,"PageMaster"),
     onChange: function () {
       if (
         store?.formData?.Handler !== store?.newData?.Handler &&
         store?.newData?.Handler !== undefined
       ) {
-        this.refreshPage(store.newData.Handler||store.formdata.Handler,store)
+        this.refreshPage(store.newData.Handler || store.formdata.Handler, store)
       }
     },
-    
-    okHandler: Component(store, dynamicData,submitHandler,service).okHandler,
     addEvent: function () {
       const path = store.searchParams?.get("path");
       if (!Array.isArray(store.formData.events)) {
@@ -111,7 +89,7 @@ export default (
       this.setPage()
 
     },
-    deleteEvent: Component(store, dynamicData,submitHandler,service).deleteEvent,
+    deleteEvent: Component(store, dynamicData, submitHandler, service).deleteEvent,
     backHandler: function () {
       store.navigate(-1)
     },

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

@@ -5,18 +5,55 @@ import Component from "./component";
 import { getFormdataFromLocalStorage, saveFormdataInLocalStorage } from "./saveHandler";
 import { schema } from "../build/buildUiSchema";
 
-export async function saveHandler(store, service, submitHandler, config) {
-  let isTrue = false;
+export async function saveHandler(store, service, submitHandler,pageName?:string) {
+  const id = store.searchParams?.get("id");
+  const path = store.searchParams?.get("path");
+  saveFormdataInLocalStorage(store.ctx.core.data, path);
+  const config = JSON.parse(localStorage.getItem("pageFormdata"));
   if (_.isEmpty(store.ctx.core.errors)) {
     try {
-      const saveReturn = await submitHandler(store, service,config);
-      isTrue = true;
+      const saveReturn = await submitHandler(store, service, config);
+      navigateHandler(store,true,pageName?`/${pageName}?id=${id}`:false)
     } catch (err) {
-      isTrue = false;
+      navigateHandler(store,false)
     }
   }
-  return isTrue;
 }
+export const navigateHandler = (store, isSubmitted, pageName?: string | boolean) => {
+  if (isSubmitted) {
+    localStorage.removeItem("pageFormdata");
+    store.navigate(pageName || -1)
+    store.setNotify({
+      SuccessMessage: "Submit Successfully",
+      Success: true,
+    });
+  } else {
+    store.setValidation("ValidateAndShow");
+    store.setNotify({
+      Fail: true,
+      FailMessage: "Errors on Page"
+    });
+  }
+};
+export function okHandler (store) {
+  const path = store.searchParams?.get("path");
+  console.log(store.ctx.core.errors)
+  if (_.isEmpty(store.ctx.core.errors)) {
+    saveFormdataInLocalStorage(store.ctx.core.data,path)
+      store.navigate(-1)
+      store.setNotify({
+        SuccessMessage: "Save Successfully",
+        Success: true,
+      });
+  } else {
+    store.setValidation("ValidateAndShow");
+     store.setNotify({
+      Fail:true,
+      FailMessage:"Errors on Page"
+    })
+  }
+}
+
 interface funcParamsProps {
   store: any,
   dynamicData: any,
@@ -65,25 +102,7 @@ export default (funcParams: funcParamsProps) => {
         `/Component?path=${`elements[${response?.elements.length}]`}&id=${id}`
       );
     },
-    savePageHandler: async () => {
-      saveFormdataInLocalStorage(store.ctx.core.data);
-      const config = JSON.parse(localStorage.getItem("pageFormdata"));
-      const isSubmitted = await saveHandler(store, service, submitHandler,config);
-      if (isSubmitted) {
-        localStorage.removeItem("pageFormdata");
-        store.navigate('/PageMasterRecords');
-        store.setNotify({
-          SuccessMessage: "Submit Successfully",
-          Success: true,
-        });
-      } else {
-        store.setValidation("ValidateAndShow");
-        store.setNotify({
-          Fail: true,
-          FailMessage: "Errors on Page"
-        });
-      }
-    },
+    saveHandler: async ()=> await saveHandler(store,service,submitHandler),
     Edit_Components: Component(store, dynamicData, submitHandler, service).editComponents,
     Delete_Components: Component(store, dynamicData, submitHandler, service).deleteComponents,
     eventAddHandler: function () {