impaktapps-ui-builder 1.0.64-alpha.109 → 1.0.64-alpha.111

package/package.json

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

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

@@ -333,13 +333,28 @@ const buildUiSchema = (config: any, store?: any) => {
         });
       }
       elements.elements = config.elements.map((cellElem, elemInd) => {
-        return {
+        const rowElements = []
+        const commonProperties = {
           accessorKey: cellElem.name,
+          type: cellElem.type === "ColumnGroup" ? "ColumnGroup" : cellElem.columnFormat,
           header: cellElem.label || cellElem.name,
           size: sizeMap[cellElem.name] || 180,
-          type: cellElem.columnFormat,
-          elements: cellElem.type == "ColumnGroup" ? cellElem.elements.map((childCellElem) => buildUiSchema(childCellElem, store)) : []
+          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) : {})
+          }
+          rowElements.push(tableElem)
+        } else {
+          rowElements.push({ ...commonProperties })
         }
+        return rowElements
       })
     } else if (config.type == "Table") {
       const sizeMap = {}
@@ -374,27 +389,10 @@ const buildUiSchema = (config: any, store?: any) => {
             tableHeaderElements.push({widget:headerElem});
             return false;
           }
-          let tableElem: any = {
-            // elements: cellElem.type == "ColumnGroup" ? cellElem.elements : [],
-            // widget: buildUiSchema(cellElem, store),
+          const tableElem = {
             widget: cellElem.type != "ColumnGroup" ? buildUiSchema(cellElem, store) : undefined,
-            // elements: cellElem.type == "ColumnGroup" ? 
-            // cellElem.elements.map(
-            //   (childCellElem) => {
-            //     if(childCellElem.type){
-            //       return {widget: buildUiSchema(childCellElem, store),
-            //         ...commonProperties
-            //       }
-            //     }
-            //     else{
-            //       return {...commonProperties}
-            //     }
-            //   }) 
-            // : [],
-            ...commonProperties
-          }
-          if(cellElem.type === "ColumnGroup"){
-            tableElem = {...tableElem, ...buildUiSchema(cellElem, store)}
+            ...commonProperties,
+            ...(cellElem.type === "ColumnGroup" ? buildUiSchema(cellElem, store) : {})
           }
           rowElements.push(tableElem)
         } else {