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

package/dist/impaktapps-ui-builder.es.js

@@ -12571,13 +12571,28 @@ const buildUiSchema = (config2, store2) => {
         });
       }
       elements.elements = config2.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, store2)) : []
+          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, store2) : void 0,
+            ...commonProperties,
+            ...cellElem.type === "ColumnGroup" ? buildUiSchema(cellElem, store2) : {}
+          };
+          rowElements.push(tableElem);
+        } else {
+          rowElements.push({ ...commonProperties });
+        }
+        return rowElements;
       });
     } else if (config2.type == "Table") {
       const sizeMap = {};
@@ -12611,13 +12626,11 @@ const buildUiSchema = (config2, store2) => {
             tableHeaderElements.push({ widget: headerElem });
             return false;
           }
-          let tableElem = {
+          const tableElem = {
             widget: cellElem.type != "ColumnGroup" ? buildUiSchema(cellElem, store2) : void 0,
-            ...commonProperties
+            ...commonProperties,
+            ...cellElem.type === "ColumnGroup" ? buildUiSchema(cellElem, store2) : {}
           };
-          if (cellElem.type === "ColumnGroup") {
-            tableElem = { ...tableElem, ...buildUiSchema(cellElem, store2) };
-          }
           rowElements.push(tableElem);
         } else {
           rowElements.push({ ...commonProperties });