impaktapps-ui-builder 1.0.66-alpha.1 → 1.0.66-alpha.2

package/package.json

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

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

@@ -333,25 +333,12 @@ const buildUiSchema = (config: any, store?: any) => {
         });
       }
       elements.elements = config.elements.map((cellElem, elemInd) => {
-        const commonProperties = {
+        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 (cellElem.type) {
-          const tableElem = {
-            widget: cellElem.type != "ColumnGroup" ? buildUiSchema(cellElem, store) : undefined,
-            ...commonProperties,
-            ...(cellElem.type === "ColumnGroup" ? buildUiSchema(cellElem, store) : {})
-          }
-          return tableElem
-        } else {
-          return { ...commonProperties }
+          type: cellElem.columnFormat,
+          elements: cellElem.type == "ColumnGroup" ? cellElem.elements.map((childCellElem) => buildUiSchema(childCellElem, store)) : []
         }
       })
     } else if (config.type == "Table") {
@@ -368,7 +355,7 @@ const buildUiSchema = (config: any, store?: any) => {
       config.elements.filter((cellElem, elemInd) => {
         const commonProperties = {
           accessorKey: cellElem.name,
-          type: cellElem.type === "ColumnGroup" ? "ColumnGroup" : cellElem.columnFormat,
+          type: cellElem.columnFormat,
           header: cellElem.label || cellElem.name,
           size: sizeMap[cellElem.name] || 180,
           enableColumnFilter: cellElem.enableFilter === "No" ? false : true,
@@ -389,8 +376,9 @@ const buildUiSchema = (config: any, store?: any) => {
           }
           const tableElem = {
             widget: cellElem.type != "ColumnGroup" ? buildUiSchema(cellElem, store) : undefined,
-            ...commonProperties,
-            ...(cellElem.type === "ColumnGroup" ? buildUiSchema(cellElem, store) : {})
+            elements: cellElem.type == "ColumnGroup" ? cellElem.elements.map((childCellElem) => buildUiSchema(childCellElem, store)) : [],
+            ...commonProperties
+
           }
           rowElements.push(tableElem)
         } else {

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

@@ -2,7 +2,7 @@ import { EventUiSchema } from "../event/uiSchema"
 export const PageMasterUiSchema: any = (theme) => {
   const uiSchema = {
     type: "HorizontalLayout",
-    heading: "Page",
+    heading: "Page-add",
     elements: [
       {
         type: "WrapperLayout",

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

@@ -70,7 +70,7 @@ export function refreshPage(type: string, store: any) {
 
   const parentObj = _.get(currentConfig, parentPath)
 
-  if(parentObj?.type === "Table" || parentObj?.type === "ColumnGroup"){
+  if(parentObj?.type === "Table"){
     UiSchema.elements[0].elements[0].elements[4] = 
     {
       type: "Control",