impaktapps-ui-builder 0.0.1051 → 0.0.1054

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "impaktapps-ui-builder",
-    "version": "0.0.1051",
+    "version": "0.0.1054",
     "scripts": {
         "dev": "vite",
         "build": "tsc && vite build",

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

@@ -351,27 +351,25 @@ const buildUiSchema = (config: any, store?: any) => {
         })
       }
       elements.elements = config.elements.map((cellElem, elemInd) => {
+        const commonProperties = {
+          accessorKey: cellElem.name,
+          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,
+          enableSorting: config.enableSorting === "No" ? false : true,
+          columnKey: config.columnKey
+        }
         if (cellElem.type) {
           return {
-            accessorKey: cellElem.name,
-            header: cellElem.label || cellElem.name,
-            size: sizeMap[cellElem.name] || 180,
-            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,
-            enableSorting: config.enableSorting === "No" ? false : true
+            ...commonProperties
+
           }
         } else {
-          return {
-            accessorKey: cellElem.name,
-            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
-          }
+          return commonProperties
         }
 
       })

package/src/impaktapps-ui-builder/builder/elements/UiSchema/Component/schema.ts

@@ -70,7 +70,7 @@ export const ComponentSchema: any = {
       type: "array",
       items: {
         type: "object",
-        properties: { 
+        properties: {
           key: {
             type: "string",
             oneOf: [
@@ -191,7 +191,7 @@ export const ComponentSchema: any = {
         },
       },
     },
-    enableColumnFilter:{
+    enableColumnFilter: {
       type: "array",
       items: {
         type: "object",
@@ -202,25 +202,23 @@ export const ComponentSchema: any = {
         },
       },
     },
-    filteringOptions:{
-      type: "array",
-      items:{
-        oneOf: [
-          { const: 'fuzzy', title: 'Fuzzy' },
-          { const: 'contains', title: 'Contain' },
-          { const: 'startsWith', title: 'Starts with' },
-          { const: 'endsWith', title: 'Ends with' },
-          { const: 'equals', title: 'Equals' },
-          { const: 'notEquals', title: 'Not Equals' },
-          { const: 'between', title: 'Between' },
-          { const: 'betweenInclusive', title: 'Between inclusive' },
-          { const: 'greaterThan', title: 'Greater than' },
-          { const: 'greaterThanOrEqualTo', title: 'Greater than or equal to' },
-          { const: 'lessThan', title: 'Less than' },
-          { const: 'lessThanOrEqualTo', title: 'Less than or equal to' },
-        ]
-      },
+    filteringOptions: {
+      oneOf: [
+        { const: 'fuzzy', title: 'Fuzzy' },
+        { const: 'contains', title: 'Contain' },
+        { const: 'startsWith', title: 'Starts with' },
+        { const: 'endsWith', title: 'Ends with' },
+        { const: 'equals', title: 'Equals' },
+        { const: 'notEquals', title: 'Not Equals' },
+        { const: 'between', title: 'Between' },
+        { const: 'betweenInclusive', title: 'Between inclusive' },
+        { const: 'greaterThan', title: 'Greater than' },
+        { const: 'greaterThanOrEqualTo', title: 'Greater than or equal to' },
+        { const: 'lessThan', title: 'Less than' },
+        { const: 'lessThanOrEqualTo', title: 'Less than or equal to' },
+      ]
     },
+
     legendLabels: {
       type: "array",
       items: {
@@ -343,7 +341,7 @@ export const ComponentSchema: any = {
       type: "string",
     },
     label: { type: 'string' },
-    RemoveItemButton:{
+    RemoveItemButton: {
       disabled: true,
     },
   },

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

@@ -75,7 +75,7 @@ export function refreshPage(type: string, store: any) {
         widget: "SelectInputField",
       },
       config: {
-        layout: { xs: 6, sm: 6, md: 4, lg: 3 },
+        layout: { xs: 6, sm: 6, md: 4, lg: 4 },
         main: {
           label: "Column Format",
 
@@ -90,7 +90,7 @@ export function refreshPage(type: string, store: any) {
         widget: "RadioInputField",
       },
       config: {
-        layout: { xs: 6, sm: 6, md: 4, lg: 3 },
+        layout: { xs: 6, sm: 6, md: 4, lg: 4 },
         main: {
           label: "Enable Filter",
           options: ["Yes", "No"],
@@ -105,7 +105,7 @@ export function refreshPage(type: string, store: any) {
           widget: "SelectInputField",
         },
         config: {
-          layout: { xs: 6, sm: 6, md: 4, lg: 3 },
+          layout: { xs: 6, sm: 6, md: 4, lg: 4 },
           main: {
             label: "Filter Mode",
             multiple: true
@@ -113,7 +113,7 @@ export function refreshPage(type: string, store: any) {
         },
       };
 
-    UiSchema.elements[0].elements[0].elements[6] =
+    UiSchema.elements[1].elements[0].elements[6] =
     {
       type: "Control",
       scope: "#/properties/enableSorting",
@@ -121,14 +121,14 @@ export function refreshPage(type: string, store: any) {
         widget: "RadioInputField",
       },
       config: {
-        layout: { xs: 6, sm: 6, md: 4, lg: 3 },
+        layout: { xs: 6, sm: 6, md: 4, lg: 4 },
         main: {
           label: "Enable Sorting",
           options: ["Yes", "No"],
         },
       },
     },
-      UiSchema.elements[0].elements[0].elements[7] =
+      UiSchema.elements[1].elements[0].elements[7] =
       {
         type: "Control",
         scope: "#/properties/columnKey",