From f74f736a376895dcde288dd0020c5342f33cb229 Mon Sep 17 00:00:00 2001 From: Alex Alloza Date: Sun, 12 May 2024 20:40:00 +0200 Subject: [PATCH] globalFilter - add new panel when exists globalFilter --- .../src/app/module/pages/dashboard/dashboard.component.ts | 3 ++- .../global-filter-dialog.component.ts | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/eda/eda_app/src/app/module/pages/dashboard/dashboard.component.ts b/eda/eda_app/src/app/module/pages/dashboard/dashboard.component.ts index 42c5ce11e..f8b7416c3 100644 --- a/eda/eda_app/src/app/module/pages/dashboard/dashboard.component.ts +++ b/eda/eda_app/src/app/module/pages/dashboard/dashboard.component.ts @@ -161,9 +161,10 @@ export class DashboardComponent implements OnInit, AfterViewInit, OnDestroy { const unsetPanels = this.edaPanels.filter(panel => _.isNil(panel.panel.content)); setTimeout(() => { + const treeQueryMode = this.edaPanels.some((panel) => panel.selectedQueryMode === 'EDA2'); unsetPanels.forEach(panel => { globalFilters.forEach(filter => { - if (panel) { + if (panel && !treeQueryMode) { filter.panelList.push(panel.panel.id); const formatedFilter = this.globalFiltersService.formatFilter(filter); panel.assertGlobalFilter(formatedFilter) diff --git a/eda/eda_app/src/app/module/pages/dashboard/global-filter-dialog/global-filter-dialog.component.ts b/eda/eda_app/src/app/module/pages/dashboard/global-filter-dialog/global-filter-dialog.component.ts index be422058f..ed40675b7 100644 --- a/eda/eda_app/src/app/module/pages/dashboard/global-filter-dialog/global-filter-dialog.component.ts +++ b/eda/eda_app/src/app/module/pages/dashboard/global-filter-dialog/global-filter-dialog.component.ts @@ -127,6 +127,13 @@ export class GlobalFilterDialogComponent implements OnInit, OnDestroy { } else { for (const panel of this.allPanels) { panel.active = this.globalFilter.panelList.includes(panel.id); + + if (!Object.keys(this.globalFilter.pathList).includes(panel.id)) { + this.globalFilter.pathList[panel.id] = { + selectedTableNodes: {}, + path: [] + }; + } } } @@ -179,7 +186,6 @@ export class GlobalFilterDialogComponent implements OnInit, OnDestroy { this.filteredPanels = this.allPanels.filter((p: any) => p.avaliable && p.active); this.initTablesForFilter(); } - } public onChangeSelectedTable(): void {