impaktapps-ui-builder 1.0.106 → 1.0.108

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

@@ -10,5 +10,4 @@ export interface handlersProps {
     parentEventOutput?: any;
     functionsProvider?: Record<string, any>;
     formDataHolder?: Record<string, any>;
-    pageLoad?: boolean;
 }

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

@@ -27,7 +27,7 @@ declare const _default: (funcParams: funcParamsProps) => {
     onBack: (functionParameters: any) => Promise<void>;
     onNext: (functionParameters: any) => Promise<void>;
     onReset: (functionParameters: any) => Promise<void>;
-    callHandler: (eventType: string, functionParameters?: any) => Promise<void>;
+    callHandler: (eventType: string, functionParameters?: any) => void;
     downloadFile: typeof downloadFile;
     downloadFileFromUrl: (response: any, service: any) => void;
 };

package/package.json

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

package/src/impaktapps-ui-builder/builder/build/buildCard.ts

@@ -7,9 +7,9 @@ export const buildCard = (config,componentScope,store) =>{
     if (config.style) {
       card.config.wrapperStyle = JSON.parse(config.style)
     }
-    card.elements[0].elements[0].elements[0].elements[1].scope = `#/properties/${config.name}/properties/value`
-    card.elements[1].scope = `#/properties/${config.name}/properties/url`
-    card.elements[0].elements[0].elements[1].scope = `#/properties/${config.name}/properties/description`
+    card.elements[0].elements[0].elements[0].elements[1].scope = `#/properties/${config.name}/properties/value`;
+    card.elements[1].scope = `#/properties/${config.name}/properties/url`;
+    card.elements[0].elements[0].elements[1].scope = `#/properties/${config.name}/properties/description`;
     if(config.layout){
       card.config.layout = createLayoutFormat(config.layout)
     }

package/src/impaktapps-ui-builder/builder/build/buildUiSchema.ts

@@ -51,91 +51,8 @@ function buildOneOf(values: any[]) {
     title: e.label
   }));
 }
-function applyValidations(
-  schemaNode: any,
-  validations: any[] = [],
-  requiredArr?: string[],
-  fieldName?: string
-) {
-  validations.forEach((rule) => {
-    if (rule.validationType === "readOnly") {
-      schemaNode.disabled = true
-    }
-    if (rule.validationType === "required") {
-      if (requiredArr && fieldName) {
-        requiredArr.push(fieldName);
-      }
-    } else {
-      schemaNode.type = "string";
-      schemaNode[rule.validationType] =
-        isNaN(rule.validationValue)
-          ? rule.validationValue
-          : Number(rule.validationValue);
-    }
-  });
-}
-
-function buildNode(config: any): any {
-  if (config.type === "Array") {
-    const arraySchema: any = {
-      type: "array",
-      items: {
-        type: "object",
-        properties: {},
-        required: []
-      }
-    };
-
-    config.elements?.forEach((child: any) => {
-      const childNode = buildNode(child);
-      if (!childNode) return;
-
-      arraySchema.items.properties[child.name] = childNode.schema;
-
-      if (childNode.required?.length) {
-        arraySchema.items.required.push(child.name);
-      }
-    });
-
-    return { schema: arraySchema };
-  }
-
-  let fieldSchema: any = {};
-  if (
-    (config.type === "Select" || config.type === "MultipleSelect") &&
-    config.value?.length > 0
-  ) {
-    if (config.type === "Select") {
-      fieldSchema.oneOf = buildOneOf(config.value);
-    } else {
-      fieldSchema.type = "array";
-      fieldSchema.items = {
-        oneOf: buildOneOf(config.value)
-      };
-    }
-  }
-
-  if (config.validation) {
-    applyValidations(fieldSchema, config.validation);
-  }
-
-  const required =
-    config.validation?.some(
-      (v: any) => v.validationType === "required"
-    )
-      ? [config.name]
-      : [];
-
-  return {
-    schema: fieldSchema,
-    required
-  };
-}
-
 export function buildSchemaFromConfig(config: any, parentSchema: any) {
-
   if (config.elements) {
-    // 2️⃣ Handle Array component
     if (config.type === "Array") {
       parentSchema.properties ??= {};
       parentSchema.properties[config.name] ??= {
@@ -160,17 +77,16 @@ export function buildSchemaFromConfig(config: any, parentSchema: any) {
       return;
     }
   }
-  // 3️⃣ Handle normal field components
   parentSchema.properties ??= {};
   parentSchema.properties[config.name] ??= {};
-
   const fieldSchema = parentSchema.properties[config.name];
-
-  // Required validation
   config.validation?.forEach((v: any) => {
     if (v.validationType === "required") {
       parentSchema.required ??= [];
       parentSchema.required.push(config.name);
+    } else if (v.validationType === "readOnly") {
+      fieldSchema.type = "string";
+      fieldSchema.disabled = true;
     } else {
       fieldSchema.type = "string";
       fieldSchema[v.validationType] = isNaN(v.validationValue)
@@ -178,16 +94,12 @@ export function buildSchemaFromConfig(config: any, parentSchema: any) {
         : Number(v.validationValue);
     }
   });
-
-  // Select
   if (config.type === "Select" && config.value?.length) {
     fieldSchema.oneOf = config.value.map((v: any) => ({
       const: v.value,
       title: v.label,
     }));
   }
-
-  // MultipleSelect
   if (config.type === "MultipleSelect" && config.value?.length) {
     fieldSchema.type = "array";
     fieldSchema.items = {
@@ -199,10 +111,9 @@ export function buildSchemaFromConfig(config: any, parentSchema: any) {
   }
 }
 
-export const buildSchema = (config) =>{
-  buildSchemaFromConfig(config,schema)
+export const buildSchema = (config) => {
+  buildSchemaFromConfig(config, schema)
   return schema;
-
 }
 
 const buildUiSchema = (config: any, store?: any) => {

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

@@ -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;
@@ -70,8 +70,8 @@ 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");
     },
@@ -99,25 +99,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/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,9 +68,7 @@ function executeEventsHandler(params: handlersProps) {
       params.componentName,
       params.config,
       params.store,
-      params.service,
       params.formDataHolder,
-      params.pageLoad
     );
   } else if (params.config.Handler === "onBackHandler") {
     return params.store.functionParameters?.handleBack();
@@ -145,7 +143,7 @@ function executeCustomHandler(params: handlersProps) {
   }
 
 }
-function mergeFormdata(handlerResponse: any, componentName: string, eventConfig: any, store: any, service: any, formDataHolder: any, pageLoad: boolean) {
+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,38 +176,27 @@ 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
       }
-      formDataHolder = { ...formDataHolder, ...handlerResponse?.data }
-      if (!pageLoad) {
-        store.setFormdata((pre: any) => { return { ...pre, ...handlerResponse?.data } })
-      }
+      const keys = Object.keys(handlerResponse.data)
+      keys.map((e) => {
+        formDataHolder[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
-      if (!pageLoad) {
-        store.setFormdata((pre: any) => {
-          return {
-            ...pre,
-            [componentName]: handlerResponse.data?.data,
-            [`${componentName}_RowCount`]: handlerResponse.data?.meta?.totalRowCount
-          }
-        })
-      }
     }
   }
   else {
     if (handlerResponse) {
       formDataHolder[componentName] = handlerResponse.data
-      if (!pageLoad) {
-        store.setFormdata((pre) => { return { ...pre, [componentName]: handlerResponse.data } });
-      }
     }
   }
 };

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

@@ -10,5 +10,4 @@ export interface handlersProps {
     parentEventOutput?: any,
     functionsProvider?:Record<string,any>
     formDataHolder?:Record<string,any>
-    pageLoad?: boolean
 }

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

@@ -62,7 +62,7 @@ export const extractEvents = (eventConfig: any) => {
   return eventGroups;
 };
 export default (funcParams: funcParamsProps) => {
-  const formDataHolder = {}
+  const formDataHolder = {};
   let executeEventsParameters: handlersProps = {
     config: {}, componentName: "",
     store: funcParams.store, dynamicData: funcParams.dynamicData, userValue: funcParams.userValue, service: funcParams.service,
@@ -104,7 +104,7 @@ export default (funcParams: funcParamsProps) => {
       await executeRefreshHandler({
         config: {}, componentName: "",
         store: funcParams.store, dynamicData: funcParams.dynamicData, userValue: funcParams.userValue, service: funcParams.service,
-        serviceHolder: this, eventGroups, formDataHolder: formDataHolder, pageLoad: true
+        serviceHolder: this, eventGroups, formDataHolder: formDataHolder
       })
       funcParams.store.setFormdata((pre) => ({ ...pre, ...formDataHolder }))
       uiSchema.elements.push(notifyUiSchema);
@@ -225,35 +225,46 @@ export default (funcParams: funcParamsProps) => {
     },
     onBack: async function (functionParameters) {
       const path = funcParams.dynamicData?.tableButtonPath || funcParams.dynamicData.path.split(".")[0];
-      await this.callHandler("onBack", functionParameters)
+      this.callHandler("onBack", functionParameters)
       if (eventGroups?.["onBack"]?.[path] === undefined) {
         functionParameters?.handleBack()
       }
     },
     onNext: async function (functionParameters) {
       const path = funcParams.dynamicData?.tableButtonPath || funcParams.dynamicData.path.split(".")[0];
-      await this.callHandler("onNext", functionParameters)
+      this.callHandler("onNext", functionParameters)
       if (eventGroups?.["onNext"]?.[path] === undefined) {
         functionParameters?.handleNext()
       }
     },
     onReset: async function (functionParameters) {
       const path = funcParams.dynamicData?.tableButtonPath || funcParams.dynamicData.path.split(".")[0];
-      await this.callHandler("onReset", functionParameters)
+      this.callHandler("onReset", functionParameters)
       if (eventGroups?.["onReset"]?.[path] === undefined) {
         functionParameters?.handleReset()
       }
     },
-    callHandler: async function (eventType: string, functionParameters?: any) {
+    callHandler: function (eventType: string, functionParameters?: any) {
       const path = funcParams.dynamicData?.tableButtonPath || funcParams.dynamicData.path.split(".")[funcParams.dynamicData.path.split(".").length - 1];
       if (eventGroups?.[eventType]?.[path] !== undefined) {
-        Promise.all(eventGroups?.[eventType]?.[path].map((eventConfig) => {
+        (eventGroups?.[eventType]?.[path].map((eventConfig) => {
           executeEventsParameters.store.functionParameters = functionParameters
-          executeEvents({
-            ...executeEventsParameters,
-            config: eventConfig,
-            componentName: path
-          })
+          if (eventConfig.Handler === "refresh") {
+            executeEvents({
+              ...executeEventsParameters,
+              config: eventConfig,
+              componentName: path,
+              formDataHolder: formDataHolder
+            }).then((res) => {
+              funcParams.store.setFormdata((pre) => ({ ...pre, ...formDataHolder }));
+            });
+          } else {
+            executeEvents({
+              ...executeEventsParameters,
+              config: eventConfig,
+              componentName: path
+            })
+          }
         }))
       }
     },