basesite-shared-grid-lib 21.0.0-beta.5 → 21.0.0-beta.7

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

@@ -239,7 +239,7 @@ class OdataProvider {
                         query = query + '&' + customFilters.join('and');
                 }
             }
-            query = query.replace('and$filter=', '&filter=');
+            query = query.replace('and$filter=', '&$filter=');
             return query;
         };
         /**
@@ -317,7 +317,15 @@ class OdataProvider {
                         if (!col.values || col.values.length === 0) {
                             return '';
                         }
-                        const equalsClauses = col.values.map((v) => me.odataOperator.equalsStr(colName, `'${me.encode(v)}'`, isCaseSensitiveStringFilter));
+                        // Fill-cell / set-filter columns are always equality-matched against
+                        // a fixed list of backend-provided values, so the casing on both
+                        // sides is already known to match. Skip the tolower() wrap that the
+                        // generic string operators apply — wrapping the column in tolower()
+                        // forces a full scan because LOWER(col) cannot use any index, and
+                        // SQL Server's default collation is already case-insensitive.
+                        // Resulting predicate: `col eq 'Value'` (single) or
+                        // `(col eq 'V1' or col eq 'V2')` (multi).
+                        const equalsClauses = col.values.map((v) => me.odataOperator.equals(colName, `'${me.encode(v)}'`));
                         return equalsClauses.length === 1
                             ? equalsClauses[0]
                             : `(${equalsClauses.join(' or ')})`;
@@ -2424,7 +2432,10 @@ class GridLibraryComponent {
                     };
                 }
                 else if (res.columnType === 'fill') {
-                    const valueLabelMap = this._buildFillValueLabelMap(res);
+                    const hasConfiguredValues = (Array.isArray(res.filterValues) && res.filterValues.length > 0) ||
+                        (typeof res.fieldValue === 'string' && res.fieldValue.trim() !== '') ||
+                        (Array.isArray(res.fieldValue) && res.fieldValue.length > 0);
+                    const valueLabelMap = hasConfiguredValues ? this._buildFillValueLabelMap(res) : null;
                     return {
                         width: 120,
                         pinned: res.pinPosition,
@@ -2441,25 +2452,28 @@ class GridLibraryComponent {
                             field: res.field,
                         },
                         filterable: res.filterable,
-                        filter: 'agSetColumnFilter',
-                        filterParams: {
-                            // 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,
-                            // Open with nothing checked so a user picking one option triggers
-                            // a single backend request instead of "uncheck all + pick one".
-                            defaultToNothingSelected: 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;
+                        filter: hasConfiguredValues ? 'agSetColumnFilter' : 'agTextColumnFilter',
+                        filterParams: hasConfiguredValues
+                            ? {
+                                values: (params) => this._getFillFilterValues(res, params),
+                                refreshValuesOnOpen: true,
+                                defaultToNothingSelected: true,
+                                buttons: ['reset'],
+                                valueFormatter: (p) => {
+                                    if (p?.value == null || p.value === '')
+                                        return p?.value;
+                                    return valueLabelMap?.get(String(p.value)) ?? p.value;
+                                },
+                                textFormatter: (v) => v == null ? '' : String(v).trim().toLowerCase(),
+                            }
+                            : {
+                                comparator: (filterLocalDateAtMidnight, cellValue) => {
+                                    if (cellValue == null)
+                                        return 0;
+                                    return 0;
+                                },
+                                buttons: ['reset'],
                             },
-                            // Case-insensitive search within the dropdown's filter box
-                            textFormatter: (v) => v == null ? '' : String(v).trim().toLowerCase(),
-                        },
                     };
                 }
                 else {