diff --git a/apps/components-e2e/src/components/sunburst-chart/sunburst-chart.module.ts b/apps/components-e2e/src/components/sunburst-chart/sunburst-chart.module.ts index d981fbc58a..60607408b0 100644 --- a/apps/components-e2e/src/components/sunburst-chart/sunburst-chart.module.ts +++ b/apps/components-e2e/src/components/sunburst-chart/sunburst-chart.module.ts @@ -17,6 +17,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { Route, RouterModule } from '@angular/router'; +import { DtOverlayModule } from '@dynatrace/barista-components/overlay'; import { DtSunburstChartModule } from '@dynatrace/barista-components/sunburst-chart'; import { DtE2ESunburstChart } from './sunburst-chart'; @@ -24,7 +25,12 @@ const routes: Route[] = [{ path: '', component: DtE2ESunburstChart }]; @NgModule({ declarations: [DtE2ESunburstChart], - imports: [CommonModule, RouterModule.forChild(routes), DtSunburstChartModule], + imports: [ + CommonModule, + DtOverlayModule, + RouterModule.forChild(routes), + DtSunburstChartModule, + ], exports: [], providers: [], }) diff --git a/libs/barista-components/filter-field/src/filter-field.ts b/libs/barista-components/filter-field/src/filter-field.ts index 3506c4ab53..fb6a106f38 100644 --- a/libs/barista-components/filter-field/src/filter-field.ts +++ b/libs/barista-components/filter-field/src/filter-field.ts @@ -1478,6 +1478,8 @@ export class DtFilterField } this._resetEditMode(); this._closeFilterPanels(); + + this._multiSelect._setInitialSelection([]); this._stateChanges.next(); this._changeDetectorRef.markForCheck(); } @@ -1798,11 +1800,17 @@ export class DtFilterField const ids = new Set(); for (const currentFilter of this._filters) { let currentId = ''; - for (const value of currentFilter) { + + for (const [index, value] of currentFilter.entries()) { if (isDtAutocompleteValue(value)) { const id = peekOptionId(value, currentId); ids.add(id); - currentId = id; + + // In case of multiSelect filter type, the id must not be concatenated. + // So it'll only use the first value which is the parent + if (!isDtMultiSelectValue(currentFilter[0]) || index === 0) { + currentId = id; + } } } } diff --git a/libs/examples/src/sunburst-chart/BUILD.bazel b/libs/examples/src/sunburst-chart/BUILD.bazel index e85166ab50..8ef71b1633 100644 --- a/libs/examples/src/sunburst-chart/BUILD.bazel +++ b/libs/examples/src/sunburst-chart/BUILD.bazel @@ -20,6 +20,7 @@ ng_module( tsconfig = "//libs/examples:tsconfig_lib", deps = [ "//libs/barista-components/button:compile", + "//libs/barista-components/overlay:compile", "//libs/barista-components/formatters:compile", "//libs/barista-components/sunburst-chart:compile", "//libs/barista-components/theming:compile", diff --git a/libs/examples/src/sunburst-chart/sunburst-chart-examples.module.ts b/libs/examples/src/sunburst-chart/sunburst-chart-examples.module.ts index 88e25783cf..60c31c0c0c 100644 --- a/libs/examples/src/sunburst-chart/sunburst-chart-examples.module.ts +++ b/libs/examples/src/sunburst-chart/sunburst-chart-examples.module.ts @@ -16,6 +16,7 @@ import { NgModule } from '@angular/core'; import { DtButtonModule } from '@dynatrace/barista-components/button'; +import { DtOverlayModule } from '@dynatrace/barista-components/overlay'; import { DtSunburstChartModule } from '@dynatrace/barista-components/sunburst-chart'; import { DtThemingModule } from '@dynatrace/barista-components/theming'; import { DtExampleSunburstChartCustomColor } from './sunburst-chart-custom-color-example/sunburst-chart-custom-color-example'; @@ -29,6 +30,7 @@ import { DtFormattersModule } from '@dynatrace/barista-components/formatters'; DtButtonModule, DtThemingModule, DtFormattersModule, + DtOverlayModule, ], declarations: [ DtExampleSunburstChartDefault,