impaktapps-ui-builder 0.0.101-alpha.46 → 0.0.101-alpha.48

package/package.json

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

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

@@ -343,17 +343,17 @@ const buildUiSchema = (config: any, store?: any) => {
     }
     else if (config.type == "Table") {
       const sizeMap = {}
-      const filterMap = {}
+      // const filterMap = {}
       if (config.sizeHolder) {
         config.sizeHolder.map((e, i) => {
           sizeMap[e.keyName] = e.value
         });
       }
-      if(config.enableColumnFilter){
-        config.enableColumnFilter.map((e)=>{
-          filterMap[e.keyName] = true
-        })
-      }
+      // if(config.enableColumnFilter){
+      //   config.enableColumnFilter.map((e)=>{
+      //     filterMap[e.keyName] = true
+      //   })
+      // }
       elements.elements = config.elements.map((cellElem, elemInd) => {
         if (cellElem.type) {
           return {
@@ -363,8 +363,9 @@ const buildUiSchema = (config: any, store?: any) => {
             type: cellElem.columnFormat,
             widget: cellElem.type != "ColumnGroup" ? buildUiSchema(cellElem, store) : undefined,
             elements: cellElem.type == "ColumnGroup" ? cellElem.elements.map((childCellElem) => buildUiSchema(childCellElem, store)) : [],
-            enableColumnFilter: Object.keys(filterMap).length === 0 ? true : filterMap[cellElem.name] ?? false,
-            columnFilterModeOptions: config.filteringOptions
+            // enableColumnFilter: Object.keys(filterMap).length === 0 ? true : filterMap[cellElem.name] ?? false,
+            columnFilterModeOptions: config.filteringOptions,
+            enableColumnFilter: config.enableFilter === "Yes" ? true : false
           }
         } else {
           return {
@@ -372,8 +373,9 @@ const buildUiSchema = (config: any, store?: any) => {
             type: cellElem.columnFormat,
             header: cellElem.label || cellElem.name,
             size: sizeMap[cellElem.name] || 180,
-            enableColumnFilter: Object.keys(filterMap).length === 0 ? true : filterMap[cellElem.name] ?? false,
-            columnFilterModeOptions: config.filteringOptions
+            // enableColumnFilter: Object.keys(filterMap).length === 0 ? true : filterMap[cellElem.name] ?? false,
+            columnFilterModeOptions: config.filteringOptions,
+            enableColumnFilter: config.enableFilter === "Yes" ? true : false
           }
         }
 

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

@@ -109,12 +109,12 @@ export function refreshPage (type: string, store: any) {
         layout: { xs: 6, sm: 6, md: 4, lg: 3 },
         main: {
           label: "Enable Filter",
-          options: ["YES", "NO"],
+          options: ["Yes", "No"],
           errorMessage: "Active is not marked YES or NO",
         },
       },
     },
-    UiSchema.elements[0].elements[0].elements[6] = 
+    UiSchema.elements[0].elements[0].elements[7] = 
     {
       type: "Control",
       scope: "#/properties/proc",