impaktapps-ui-builder 1.0.105 → 1.0.106

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

@@ -3,6 +3,11 @@ export declare let schema: {
     properties: {};
     required: any[];
 };
-export declare function buildSchema(config: any): any;
+export declare function buildSchemaFromConfig(config: any, parentSchema: any): void;
+export declare const buildSchema: (config: any) => {
+    type: string;
+    properties: {};
+    required: any[];
+};
 declare const buildUiSchema: (config: any, store?: any) => any;
 export default buildUiSchema;

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

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

package/package.json

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

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

@@ -132,30 +132,78 @@ function buildNode(config: any): any {
   };
 }
 
-export function buildSchema(config: any): any {
-  const schema: any = {
-    type: "object",
-    properties: {},
-    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] ??= {
+        type: "array",
+        items: {
+          type: "object",
+          properties: {},
+          required: [],
+        },
+      };
+
+      const arrayItemSchema = parentSchema.properties[config.name].items;
 
-  config.elements?.forEach((element: any) => {
-    const node = buildNode(element);
-    if (!node) return;
+      config.elements?.forEach((child: any) =>
+        buildSchemaFromConfig(child, arrayItemSchema)
+      );
+      return;
+    } else {
+      config.elements?.forEach((child: any) =>
+        buildSchemaFromConfig(child, parentSchema)
+      );
+      return;
+    }
+  }
+  // 3️⃣ Handle normal field components
+  parentSchema.properties ??= {};
+  parentSchema.properties[config.name] ??= {};
 
-    schema.properties[element.name] = node.schema;
+  const fieldSchema = parentSchema.properties[config.name];
 
-    if (node.required?.length) {
-      schema.required.push(element.name);
+  // Required validation
+  config.validation?.forEach((v: any) => {
+    if (v.validationType === "required") {
+      parentSchema.required ??= [];
+      parentSchema.required.push(config.name);
+    } else {
+      fieldSchema.type = "string";
+      fieldSchema[v.validationType] = isNaN(v.validationValue)
+        ? v.validationValue
+        : Number(v.validationValue);
     }
   });
 
-  if (schema.required.length === 0) {
-    delete schema.required;
+  // 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 = {
+      oneOf: config.value.map((v: any) => ({
+        const: v.value,
+        title: v.label,
+      })),
+    };
+  }
+}
+
+export const buildSchema = (config) =>{
+  buildSchemaFromConfig(config,schema)
   return schema;
-};
+
+}
 
 const buildUiSchema = (config: any, store?: any) => {
   let elements: any = {};

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

@@ -69,7 +69,8 @@ function executeEventsHandler(params: handlersProps) {
       params.config,
       params.store,
       params.service,
-      params.formDataHolder
+      params.formDataHolder,
+      params.pageLoad
     );
   } else if (params.config.Handler === "onBackHandler") {
     return params.store.functionParameters?.handleBack();
@@ -144,8 +145,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, service: any, formDataHolder: any, pageLoad: boolean) {
   if (eventConfig.type === "Select" && handlerResponse?.data) {
     if (!_.isEmpty(handlerResponse?.data)) {
       store.setSchema((pre) => {
@@ -183,23 +183,36 @@ function mergeFormdata(handlerResponse: any, componentName: string, eventConfig:
         ...store.newData,
         ...handlerResponse?.data
       }
-      store.setFormdata((pre: any) => { return { ...pre, ...handlerResponse?.data } })
+      formDataHolder = { ...formDataHolder, ...handlerResponse?.data }
+      if (!pageLoad) {
+        store.setFormdata((pre: any) => { return { ...pre, ...handlerResponse?.data } })
+      }
     }
   }
   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 } });
+      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
-      store.setFormdata((pre) => { return { ...pre, ...formDataHolder } });
+      if (!pageLoad) {
+        store.setFormdata((pre) => { return { ...pre, [componentName]: handlerResponse.data } });
+      }
     }
   }
-}
+};
 
 const buildBodyFormat = (body: any[], formData: any, userValue: any, store: any) => {
   let finalBody = { ...userValue?.payload };

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

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

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

@@ -90,7 +90,7 @@ export default (funcParams: funcParamsProps) => {
         config: {}, componentName: "",
         store: funcParams.store, dynamicData: funcParams.dynamicData, userValue: funcParams.userValue, service: funcParams.service,
         functionsProvider: funcParams.functionsProvider,
-        serviceHolder: this, eventGroups, formDataHolder
+        serviceHolder: this, eventGroups, formDataHolder,
       }
 
       funcParams.store.setSchema(
@@ -104,9 +104,9 @@ export default (funcParams: funcParamsProps) => {
       await executeRefreshHandler({
         config: {}, componentName: "",
         store: funcParams.store, dynamicData: funcParams.dynamicData, userValue: funcParams.userValue, service: funcParams.service,
-        serviceHolder: this, eventGroups, formDataHolder: {}
+        serviceHolder: this, eventGroups, formDataHolder: formDataHolder, pageLoad: true
       })
-
+      funcParams.store.setFormdata((pre) => ({ ...pre, ...formDataHolder }))
       uiSchema.elements.push(notifyUiSchema);
       funcParams.store.setUiSchema(uiSchema);
     },