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

UI: add origUserFilters optional param for AliasController constructor

Browse Source
This commit is contained in:
rusikv 2024-09-09 17:23:47 +03:00
parent 0a5a60cded
commit eb244e3de9
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,10 +68,11 @@ export class AliasController implements IAliasController {
private translate: TranslateService, private translate: TranslateService,
private stateControllerHolder: StateControllerHolder, private stateControllerHolder: StateControllerHolder,
private origEntityAliases: EntityAliases, private origEntityAliases: EntityAliases,
private origFilters: Filters) { private origFilters: Filters,
private origUserFilters?: Filters) {
this.entityAliases = deepClone(this.origEntityAliases) || {}; this.entityAliases = deepClone(this.origEntityAliases) || {};
this.filters = deepClone(this.origFilters) || {}; this.filters = deepClone(this.origFilters) || {};
this.userFilters = {}; this.userFilters = deepClone(this.origUserFilters) || {};
} }
updateEntityAliases(newEntityAliases: EntityAliases) { updateEntityAliases(newEntityAliases: EntityAliases) {

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

@ -127,6 +127,7 @@ 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;

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

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