impaktapps-ui-builder 0.0.345 → 0.0.347

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

@@ -1,4 +1,5 @@
 export declare function saveHandler(store: any, service: any, submitHandler: any, config: any): Promise<boolean>;
+export declare const navigation: (store: any, isSubmitted: any, pageName?: string | undefined) => void;
 interface funcParamsProps {
     store: any;
     dynamicData: any;

package/package.json

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

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 { navigation, saveHandler } from "./pageMaster";
 const sectionLabels = {
   Select: ["Core", "Properties","Value", "style", "Event","Validation"],
   MultipleSelect: ["Core", "Properties","Value", "style", "Event","Validation"],
@@ -99,23 +99,9 @@ export default (store: any, dynamicData: any, submitHandler: any, service: any)
       const id = store.searchParams?.get("id");
       const path = store.searchParams?.get("path");
       saveFormdataInLocalStorage(store.ctx.core.data, path);
-      const config = localStorage.getItem("pageFormdata");
-      const actualConfig = JSON.parse(config);
-      const isSubmitted = await saveHandler(store, service, submitHandler,actualConfig);
-      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"
-        });
-      }
+      const config = JSON.parse(localStorage.getItem("pageFormdata"));
+      const isSubmitted = await saveHandler(store, service, submitHandler,config);
+      navigation(store,isSubmitted,`/PageMaster?id=${id}`)
     },
 
     onChange: function () {

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

@@ -3,7 +3,7 @@ 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  { navigation, saveHandler } from "./pageMaster";
 import { getSelectField, getTextArea } from "../build/uischema/buildPropertiesSection";
 import { refreshSectionUiSchema } from "../build/uischema/refresh";
 import _ from "lodash";
@@ -61,24 +61,10 @@ export default (
     savePageHandler: async () => {
       const id = store.searchParams?.get("id");
       const path = store.searchParams?.get("path");
-      saveFormdataInLocalStorage(store.ctx.core.data,path);
-      const config = localStorage.getItem("pageFormdata");
-      const actualConfig = JSON.parse(config);
-      const isSubmitted = await saveHandler(store, service, submitHandler,actualConfig);
-      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"
-        });
-      }
+      saveFormdataInLocalStorage(store.ctx.core.data, path);
+      const config = JSON.parse(localStorage.getItem("pageFormdata"));
+      const isSubmitted = await saveHandler(store, service, submitHandler,config);
+      navigation(store,isSubmitted,`/PageMaster?id=${id}`)
     },
 
     onChange: function () {

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

@@ -17,6 +17,24 @@ export async function saveHandler(store, service, submitHandler, config) {
   }
   return isTrue;
 }
+export const navigation = (store, isSubmitted, pageName?:string|undefined) => {
+  if (isSubmitted) {
+    localStorage.removeItem("pageFormdata");
+    // store.navigate(id ? `/PageMaster?id=${id}` : '/PageMasterRecords');
+    store.navigate(pageName||-1)
+    store.setNotify({
+      SuccessMessage: "Submit Successfully",
+      Success: true,
+    });
+  } else {
+    store.setValidation("ValidateAndShow");
+    store.setNotify({
+      Fail: true,
+      FailMessage: "Errors on Page"
+    });
+  }
+};
+
 interface funcParamsProps {
   store: any,
   dynamicData: any,
@@ -67,23 +85,9 @@ export default (funcParams: funcParamsProps) => {
     },
     savePageHandler: async () => {
       saveFormdataInLocalStorage(store.ctx.core.data);
-      const config = localStorage.getItem("pageFormdata");
-      const actualConfig = JSON.parse(config);
-      const isSubmitted = await saveHandler(store, service, submitHandler,actualConfig);
-      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"
-        });
-      }
+      const config = JSON.parse(localStorage.getItem("pageFormdata"));
+      const isSubmitted = await saveHandler(store, service, submitHandler,config);
+      navigation(store,isSubmitted)
     },
     Edit_Components: Component(store, dynamicData, submitHandler, service).editComponents,
     Delete_Components: Component(store, dynamicData, submitHandler, service).deleteComponents,