impaktapps-ui-builder 0.0.325 → 0.0.327

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

@@ -1,3 +1,18 @@
 export declare const refreshPage: (type: string, store: any) => void;
-declare const _default: (store: any, dynamicData: any, submitHandler: any, service: any) => any;
+declare const _default: (store: any, dynamicData: any, submitHandler: any, service: any) => {
+    setPage: () => Promise<void>;
+    refreshPage: (type: string, store: any) => void;
+    getFormdata: () => Promise<any>;
+    getSchema: () => any;
+    saveHandler: () => Promise<void>;
+    submitPageHandler: Promise<void>;
+    onChange: () => void;
+    editComponents: () => Promise<void>;
+    deleteComponents: () => Promise<void>;
+    deleteEvent: () => Promise<void>;
+    widgetAddClickHandler: () => Promise<void>;
+    eventEditHandler: () => Promise<void>;
+    eventAddHandler: () => Promise<void>;
+    backHandler: () => void;
+};
 export default _default;

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

@@ -1,7 +1,7 @@
 declare const _default: (store: any, dynamicData: any, submitHandler: any, service: any) => {
     setPage: () => Promise<void>;
     refreshPage: (handlerType: any, store: any) => void;
-    getFormData: any;
+    getFormData: () => Promise<any>;
     getUiSchema: () => Promise<any>;
     getSchema: () => Promise<{
         type: string;
@@ -77,11 +77,11 @@ declare const _default: (store: any, dynamicData: any, submitHandler: any, servi
         required: string[];
     }>;
     onChange: () => void;
-    saveHandler: any;
+    saveHandler: () => Promise<void>;
     addEvent: () => Promise<void>;
-    submitPageHandler: any;
+    submitPageHandler: Promise<void>;
     editEvent: () => Promise<void>;
-    deleteEvent: any;
+    deleteEvent: () => Promise<void>;
     backHandler: () => void;
 };
 export default _default;

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

@@ -1,3 +1,6 @@
+export declare function submitPageHandlerProvider(store: any, service: any, submitHandler: any): {
+    submitPageHandler: (pageName: string) => Promise<void>;
+};
 interface funcParamsProps {
     store: any;
     dynamicData: any;
@@ -5,5 +8,55 @@ interface funcParamsProps {
     service: any;
     config?: any;
 }
-declare const _default: (funcParams: funcParamsProps) => any;
+declare const _default: (funcParams: funcParamsProps) => {
+    setPage: () => Promise<void>;
+    getFormdata: () => Promise<any>;
+    getUiSchema: () => Promise<any>;
+    getSchema: () => {
+        type: string;
+        properties: {
+            name: {
+                type: string;
+                minLength: number;
+            };
+            label: {
+                type: string;
+            };
+            layout: {
+                type: string;
+                items: {
+                    type: string;
+                    properties: {
+                        layout_key: {
+                            type: string;
+                        };
+                        layout_value: {
+                            type: string;
+                        };
+                    };
+                };
+            };
+            sectionLabels: {
+                type: string;
+                items: {
+                    type: string;
+                    properties: {
+                        label: {
+                            type: string;
+                        };
+                    };
+                };
+            };
+        };
+        required: string[];
+    };
+    backHandler: () => void;
+    onAddClickHandler: () => Promise<void>;
+    submitPageHandler: Promise<void>;
+    Edit_Components: () => Promise<void>;
+    Delete_Components: () => Promise<void>;
+    eventAddHandler: () => Promise<void>;
+    editEvent: () => Promise<void>;
+    deleteEvent: () => Promise<void>;
+};
 export default _default;

package/package.json

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

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

@@ -223,7 +223,7 @@ export const componentBasicUiSchema: any = {
       type: "Control",
       scope: "#/properties/proc",
       config: {
-        layout: { xs: 11, sm: 11, md: 8, lg: 8 },
+        layout: { xs: 11, sm: 11, md: 6, lg: 6 },
       },
       options: {
         widget: "EmptyBox",
@@ -240,8 +240,8 @@ export const componentBasicUiSchema: any = {
         layout: {
           xs: 11,
           sm: 11,
-          md: 3,
-          lg: 3,
+          md: 2.5,
+          lg: 2.5,
         },
         main: {
           name: "Save",
@@ -258,7 +258,6 @@ export const componentBasicUiSchema: any = {
         },
       },
     },
-    ///////////////////////////////////
     {
       type: "Control",
       scope: "#/properties/btnSubmit",
@@ -270,11 +269,11 @@ export const componentBasicUiSchema: any = {
         layout: {
           xs: 11,
           sm: 11,
-          md: 3,
-          lg: 3,
+          md: 2.5,
+          lg: 2.5,
         },
         main: {
-          name: "Submit",
+          name: "Submit & Exit",
           startIcon: "ApproveIcon",
           variant: "contained",
           color: "info",
@@ -288,7 +287,6 @@ export const componentBasicUiSchema: any = {
         },
       },
     },
-    //////////////////////////////////
     {
       type: "Control",
       scope: "#/properties/notify",

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

@@ -242,13 +242,41 @@ export const EventUiSchema: any = {
       type: "Control",
       scope: "#/properties/proc",
       config: {
-        layout: { xs: 11, sm: 11, md: 8, lg: 8 },
+        layout: { xs: 11, sm: 11, md: 6, lg: 6 },
       },
       options: {
         widget: "EmptyBox",
       },
     },
-    //////////////////////////////
+    {
+      type: "Control",
+      scope: "#/properties/btn",
+      options: {
+        widget: "Button",
+      },
+
+      config: {
+        layout: {
+          xs: 11,
+          sm: 11,
+          md: 2.5,
+          lg: 2.5,
+        },
+        main: {
+          name: "Save",
+          startIcon: "ApproveIcon",
+          variant: "contained",
+          color: "info",
+          type: "text",
+          onClick: "saveHandler",
+          size: "small",
+        },
+        style: {
+          marginBottom: "8px",
+          float: "right",
+        },
+      },
+    },
     {
       type: "Control",
       scope: "#/properties/btnSubmit",
@@ -260,11 +288,11 @@ export const EventUiSchema: any = {
         layout: {
           xs: 11,
           sm: 11,
-          md: 3,
-          lg: 3,
+          md: 2.5,
+          lg: 2.5,
         },
         main: {
-          name: "Submit",
+          name: "Submit & Exit",
           startIcon: "ApproveIcon",
           variant: "contained",
           color: "info",
@@ -278,7 +306,6 @@ export const EventUiSchema: any = {
         },
       },
     },
-    ////////////////////////////////////
     {
       type: "Control",
       scope: "#/properties/notify",

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 pageMaster from "./pageMaster";
+import { submitPageHandlerProvider } from "./pageMaster";
 const sectionLabels = {
   Select: ["Core", "Properties","Value", "style", "Event","Validation"],
   MultipleSelect: ["Core", "Properties","Value", "style", "Event","Validation"],
@@ -95,7 +95,7 @@ export default (store: any, dynamicData: any, submitHandler: any, service: any)
         })
       }
     },
-    submitPageHandler: pageMaster({store,dynamicData,submitHandler,service}).submitPageHandler,
+    submitPageHandler: submitPageHandlerProvider(store, service, submitHandler).submitPageHandler(''),
     onChange: function () {
       if (
         store?.formData?.type !== store?.newData?.type &&

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 pageMaster from "./pageMaster";
+import  { submitPageHandlerProvider } from "./pageMaster";
 import { getSelectField, getTextArea } from "../build/uischema/buildPropertiesSection";
 import { refreshSectionUiSchema } from "../build/uischema/refresh";
 import _ from "lodash";
@@ -79,7 +79,7 @@ export default (
       store.setSearchParams(store.searchParams)
       this.setPage()
     },
-    submitPageHandler: pageMaster({store,dynamicData,submitHandler,service}).submitPageHandler,
+    submitPageHandler: submitPageHandlerProvider(store, service, submitHandler).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,6 +5,31 @@ import Component from "./component";
 import { getFormdataFromLocalStorage, saveFormdataInLocalStorage } from "./saveHandler";
 import { schema } from "../build/buildUiSchema";
 
+export  function submitPageHandlerProvider(store, service, submitHandler) {
+  return {
+    submitPageHandler: async function (pageName: string) {
+      if (_.isEmpty(store.ctx.core.errors)) {
+        submitHandler(store, service)
+          .then((saveReturn: any) => {
+            localStorage.removeItem("pageFormdata")
+            const id = store.searchParams?.get("id");
+            const nextPage = pageName === '/PageMasterRecords' ? '/PageMasterRecords': `/PageMaster?id=${id}`;
+            store.navigate(nextPage)
+            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,
@@ -14,7 +39,7 @@ interface funcParamsProps {
   config?: any,
 }
 export default (funcParams: funcParamsProps) => {
-  const { store, dynamicData, config, submitHandler,service } = funcParams
+  const { store, dynamicData, config, submitHandler, service } = funcParams
   return {
     setPage: async function () {
       const formdata = await this.getFormdata();
@@ -53,27 +78,9 @@ export default (funcParams: funcParamsProps) => {
         `/Component?path=${`elements[${response?.elements.length}]`}&id=${id}`
       );
     },
-    submitPageHandler: async function () {
-      if (_.isEmpty(funcParams.store.ctx.core.errors)) {
-        submitHandler(store, funcParams.service)
-        .then((saveReturn: any) => {
-          localStorage.removeItem("pageFormdata")
-          store.navigate("/PageMasterRecords")
-          store.setNotify({
-            SuccessMessage: "Submit Successfully",
-            Success: true,
-          });
-        })
-      } else {
-        funcParams.store.setValidation("ValidateAndShow");
-        funcParams.store.setNotify({
-          Fail:true,
-          FailMessage:"Errors on Page"
-        })
-      }
-    },
-    Edit_Components: Component(store, dynamicData,submitHandler,service).editComponents,
-    Delete_Components: Component(store, dynamicData,submitHandler,service).deleteComponents,
+    submitPageHandler: submitPageHandlerProvider(store, service, submitHandler).submitPageHandler('/PageMasterRecords'),
+    Edit_Components: Component(store, dynamicData, submitHandler, service).editComponents,
+    Delete_Components: Component(store, dynamicData, submitHandler, service).deleteComponents,
     eventAddHandler: async function () {
       const id = store.searchParams?.get("id");
       if (!Array.isArray(store.formData.events)) {