basesite-shared-grid-lib 21.0.1-beta.1 → 21.0.1-beta.3

package/fesm2022/basesite-shared-grid-lib.mjs

@@ -313,10 +313,15 @@ class OdataProvider {
                             return me.odataOperator[col.type](colName, `${me.toDateTime(col.dateFrom)}`, `${me.toDateTime(col.dateTo)}`);
                         }
                         break;
-                    case 'set':
-                        return col.values.length > 0
-                            ? me.odataOperator.inStr(colName, col.values, isCaseSensitiveStringFilter)
-                            : '';
+                    case 'set': {
+                        if (!col.values || col.values.length === 0) {
+                            return '';
+                        }
+                        const containsClauses = col.values.map((v) => me.odataOperator.contains(colName, `'${me.encode(v)}'`, isCaseSensitiveStringFilter));
+                        return containsClauses.length === 1
+                            ? containsClauses[0]
+                            : `(${containsClauses.join(' or ')})`;
+                    }
                     default:
                         break;
                 }
@@ -2357,6 +2362,7 @@ class GridLibraryComponent {
                     };
                 }
                 else if (res.columnType === 'fill') {
+                    const valueLabelMap = this._buildFillValueLabelMap(res);
                     return {
                         width: 120,
                         pinned: res.pinPosition,
@@ -2373,25 +2379,21 @@ class GridLibraryComponent {
                             field: res.field,
                         },
                         filterable: res.filterable,
-                        filter: 'agTextColumnFilter',
+                        filter: 'agSetColumnFilter',
                         filterParams: {
-                            comparator: (filterLocalDateAtMidnight, cellValue) => {
-                                const dateAsString = cellValue;
-                                if (dateAsString == null) {
-                                    return 0;
-                                }
-                                if (res.columnType == 'date') {
-                                    const cellDate = new Date(dateAsString);
-                                    if (cellDate < filterLocalDateAtMidnight) {
-                                        return -1;
-                                    }
-                                    else if (cellDate > filterLocalDateAtMidnight) {
-                                        return 1;
-                                    }
-                                }
-                                return 0;
-                            },
+                            // Provide the raw values from the backend config; OData provider
+                            // handles case-insensitive matching server-side via tolower().
+                            values: (params) => this._getFillFilterValues(res, params),
+                            refreshValuesOnOpen: true,
                             buttons: ['reset'],
+                            // Pretty label for each checkbox; falls back to the value itself
+                            valueFormatter: (p) => {
+                                if (p?.value == null || p.value === '')
+                                    return p?.value;
+                                return valueLabelMap?.get(String(p.value)) ?? p.value;
+                            },
+                            // Case-insensitive search within the dropdown's filter box
+                            textFormatter: (v) => v == null ? '' : String(v).trim().toLowerCase(),
                         },
                     };
                 }
@@ -2493,6 +2495,71 @@ class GridLibraryComponent {
             }
         });
     }
+    _getFillFilterValues(res, params) {
+        const configured = res?.filterValues;
+        if (Array.isArray(configured) && configured.length > 0) {
+            const values = configured
+                .map((v) => (v && typeof v === 'object' ? (v.value ?? v.name ?? v.label) : v))
+                .filter((v) => v !== null && v !== undefined && v !== '');
+            params.success(values);
+            return;
+        }
+        // Backend may provide allowed values as a comma-separated string in `fieldValue`
+        const fieldValue = res?.fieldValue;
+        if (typeof fieldValue === 'string' && fieldValue.trim() !== '') {
+            const values = fieldValue
+                .split(',')
+                .map((v) => v.trim())
+                .filter((v) => v !== '');
+            if (values.length > 0) {
+                params.success(values);
+                return;
+            }
+        }
+        if (Array.isArray(fieldValue) && fieldValue.length > 0) {
+            const values = fieldValue
+                .map((v) => (v && typeof v === 'object' ? (v.value ?? v.name ?? v.label) : v))
+                .filter((v) => v !== null && v !== undefined && v !== '');
+            if (values.length > 0) {
+                params.success(values);
+                return;
+            }
+        }
+        const field = res?.field;
+        if (this.enableServerSidePaging && this.odataProvider) {
+            this.odataProvider.getFilterValuesParams(field, (data) => params.success((data || []).filter(v => v !== null && v !== undefined && v !== '')), undefined);
+            return;
+        }
+        const source = Array.isArray(this.rowData) ? this.rowData : [];
+        const unique = Array.from(new Set(source
+            .map(row => row?.[field])
+            .filter(v => v !== null && v !== undefined && v !== '')));
+        params.success(unique);
+    }
+    _buildFillValueLabelMap(res) {
+        const map = new Map();
+        const source = res?.filterValues ?? res?.fieldValue;
+        const addObject = (obj) => {
+            const value = obj?.value ?? obj?.key ?? obj?.id ?? obj?.name ?? obj?.label;
+            const label = obj?.label ?? obj?.name ?? value;
+            if (value !== null && value !== undefined && value !== '') {
+                map.set(String(value), String(label));
+            }
+        };
+        if (Array.isArray(source)) {
+            source.forEach((entry) => {
+                if (entry && typeof entry === 'object')
+                    addObject(entry);
+                else if (entry !== null && entry !== undefined && entry !== '') {
+                    map.set(String(entry), String(entry));
+                }
+            });
+        }
+        else if (typeof source === 'string' && source.trim() !== '') {
+            source.split(',').map(s => s.trim()).filter(Boolean).forEach(v => map.set(v, v));
+        }
+        return map;
+    }
     canCreateDac(roles, field) {
         if (roles?.length > 0 && field === 'createDac') {
             const isAEGroup = this.userRoles.some((role) => role?.toLowerCase().includes('ae'));
@@ -2552,7 +2619,7 @@ class GridLibraryComponent {
             // Add timeout to prevent infinite loading
             const API_TIMEOUT = 800000; //80 seconds
             let hasRetried = false;
-            params.api.setServerSideDatasource(new OdataServerSideProvider({
+            this.odataProvider = new OdataServerSideProvider({
                 isCaseSensitiveStringFilter: false,
                 callApi: (options) => {
                     const url = this.setExternalFilters(options);
@@ -2617,7 +2684,8 @@ class GridLibraryComponent {
                     this.gridAPI.hideOverlay();
                     this.gridAPI.showNoRowsOverlay();
                 }
-            }));
+            });
+            params.api.setServerSideDatasource(this.odataProvider);
             this.gridReady.emit(params);
         }
         // Apply initial filter highlighting with retry mechanism