@masterteam/client-components 0.0.63 → 0.0.65

package/fesm2022/masterteam-client-components-client-list.mjs

@@ -175,21 +175,25 @@ class ClientListStateService {
             target.areaType !== 'table') {
             return;
         }
+        const propertyMaps = this.createPropertyMaps(response.catalog);
         const columns = (response.projectionMeta?.columns ?? [])
             .filter((column) => column.visible)
             .sort((a, b) => a.order - b.order)
-            .map((column, index) => ({
-            key: column.key,
-            label: column.label,
-            type: 'entity',
-            sortable: !UNSORTABLE_ENTITY_VIEW_TYPES.has(column.viewType),
-            width: index === 0 ? '200px' : undefined,
-            viewType: column.viewType,
-            order: column.order,
-            visible: column.visible,
-            configuration: column.configuration ?? null,
-        }));
-        const propertyMaps = this.createPropertyMaps(response.catalog);
+            .map((column, index) => {
+            const property = this.resolvePropertyMeta(column.key, propertyMaps);
+            return {
+                key: column.key,
+                normalizedKey: property?.normalizedKey ?? column.key,
+                label: column.label,
+                type: 'entity',
+                sortable: !UNSORTABLE_ENTITY_VIEW_TYPES.has(column.viewType),
+                width: index === 0 ? '200px' : undefined,
+                viewType: column.viewType,
+                order: column.order,
+                visible: column.visible,
+                configuration: column.configuration ?? null,
+            };
+        });
         const lang = this.resolveActiveLang();
         const rows = (response.records ?? []).map((record) => {
             const row = {
@@ -875,6 +879,9 @@ class ClientListCardsView {
                 entity.name;
             return {
                 key: String(key),
+                normalizedKey: typeof raw['normalizedKey'] === 'string'
+                    ? raw['normalizedKey']
+                    : String(key),
                 label: entity.name ?? String(key),
                 type: 'entity',
                 viewType: (entity.viewType ?? 'Text'),
@@ -1330,8 +1337,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.8", ngImpor
 function mergeRuntimeFilters(configured = [], runtime = {}, columns = []) {
     const filters = [...configured];
     for (const [rawKey, rawValue] of Object.entries(runtime)) {
-        const key = rawKey === 'generalSearch' ? 'Name' : rawKey;
-        const column = columns.find((item) => item.key === rawKey);
+        const column = columns.find((item) => item.key === rawKey || item.normalizedKey === rawKey);
+        const key = rawKey === 'generalSearch' ? 'Name' : (column?.normalizedKey ?? rawKey);
         const filterType = column
             ? TableValueResolver.getColumnFilterType(column)
             : null;
@@ -1355,6 +1362,9 @@ function mergeRuntimeFilters(configured = [], runtime = {}, columns = []) {
     }
     return filters;
 }
+function runtimeFiltersChanged(previous, next) {
+    return JSON.stringify(previous ?? {}) !== JSON.stringify(next ?? {});
+}
 function appendRange(filters, key, range, isDate) {
     const from = toRangeValue(range.from, isDate);
     const to = toRangeValue(range.to, isDate);
@@ -1372,7 +1382,12 @@ function toRangeValue(value, isDate) {
     if (value === null || value === undefined || value === '')
         return null;
     if (!isDate)
-        return value;
+        return toScalar(value);
+    if (typeof value === 'string') {
+        const trimmed = value.trim();
+        if (/^\d{4}-\d{2}-\d{2}$/.test(trimmed))
+            return trimmed;
+    }
     const date = value instanceof Date ? value : new Date(String(value));
     if (Number.isNaN(date.getTime()))
         return null;
@@ -1387,8 +1402,12 @@ function toScalar(value) {
     }
     if (value === null || value === undefined || value === '')
         return null;
-    if (typeof value !== 'object')
+    if (typeof value === 'string' || typeof value === 'number')
         return value;
+    if (typeof value === 'boolean')
+        return String(value);
+    if (typeof value !== 'object')
+        return null;
     const item = value;
     return toScalar(item['value'] ??
         item['id'] ??
@@ -1444,13 +1463,17 @@ class ClientList {
         if (!item || item.type === 'informative' || !item.config.isPaginated) {
             return;
         }
-        this.runtimeFilters.set(item.key, event.filters ?? {});
+        const nextFilters = event.filters ?? this.runtimeFilters.get(item.key) ?? {};
+        const filtersChanged = runtimeFiltersChanged(this.runtimeFilters.get(item.key), nextFilters);
+        this.runtimeFilters.set(item.key, nextFilters);
         if (item.areaType === 'cards') {
             this.loadCards(item.key, item.config);
             return;
         }
         const take = this.resolvePositiveInteger(event.pageSize) ?? item.take;
-        const skip = this.resolveNonNegativeInteger(event.first) ?? 0;
+        const skip = filtersChanged
+            ? 0
+            : (this.resolveNonNegativeInteger(event.first) ?? 0);
         this.state.setTablePaging(item.key, skip, take);
         this.loadTable(item.key, item.config, skip, take);
     }