impaktapps-ui-builder 0.0.409-o → 0.0.409-q

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

@@ -1,6 +1,8 @@
 export declare const buildBasicUiSchema: (config: any) => {
     type: string;
-    pageName: string;
-    scope: string;
+    pageName: any;
+    name: any;
+    accessorKey: any;
+    header: any;
     elements: any[];
 };

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

@@ -18,9 +18,6 @@ export declare const CoreSection: {
             main: {
                 label: string;
                 type: string;
-                options?: undefined;
-                color?: undefined;
-                required?: undefined;
             };
         };
         layout?: undefined;
@@ -42,33 +39,6 @@ export declare const CoreSection: {
             main: {
                 label: string;
                 type?: undefined;
-                options?: undefined;
-                color?: undefined;
-                required?: undefined;
-            };
-        };
-        layout?: undefined;
-    } | {
-        type: string;
-        scope: string;
-        options: {
-            widget: string;
-            elementLabelProp?: undefined;
-            detail?: undefined;
-        };
-        config: {
-            layout: {
-                xs: number;
-                sm: number;
-                md: number;
-                lg: number;
-            };
-            main: {
-                label: string;
-                options: any[];
-                color: string;
-                required: boolean;
-                type?: undefined;
             };
         };
         layout?: undefined;

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

@@ -1,6 +1,7 @@
 interface funcParamsProps {
     store: any;
     dynamicData: any;
+    pageConfigProvider: any;
     submitHandler: any;
     service: any;
 }

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

@@ -3,6 +3,7 @@ interface funcParamsProps {
     dynamicData: any;
     service: any;
     userValue: any;
+    pageDataProvider: any;
     functionsProvider?: Record<string, any>;
 }
 export declare const extractEvents: (eventConfig: any) => any;

package/package.json

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

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

@@ -1,7 +1,10 @@
-export const buildBasicUiSchema = (config)=>{
-    return  {
+export const buildBasicUiSchema = (config) => {
+    return {
         "type": "HorizontalLayout",
-        pageName:`${config.name}`,
-        scope:`${config.name}`,
-        "elements": []}
-    }
+        pageName: config.name,
+        name: config.name,
+        accessorKey: config.name,
+        header: config.label || config.name,
+        "elements": []
+    }
+}

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

@@ -289,7 +289,13 @@ const buildUiSchema = (config: any) => {
     case "Timer":
       elements = buildTimer(config, componentScope);
       break;
-
+    case "ColumnGroup":
+      elements = {
+        accessorKey: config.name,
+        header: config.label || config.name,
+        elements: [],
+      }
+      break;
     case "MultipleSelect":
       elements = buildMultiSelect(config, componentScope);
       break;
@@ -309,60 +315,33 @@ const buildUiSchema = (config: any) => {
     if (config?.type === "LeaderBoard") {
       return elements;
     }
-    else if (config.type == "Table") {
+    else if (config.type == "Table" || config.type == "ColumnGroup") {
       const sizeMap = {}
       if (config.sizeHolder) {
         config.sizeHolder.map((e, i) => {
           sizeMap[e.keyName] = e.value
         });
       }
-      function nodeProvider(element) {
-        if (element.type) {
+      elements.elements = config.elements.map((cellElem, elemInd) => {
+        if (cellElem.type) {
           return {
-            accessorKey: element.name,
-            type: element.columnFormat,
-            header: element.label || element.name,
-            size: sizeMap[element.name] || 180,
-            widget: buildUiSchema(element)
-
-          };
-        }
-        return {
-          accessorKey: element.name,
-          type: element.columnFormat,
-          header: element.label || element.name,
-          size: sizeMap[element.name] || 180,
-        }
-      }
-
-      function buildHierarchy(elements, parentName = null) {
-        const result = [];
-        for (const element of elements) {
-          if (element?.parent === parentName) {
-            const children = buildHierarchy(elements, element.name);
-            const node: any = nodeProvider(element)
-            if (children.length > 0) {
-              node.columns = children;
-              node.type = "group";
-            }
-            result.push(node);
+            accessorKey: cellElem.name,
+            header: cellElem.label || cellElem.name,
+            size: sizeMap[cellElem.name] || 180,
+            type: cellElem.columnFormat,
+            widget: cellElem.type != "ColumnGroup" ? buildUiSchema(cellElem) : undefined,
+            elements: cellElem.type == "ColumnGroup" ? cellElem.elements.map((childCellElem) => buildUiSchema(childCellElem)) : []
           }
-        }
-        return result;
-      }
-
-      function transformConfigToOutput(config) {
-        const output = [];
-        const hierarchy = buildHierarchy(config.elements, config.name);
-        for (const element of config.elements) {
-          const parentExists = config.elements.some(e => e.name === element.parent);
-          if (!parentExists && element.parent !== config.name) {
-            output.push(nodeProvider(element))
+        } else {
+          return {
+            accessorKey: cellElem.name,
+            type: cellElem.columnFormat,
+            header: cellElem.label || cellElem.name,
+            size: sizeMap[cellElem.name] || 180
           }
         }
-        return [ ...hierarchy,...output,];
-      }
-      elements.elements = transformConfigToOutput(config)
+
+      })
     }
     else if (config.type == "Array") {
       elements.options.detail.elements = config.elements.map((e: any, elemInd: number) => {
@@ -445,11 +424,11 @@ function buildHierarchy(elements, parentName = null, sizeMap) {
 
 function transformConfigToOutput(config, sizeMap) {
   const output = [];
-  const hierarchy = buildHierarchy(config.elements, config.name,schema);
+  const hierarchy = buildHierarchy(config.elements, config.name, schema);
   for (const element of config.elements) {
     const parentExists = config.elements.some(e => e.name === element.parent);
     if (!parentExists && element.parent !== config.name) {
-      output.push(nodeProvider(element,sizeMap))
+      output.push(nodeProvider(element, sizeMap))
     }
   }
   return [...hierarchy, ...output,];

package/src/impaktapps-ui-builder/builder/build/uischema/coreSection.ts

@@ -54,28 +54,6 @@ export const CoreSection = {
         },
       },
     },
-    {
-      type: "Control",
-      scope: "#/properties/parent",
-
-      options: {
-        widget: "InputField",
-      },
-      config: {
-        layout: {
-          xs: 12,
-          sm: 12,
-          md: 6,
-          lg: 6,
-        },
-        main: {
-          label: "parent",
-          options: [],
-          color: "secondary",
-          required: true,
-        },
-      },
-    },
     {
       type: "Control",
       scope: "#/properties/columnFormat",

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

@@ -41,8 +41,8 @@ export const ComponentSchema: any = {
         { title: "Upload File", const: "UploadFile" },
         { title: "Timer", const: "Timer" },
         { title: "Upload File", const: "UploadFile" },
-
         { title: "TreeMap", const: "TreeMap" },
+        { title: "ColumnGroup", const: "ColumnGroup" },
       ]
     },
     columnFormat: {

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

@@ -148,29 +148,6 @@ export const componentBasicUiSchema: any = {
                 },
               },
             },
-          
-            {
-              type: "Control",
-              scope: "#/properties/parent",
-
-              options: {
-                widget: "InputField",
-              },
-              config: {
-                layout: {
-                  xs: 12,
-                  sm: 12,
-                  md: 6,
-                  lg: 6,
-                },
-                main: {
-                  label: "parent",
-                  options: [],
-                  color: "secondary",
-                  required: true,
-                },
-              },
-            },
             {
               type: "Control",
               scope: "#/properties/columnFormat",

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

@@ -37,7 +37,8 @@ const sectionLabels = {
   Stepper: ["Core", "Components", "Properties", "Event", "Style"],
   DataGrid: ["Core", "Components", "Properties", "Event", "Style"],
   InputSlider: ["Core", "Properties", "Event", "Style", "Validation"],
-  TreeMap: ["Core", "Components", "Properties", "Event", "Style",],
+  TreeMap: ["Core", "Components", "Properties", "Event", "Style"],
+  ColumnGroup: ["Core", "Components"]
 }
 
 

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

@@ -8,12 +8,12 @@ import { getFormdataFromLocalStorage, saveFormdataInLocalStorage, saveHandler }
 interface funcParamsProps {
   store: any,
   dynamicData: any,
-
+  pageConfigProvider: any,
   submitHandler: any,
   service: any
 }
 export default (funcParams: funcParamsProps) => {
-  const { store, dynamicData,  submitHandler, service } = funcParams
+  const { store, dynamicData, submitHandler, service } = funcParams
   return {
     setPage: async function () {
       const formdata = await this.getFormdata();
@@ -25,12 +25,7 @@ export default (funcParams: funcParamsProps) => {
     },
     getFormdata: async function () {
       const id = store.searchParams?.get("id");
-      let config: any = {};
-        if (id) {
-          await service.get(`/page/getById?id=${id}`).then((res: any) => {
-            config = res.data?.config;
-          });
-        }
+      let config: any = await funcParams.pageConfigProvider()
       const formData = getFormdataFromLocalStorage()
       if (formData) {
         return formData;
@@ -58,7 +53,7 @@ export default (funcParams: funcParamsProps) => {
         store.navigate(
           `/Component?path=${`elements[${response?.elements.length}]`}&id=${id}`
         );
-      }else{
+      } else {
         store.navigate(
           `/Component?path=${`elements[${response?.elements.length}]`}`
         );

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

@@ -18,6 +18,7 @@ interface funcParamsProps {
   dynamicData: any,
   service: any,
   userValue: any,
+  pageDataProvider: any,
   functionsProvider?: Record<string, any>
 }
 
@@ -64,29 +65,13 @@ export default (funcParams: funcParamsProps) => {
   return {
     setPage: async function () {
       funcParams.store.setFormdata({})
-      const data = JSON.stringify({
-        pageName: funcParams.store.pageName
-      });
+
       let pageData;
       const pageBasicDetailString = localStorage.getItem("pagemasterMetaData")
       if (pageBasicDetailString) {
         pageData = JSON.parse(pageBasicDetailString)
       } else {
-        const pageId = await funcParams.service
-          .post("/page/getByName", data, {
-            headers: {
-              "Content-Type": "application/json",
-            },
-          });
-        const response = await funcParams.service.get(
-          `/page/getById?id=${pageId?.data?.id}`,
-          {
-            headers: {
-              "Content-Type": "application/json",
-            },
-          }
-        );
-        pageData = response.data;
+        pageData = funcParams.pageDataProvider();
         localStorage.setItem("pagemasterMetaData", JSON.stringify({
           schema: pageData?.schema,
           uiSchema: pageData?.uiSchema, config: pageData?.config
@@ -121,19 +106,20 @@ export default (funcParams: funcParamsProps) => {
 
     },
     onCellRenderer: (cellParams) => {
-      let finalResponse = {};
-      // cellParams.spanRef.current.style.color = "yellow";
-      const path = funcParams.dynamicData?.tableButtonPath || funcParams.dynamicData.path.split(".")[0];
-      for (const eventConfig of eventGroups?.onCellRenderer[path]) {
-        executeEventsParameters.store.functionParameters = cellParams
-        finalResponse = executeEvents({
-          ...executeEventsParameters,
-          config: eventConfig,
-          componentName: path
-        })
+      if (eventGroups.onCellRenderer) {
+        let finalResponse = {};
+        const path = funcParams.dynamicData?.tableButtonPath || funcParams?.dynamicData?.path?.split(".")[0];
+        for (const eventConfig of eventGroups?.onCellRenderer[path]) {
+          executeEventsParameters.store.functionParameters = cellParams
+          finalResponse = executeEvents({
+            ...executeEventsParameters,
+            config: eventConfig,
+            componentName: path
+          })
+        }
+        return finalResponse
       }
-      console.log("finalResponse >> >> >> ", finalResponse)
-      return finalResponse
+      return {}
     },
     onClick: function () {
       this.callHandler("onClick")
@@ -237,7 +223,7 @@ export default (funcParams: funcParamsProps) => {
       if (eventGroups?.[eventType]?.[path] !== undefined) {
         for (const eventConfig of eventGroups?.[eventType]?.[path]) {
           executeEventsParameters.store.functionParameters = functionParameters
-           executeEvents({
+          executeEvents({
             ...executeEventsParameters,
             config: eventConfig,
             componentName: path