dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI: refactor getting of user filters in alias controller interface

Browse Source
This commit is contained in:
rusikv 2024-09-09 18:26:54 +03:00
parent eb244e3de9
commit 625e400d2b
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui-ngx/src/app/core/api/alias-controller.ts
View File

@ -167,6 +167,10 @@ export class AliasController implements IAliasController {
return this.filters; return this.filters;
} }
getUserFilters(): Filters {
return this.userFilters;
}
getFilterInfo(filterId: string): FilterInfo { getFilterInfo(filterId: string): FilterInfo {
if (this.userFilters[filterId]) { if (this.userFilters[filterId]) {
return this.userFilters[filterId]; return this.userFilters[filterId];

2
ui-ngx/src/app/core/api/widget-api.models.ts
View File

@ -127,7 +127,6 @@ export interface IAliasController {
entityAliasesChanged: Observable<Array<string>>; entityAliasesChanged: Observable<Array<string>>;
entityAliasResolved: Observable<string>; entityAliasResolved: Observable<string>;
filtersChanged: Observable<Array<string>>; filtersChanged: Observable<Array<string>>;
userFilters: Filters;
getAliasInfo(aliasId: string): Observable<AliasInfo>; getAliasInfo(aliasId: string): Observable<AliasInfo>;
getEntityAliasId(aliasName: string): string; getEntityAliasId(aliasName: string): string;
getInstantAliasInfo(aliasId: string): AliasInfo; getInstantAliasInfo(aliasId: string): AliasInfo;
@ -138,6 +137,7 @@ export interface IAliasController {
resolveAlarmSource(alarmSource: Datasource): Observable<Datasource>; resolveAlarmSource(alarmSource: Datasource): Observable<Datasource>;
getEntityAliases(): EntityAliases; getEntityAliases(): EntityAliases;
getFilters(): Filters; getFilters(): Filters;
getUserFilters(): Filters;
getFilterInfo(filterId: string): FilterInfo; getFilterInfo(filterId: string): FilterInfo;
getKeyFilters(filterId: string): Array<KeyFilter>; getKeyFilters(filterId: string): Array<KeyFilter>;
updateCurrentAliasEntity(aliasId: string, currentEntity: EntityInfo): void; updateCurrentAliasEntity(aliasId: string, currentEntity: EntityInfo): void;

2
ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.ts
View File

@ -523,7 +523,7 @@ export class DashboardPageComponent extends PageComponent implements IDashboardC
() => this.dashboardCtx.stateController, () => this.dashboardCtx.stateController,
this.dashboardConfiguration.entityAliases, this.dashboardConfiguration.entityAliases,
this.dashboardConfiguration.filters, this.dashboardConfiguration.filters,
this.parentDashboard?.aliasController.userFilters); this.parentDashboard?.aliasController.getUserFilters());
this.updateDashboardCss(); this.updateDashboardCss();