impaktapps-ui-builder 1.0.64-alpha.115 → 1.0.64-alpha.117

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "impaktapps-ui-builder",
-    "version": "1.0.64-alpha.115",
+    "version": "1.0.64-alpha.117",
     "scripts": {
         "dev": "vite",
         "build": "tsc && vite build",

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

@@ -321,18 +321,6 @@ const buildUiSchema = (config: any, store?: any) => {
       elements = buildBasicUiSchema(config)
   }
 
-  const getCommonProperties = (cellElem, sizeMap) => {
-    return {
-          accessorKey: cellElem.name,
-          type: cellElem.type === "ColumnGroup" ? "ColumnGroup" : cellElem.columnFormat,
-          header: cellElem.label || cellElem.name,
-          size: sizeMap[cellElem.name] || 180,
-          enableColumnFilter: cellElem.enableFilter === "No" ? false : true,
-          columnFilterModeOptions: cellElem.filteringOptions,
-          enableSorting: cellElem.enableSorting === "No" ? false : true,
-          columnKey: cellElem.columnKey
-        }
-  }
   if (config?.elements) {
     if (config?.type === "LeaderBoard") {
       return elements;
@@ -345,10 +333,25 @@ const buildUiSchema = (config: any, store?: any) => {
         });
       }
       elements.elements = config.elements.map((cellElem, elemInd) => {
-        return {
-          widget: (cellElem.type && cellElem.type != "ColumnGroup") ? buildUiSchema(cellElem, store) : undefined,
-          elements: cellElem.type == "ColumnGroup" ? cellElem.elements.map((childCellElem) => getCommonProperties(childCellElem, sizeMap)) : [],
-          ...getCommonProperties(cellElem, sizeMap)
+        const commonProperties = {
+          accessorKey: cellElem.name,
+          type: cellElem.type === "ColumnGroup" ? "ColumnGroup" : cellElem.columnFormat,
+          header: cellElem.label || cellElem.name,
+          size: sizeMap[cellElem.name] || 180,
+          enableColumnFilter: cellElem.enableFilter === "No" ? false : true,
+          columnFilterModeOptions: cellElem.filteringOptions,
+          enableSorting: cellElem.enableSorting === "No" ? false : true,
+          columnKey: cellElem.columnKey
+        }
+        if (cellElem.type) {
+          const tableElem = {
+            widget: cellElem.type != "ColumnGroup" ? buildUiSchema(cellElem, store) : undefined,
+            ...commonProperties,
+            ...(cellElem.type === "ColumnGroup" ? buildUiSchema(cellElem, store) : {})
+          }
+          return tableElem
+        } else {
+          return { ...commonProperties }
         }
       })
     } else if (config.type == "Table") {
@@ -363,16 +366,16 @@ const buildUiSchema = (config: any, store?: any) => {
       const tableActionElement = [];
       const rowElements = []
       config.elements.filter((cellElem, elemInd) => {
-        // const commonProperties = {
-        //   accessorKey: cellElem.name,
-        //   type: cellElem.type === "ColumnGroup" ? "ColumnGroup" : cellElem.columnFormat,
-        //   header: cellElem.label || cellElem.name,
-        //   size: sizeMap[cellElem.name] || 180,
-        //   enableColumnFilter: cellElem.enableFilter === "No" ? false : true,
-        //   columnFilterModeOptions: cellElem.filteringOptions,
-        //   enableSorting: cellElem.enableSorting === "No" ? false : true,
-        //   columnKey: cellElem.columnKey
-        // }
+        const commonProperties = {
+          accessorKey: cellElem.name,
+          type: cellElem.type === "ColumnGroup" ? "ColumnGroup" : cellElem.columnFormat,
+          header: cellElem.label || cellElem.name,
+          size: sizeMap[cellElem.name] || 180,
+          enableColumnFilter: cellElem.enableFilter === "No" ? false : true,
+          columnFilterModeOptions: cellElem.filteringOptions,
+          enableSorting: cellElem.enableSorting === "No" ? false : true,
+          columnKey: cellElem.columnKey
+        }
         if (cellElem.type) {
           if (cellElem.elementType == "action") {
             const actionElem = buildUiSchema(cellElem, store);
@@ -386,13 +389,12 @@ const buildUiSchema = (config: any, store?: any) => {
           }
           const tableElem = {
             widget: cellElem.type != "ColumnGroup" ? buildUiSchema(cellElem, store) : undefined,
-            elements: cellElem.type == "ColumnGroup" ? cellElem.elements.map((childCellElem) => getCommonProperties(childCellElem, sizeMap)) : [],
-            ...getCommonProperties(cellElem, sizeMap)
-
+            ...commonProperties,
+            ...(cellElem.type === "ColumnGroup" ? buildUiSchema(cellElem, store) : {})
           }
           rowElements.push(tableElem)
         } else {
-          rowElements.push({ ...getCommonProperties(cellElem, sizeMap) })
+          rowElements.push({ ...commonProperties })
         }
 
       })