impaktapps-ui-builder 0.0.335 → 0.0.337

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: () => Promise<any>;
     getSchema: () => any;
     saveHandler: () => Promise<void>;
-    submitPageHandler: () => () => Promise<void>;
+    submitPageHandler: () => Promise<void>;
     onChange: () => void;
     editComponents: () => Promise<void>;
     deleteComponents: () => Promise<void>;

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

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

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

@@ -1,5 +1,5 @@
-export declare function submitPageHandlerProvider(store: any, service: any, submitHandler: any, pageName?: string | undefined): {
-    submitPageHandler: () => Promise<void>;
+export declare function submitPageHandlerProvider(store: any, service: any, submitHandler: any): {
+    submitPageHandler: () => Promise<boolean>;
 };
 interface funcParamsProps {
     store: any;

package/package.json

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

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

@@ -273,7 +273,7 @@ export const componentBasicUiSchema: any = {
           lg: 2.5,
         },
         main: {
-          name: "Submit & Exit",
+          name: "Save & Exit",
           startIcon: "ApproveIcon",
           variant: "contained",
           color: "info",

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

@@ -370,7 +370,7 @@ export const PageMasterUiSchema: any = {
       config: {
         layout: 11.7,
         main: {
-          name: "Submit Page",
+          name: "Save",
           startIcon: "ApproveIcon",
           variant: "contained",
           color: "info",

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

@@ -292,7 +292,7 @@ export const EventUiSchema: any = {
           lg: 2.5,
         },
         main: {
-          name: "Submit & Exit",
+          name: "Save & Exit",
           startIcon: "ApproveIcon",
           variant: "contained",
           color: "info",

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

@@ -95,9 +95,23 @@ export default (store: any, dynamicData: any, submitHandler: any, service: any)
         })
       }
     },
-    submitPageHandler:()=>{ 
+    submitPageHandler: async () => {
       const id = store.searchParams?.get("id");
-       return submitPageHandlerProvider(store, service, submitHandler,`/PageMaster?id=${id}`).submitPageHandler
+      const isSubmitted = await submitPageHandlerProvider(store, service, submitHandler).submitPageHandler();
+      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"
+        });
+      }
     },
 
     onChange: function () {

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

@@ -58,6 +58,25 @@ export default (
     getSchema: async () => {
       return EventSchema;
     },
+    submitPageHandler: async () => {
+      const id = store.searchParams?.get("id");
+      const isSubmitted = await submitPageHandlerProvider(store, service, submitHandler).submitPageHandler();
+      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"
+        });
+      }
+    },
+
     onChange: function () {
       if (
         store?.formData?.Handler !== store?.newData?.Handler &&
@@ -79,10 +98,6 @@ export default (
       store.setSearchParams(store.searchParams)
       this.setPage()
     },
-    submitPageHandler:()=>{ 
-      const id = store.searchParams?.get("id");
-       return submitPageHandlerProvider(store, service, submitHandler,`/PageMaster?id=${id}`).submitPageHandler
-    },
     editEvent: async function () {
       const rowId = dynamicData.path.split(".")[1];
       const path = store.searchParams?.get("path");

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

@@ -5,35 +5,23 @@ import Component from "./component";
 import { getFormdataFromLocalStorage, saveFormdataInLocalStorage } from "./saveHandler";
 import { schema } from "../build/buildUiSchema";
 
-export  function submitPageHandlerProvider(store, service, submitHandler,pageName?:string|undefined) {
+export function submitPageHandlerProvider(store, service, submitHandler) {
+
   return {
     submitPageHandler: async function () {
+      let isTrue = false;
       if (_.isEmpty(store.ctx.core.errors)) {
-        console.log("entered submitPageHandler if condition");
         try {
           const saveReturn = await submitHandler(store, service);
-          console.log("saveReturnnn");
-
-          localStorage.removeItem("pageFormdata");
-          store.navigate(pageName || -1);
-          store.setNotify({
-            SuccessMessage: "Submit Successfully",
-            Success: true,
-          });
-        } catch (error) {
-          // Handle any errors from submitHandler
-          console.error("Error in submitHandler:", error);
+          isTrue = true;
+        } catch (err) {
+          isTrue = false;
         }
-      } else {
-        store.setValidation("ValidateAndShow");
-        store.setNotify({
-          Fail: true,
-          FailMessage: "Errors on Page"
-        })
       }
-    }
-  }
-};
+      return isTrue;
+    },
+  };
+}
 interface funcParamsProps {
   store: any,
   dynamicData: any,
@@ -82,7 +70,24 @@ export default (funcParams: funcParamsProps) => {
         `/Component?path=${`elements[${response?.elements.length}]`}&id=${id}`
       );
     },
-    submitPageHandler: submitPageHandlerProvider(store, service, submitHandler).submitPageHandler,
+    // submitPageHandler: submitPageHandlerProvider(store, service, submitHandler).submitPageHandler,
+    submitPageHandler: async () => {
+      const isSubmitted = await submitPageHandlerProvider(store, service, submitHandler).submitPageHandler();
+      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"
+        });
+      }
+    },
     Edit_Components: Component(store, dynamicData, submitHandler, service).editComponents,
     Delete_Components: Component(store, dynamicData, submitHandler, service).deleteComponents,
     eventAddHandler: async function () {