impaktapps-ui-builder 1.0.3 → 1.0.5

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

@@ -2,7 +2,7 @@ import { PageMasterSchema } from "../elements/UiSchema/PageMaster/schema";
 import { PageMasterUiSchema } from "../elements/UiSchema/PageMaster/uiSchema";
 import _ from "lodash";
 import Component from "./component";
-import { getFormdataFromSessionStorage, saveFormdataInSessionStorage, saveHandler } from "./utils";
+import { getFormdataFromSessionStorage, validateAndShowErrors, saveFormdataInSessionStorage, saveHandler } from "./utils";
 
 
 interface funcParamsProps {
@@ -31,18 +31,18 @@ export default (funcParams: funcParamsProps) => {
         return formData;
       }
       saveFormdataInSessionStorage(config)
-      return config
+      return { ...config, type: "page" }
     },
     getUiSchema: function () {
       const UiSchema = _.cloneDeep(PageMasterUiSchema(store.theme.myTheme));
-      if (sessionStorage.getItem("copiedConfig") ) {
+      if (sessionStorage.getItem("copiedConfig")) {
         Component(store, dynamicData, submitHandler, service).ElementPathSetter(UiSchema)
       }
       return UiSchema;
     },
     getSchema: () => {
       const schema = _.cloneDeep(PageMasterSchema);
-      if (sessionStorage.getItem("copiedConfig") ) {
+      if (sessionStorage.getItem("copiedConfig")) {
         schema.properties.RemoveItemButton.disabled = false;
       }
       return schema;
@@ -52,6 +52,7 @@ export default (funcParams: funcParamsProps) => {
       store.navigate("/PageMasterRecords");
     },
     onAddClickHandler: function () {
+      if (validateAndShowErrors(store)) return; 
       const id = store.searchParams?.get("id");
       if (!Array.isArray(store.formData.elements)) {
         store.formData.elements = []
@@ -70,12 +71,13 @@ export default (funcParams: funcParamsProps) => {
     },
     saveHandler: async () => await saveHandler(store, service, submitHandler),
     Edit_Components: Component(store, dynamicData, submitHandler, service).editComponents,
-    
-    Delete_Components: async function() {
+
+    Delete_Components: async function () {
       await Component(store, dynamicData, submitHandler, service).deleteComponents(false);
       store.updateDialog("popUpPageMasterComponent");
     },
     eventAddHandler: function () {
+      if (validateAndShowErrors(store)) return; 
       const id = store.searchParams?.get("id");
       if (!Array.isArray(store.formData.events)) {
         store.formData.events = []
@@ -85,6 +87,7 @@ export default (funcParams: funcParamsProps) => {
       store.navigate(`/ComponentEvents?path=${finalPath}&id=${id}`)
     },
     editEvent: function () {
+      if (validateAndShowErrors(store)) return; 
       const rowId = dynamicData.path.split(".")[1];
       const id = store.searchParams?.get("id");
       saveFormdataInSessionStorage(store.ctx.core.data)
@@ -99,25 +102,25 @@ export default (funcParams: funcParamsProps) => {
       store.updateDialog("popUpPageMasterEvent");
       sessionStorage.removeItem('rowId');
     },
-    deletePopUpComponent: function(){
+    deletePopUpComponent: function () {
       const rowId = dynamicData.path.split(".")[1];
-      sessionStorage.setItem('rowId',rowId);
+      sessionStorage.setItem('rowId', rowId);
       store.updateDialog("popUpPageMasterComponent");
     },
-    deletePopUpEvent: function(){
+    deletePopUpEvent: function () {
       const rowId = dynamicData.path.split(".")[1];
-      sessionStorage.setItem('rowId',rowId);
+      sessionStorage.setItem('rowId', rowId);
       store.updateDialog("popUpPageMasterEvent");
     },
 
 
-    copyPasteElement:  function(){
-      Component(store, dynamicData, submitHandler, service).copyPasteElement(store,this.setPage.bind(this));
+    copyPasteElement: function () {
+      Component(store, dynamicData, submitHandler, service).copyPasteElement(store, this.setPage.bind(this));
     },
-    
-    RemoveItemButton: function(){
+
+    RemoveItemButton: function () {
       Component(store, dynamicData, submitHandler, service).RemoveItemButton(store)
     },
-    
+
   }
 };

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

@@ -5,6 +5,16 @@ const clearFromSessionStorage = () => {
     sessionStorage.removeItem("pageFormdata")
 }
 export default clearFromSessionStorage;
+
+export const validateAndShowErrors = (store: any): boolean => {
+    if (_.isEmpty(store.ctx.core.errors)) return false;
+    store.setValidation("ValidateAndShow");
+    store.setNotify({
+        Fail: true,
+        FailMessage: "Error on Page"
+    });
+    return true;
+};
 export const getNavigationHistory = (config: any, path: string | undefined) => {
     if (path) {
         let urlRoutes: string = config.name;
@@ -67,12 +77,14 @@ export async function saveHandler(store, service, submitHandler) {
             const saveReturn = await submitHandler(store, service, config);
             navigateHandler(store, true,"/PageMasterRecords")
         } catch (err) {
-            navigateHandler(store, false)
+            navigateHandler(store, false, undefined, err.message);
         }
+    }else{
+        navigateHandler(store, false)
     }
 }
 
-export const navigateHandler = (store, isSubmitted, pageName?: string | boolean) => {
+export const navigateHandler = (store, isSubmitted,pageName?: string | boolean, errorMessage?: string) => {
     if (isSubmitted) {
         sessionStorage.removeItem("pageFormdata");
         store.navigate(pageName || -1)
@@ -84,7 +96,7 @@ export const navigateHandler = (store, isSubmitted, pageName?: string | boolean)
         store.setValidation("ValidateAndShow");
         store.setNotify({
             Fail: true,
-            FailMessage: "Errors on Page"
+            FailMessage: errorMessage || "Errors on Page"
         });
     }
 };

package/src/impaktapps-ui-builder/lib/index.ts

@@ -1,10 +1,11 @@
 
-export {default as pageMaster} from "../builder/services/pageMaster"
-export {default as pageMasterEvents} from "../builder/services/event"
-export {default as pageMasterComponents} from "../builder/services/component"
-export {default as pageService} from "../runtime/services/service"
-export { schema} from "../builder/build/buildUiSchema"
-export {default as buildConfig} from "../builder/build/buildConfig"
-export  {default as buildUiSchema} from "../builder/build/buildUiSchema"
-export  {buildSchema} from "../builder/build/buildUiSchema"
-export {default as clearFromSessionStorage} from "../builder/services/utils"
+export { default as pageMaster } from "../builder/services/pageMaster"
+export { default as pageMasterEvents } from "../builder/services/event"
+export { default as pageMasterComponents } from "../builder/services/component"
+export { default as pageService } from "../runtime/services/service"
+export { schema } from "../builder/build/buildUiSchema"
+export { default as buildConfig } from "../builder/build/buildConfig"
+export { default as buildUiSchema } from "../builder/build/buildUiSchema"
+export { buildSchema } from "../builder/build/buildUiSchema"
+export { default as clearFromSessionStorage } from "../builder/services/utils"
+export { downloadFile, downloadFileFromUrl } from "../runtime/services/downloadFile"

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

@@ -1,32 +1,47 @@
-export const downloadFile = (obj: any) => {
-    const typeArr = obj.name.split(".");
-    const data = obj.data;
-    const finalData = window.atob(data);
-    let file;
-    file = new File([finalData], typeArr[typeArr.length - 1]);
-
-    const url = URL.createObjectURL(file);
-    const link = document.createElement("a");
-    link.href = typeArr[typeArr.length - 1] === 'pdf' ? 'data:application/octet-stream;base64,' + data : url;
-    link.download = `${obj.name}`;
-    document.body.appendChild(link);
-    link.click();
+export function downloadFile({ data, name }: { data: string; name: string }) {
+    const binary = window.atob(data);
+    const bytes = new Uint8Array(binary.length);
+
+    for (let i = 0; i < binary.length; i++) {
+        bytes[i] = binary.charCodeAt(i);
+    }
+
+    const extension = name.split(".").pop()?.toLowerCase();
+    const mimeMap: Record<string, string> = {
+        pdf: "application/pdf",
+        png: "image/png",
+        jpg: "image/jpeg",
+        jpeg: "image/jpeg",
+        xlsx: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        csv: "text/csv",
+    };
+
+    const blob = new Blob([bytes], {
+        type: mimeMap[extension!] || "application/octet-stream",
+    });
+
+    const url = URL.createObjectURL(blob);
+    const a = document.createElement("a");
+    a.href = url;
+    a.download = name;
+    a.click();
 
     URL.revokeObjectURL(url);
-    document.body.removeChild(link);
-};
+}
 
-export const doDownload = (response: any, service) => {
+export const downloadFileFromUrl = (response: any, service) => {
     let url = `${service.defaults.baseURL}/${response.path}`;
     if (response?.params) {
         const keysArray = Object.keys(response?.params);
         keysArray.map((e, i) => {
-            url = url + `${i === 0?"?":"&"}${e}=${response?.params[e]}`
+            url = url + `${i === 0 ? "?" : "&"}${e}=${response?.params[e]}`
         })
-    }
+    };
     const link = document.createElement('a');
     link.href = url;
     document.body.appendChild(link);
     link.click();
     link.parentNode.removeChild(link);
 };
+
+

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

@@ -1,4 +1,4 @@
-import _ from "lodash";
+import _, { isObject, mapKeys } from "lodash";
 import { handlersProps } from "./interface";
 export const executeEvents = (params: handlersProps) => {
   let nextEvent = [];
@@ -68,8 +68,7 @@ function executeEventsHandler(params: handlersProps) {
       params.componentName,
       params.config,
       params.store,
-      params.service,
-      params.formDataHolder
+      params.formDataHolder,
     );
   } else if (params.config.Handler === "onBackHandler") {
     return params.store.functionParameters?.handleBack();
@@ -144,8 +143,7 @@ function executeCustomHandler(params: handlersProps) {
   }
 
 }
-
-function mergeFormdata(handlerResponse: any, componentName: string, eventConfig: any, store: any, service: any, formDataHolder: any) {
+function mergeFormdata(handlerResponse: any, componentName: string, eventConfig: any, store: any, formDataHolder: any) {
   if (eventConfig.type === "Select" && handlerResponse?.data) {
     if (!_.isEmpty(handlerResponse?.data)) {
       store.setSchema((pre) => {
@@ -178,28 +176,28 @@ function mergeFormdata(handlerResponse: any, componentName: string, eventConfig:
     }
   }
   else if (eventConfig.type === "page") {
-    if (!(_.isEmpty(handlerResponse?.data) && handlerResponse?.data)) {
+    if (!(_.isEmpty(handlerResponse?.data) && handlerResponse?.data && isObject(handlerResponse.data))) {
       store.newData = {
         ...store.newData,
         ...handlerResponse?.data
       }
-      store.setFormdata((pre: any) => { return { ...pre, ...handlerResponse?.data } })
+      Object.keys(handlerResponse.data).forEach((e) => {
+        formDataHolder[e] = handlerResponse.data[e]
+      })
     }
   }
   else if (eventConfig.type === "Table" && eventConfig.lazyLoading) {
     if (handlerResponse && handlerResponse?.data) {
       formDataHolder[componentName] = handlerResponse.data?.data
       formDataHolder[`${componentName}_RowCount`] = handlerResponse.data?.meta?.totalRowCount
-      store.setFormdata((pre) => { return { ...pre, ...formDataHolder } });
     }
   }
   else {
-    if (handlerResponse) {
+    if (handlerResponse?.data) {
       formDataHolder[componentName] = handlerResponse.data
-      store.setFormdata((pre) => { return { ...pre, ...formDataHolder } });
     }
   }
-}
+};
 
 const buildBodyFormat = (body: any[], formData: any, userValue: any, store: any) => {
   let finalBody = { ...userValue?.payload };