fix(table): table filter toolbar

closes [#11783](#11783) Fixed filter dialog filtering
SAP · Dec 11, 2024 · 117f058 · 117f058
1 parent 748ed9e
commit 117f058
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/libs/platform/table-helpers/services/table.service.ts b/libs/platform/table-helpers/services/table.service.ts
@@ -17,6 +17,7 @@ import {
     SortChange
 } from '../models';
 import { TableColumn } from '../table-column';
+import { Nullable } from '@fundamental-ngx/cdk/utils';
 
 export type TableStateChange =
     | TableStateProperty<'sort', SortChange>
@@ -191,7 +192,7 @@ export class TableService {
         const newFilterRules: CollectionFilter[] = filterRules
             ? filterRules.map((rule) => ({
                   ...rule,
-                  fieldName: this._getFieldName(rule.field)
+                  fieldName: this._getFieldName(rule.field, rule.fieldName)
               }))
             : [];
         const state: TableState = { ...prevState, filterBy: newFilterRules };
@@ -216,7 +217,7 @@ export class TableService {
             ...prevFilterRules.filter((existing) => !rulesToAdd.find(({ field }) => field === existing.field)),
             ...rulesToAdd.map((rule) => ({
                 ...rule,
-                fieldName: this._getFieldName(rule.field)
+                fieldName: this._getFieldName(rule.field, rule.fieldName)
             }))
         ];
         const state: TableState = { ...prevState, filterBy: newFilterRules };
@@ -435,7 +436,7 @@ export class TableService {
     buildFilterRulesMap(state = this.getTableState()): void {
         const filterRulesWithFieldNames = state.filterBy.map((rule) => ({
             ...rule,
-            fieldName: this._getFieldName(rule.field)
+            fieldName: this._getFieldName(rule.field, rule.fieldName)
         }));
 
         this.filterRules$.set(
@@ -482,10 +483,9 @@ export class TableService {
     }
 
     /** @hidden */
-    private _getFieldName(field: string): string {
+    private _getFieldName(field: string, fieldName: Nullable<string>): string {
         const column = this.tableColumns$.getValue().find((col) => col.key === field);
-        return column ? column.name : field;
-    }
+        return column ? column.name : fieldName ?? field; }
 }
 
 /** @hidden */

diff --git a/libs/platform/table/components/table-view-settings-dialog/filtering/filter-step.component.ts b/libs/platform/table/components/table-view-settings-dialog/filtering/filter-step.component.ts
@@ -94,7 +94,8 @@ export class FilterStepComponent implements FiltersViewStep {
     /** @hidden */
     _onFilterValueChange(filterValue: any): void {
         const filterBy: CollectionFilter = this._filterBy || {
-            field: this.columnName,
+            field: this.columnKey,
+            fieldName: this.columnName,
             value: null,
             strategy: FILTER_STRATEGY.EQ,
             exclude: false

diff --git a/libs/platform/table/components/table-view-settings-dialog/filtering/filters.component.html b/libs/platform/table/components/table-view-settings-dialog/filtering/filters.component.html
@@ -43,7 +43,7 @@
     ></fdp-filters-list-step>
 } @else if (activeStep === ACTIVE_STEP.FILTER) {
     <fdp-filter-step
-        [columnKey]="activeFilter!.column"
+        [columnKey]="activeFilterColumnKey!"
         [columnName]="activeFilter!.label"
         [filter]="activeFilter!"
         [filterBy]="filterBy"

diff --git a/libs/platform/table/components/table-view-settings-dialog/filtering/filters.component.ts b/libs/platform/table/components/table-view-settings-dialog/filtering/filters.component.ts
@@ -155,7 +155,7 @@ export class FiltersComponent implements Resettable, AfterViewInit {
         this.activeFilter = filter as TableViewSettingsFilterComponent;
         this.activeFilterColumnKey = this.columns.find(
             ({ name }) => name === (<TableViewSettingsFilterComponent>filter).column
-        )?.label;
+        )?.key;
         this._cd.detectChanges();
     }