SNRGY-3599 fix missing device names in chart export edit dialog

SENERGY-Platform · Nov 6, 2024 · 4105c0a · 4105c0a
1 parent 76e9d3e
commit 4105c0a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/app/widgets/charts/shared/data-source-selector/data-source-selector.component.html b/src/app/widgets/charts/shared/data-source-selector/data-source-selector.component.html
@@ -7,7 +7,7 @@ <h2>Choose a {{dataSourcePlaceholder}}</h2>
             <mat-label>{{dataSourcePlaceholder}}</mat-label>
             <senergy-select-search [required]="true" [multiple]="true" [compareWith]="compare" formControlName="exports"
                 (selectionChange)="dataSourceChanged($event.value)" [options]="dataSourceOptions"
-                useOptionViewProperty="name">
+                [getOptionViewValue]="getDataSourceName" >
             </senergy-select-search>
 
             <mat-error *ngIf="form.controls.exports.invalid">

diff --git a/src/app/widgets/charts/shared/data-source-selector/data-source-selector.component.ts b/src/app/widgets/charts/shared/data-source-selector/data-source-selector.component.ts
@@ -637,7 +637,7 @@ export class DataSourceSelectorComponent implements OnInit {
     };
 
     compare(a: any, b: any): boolean {
-        return a && b && a.id === b.id && a.name === b.name;
+        return a && b && a.id === b.id;
     }
 
     compareFields(a: any, b: any): boolean {
@@ -654,4 +654,8 @@ export class DataSourceSelectorComponent implements OnInit {
                                              a.criteria.function_id === b.criteria.function_id);
         return exportsMatch || deviceMatch || deviceGroupMatch;
     }
+
+    getDataSourceName(x: any): string {
+        return x.display_name || x.name;
+    }
 }