Skip to content

Commit 6d52848

Browse files
committed
Simplify edit filters expanded input
1 parent db0a0a8 commit 6d52848

File tree

6 files changed

+8
-13
lines changed

6 files changed

+8
-13
lines changed

projects/core/src/lib/components/filter/edit-attribute-filters/edit-attribute-filters.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<mat-expansion-panel class="edit-filter-expansion-panel" [expanded]="onlyGroupInListOnInit()">
1+
<mat-expansion-panel class="edit-filter-expansion-panel" [expanded]="expanded()">
22
<mat-expansion-panel-header i18n="@@core.filter.edit-filters">Edit filters</mat-expansion-panel-header>
33
@for (filter of editableFilters(); track filter.id) {
44
<div class="edit-attribute-filters">

projects/core/src/lib/components/filter/edit-attribute-filters/edit-attribute-filters.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export class EditAttributeFiltersComponent {
2626
public editableFilters = input<AttributeFilterModel[]>([]);
2727
public filterGroupId = input<string | null>(null);
2828
public layerIds = input<string[]>([]);
29-
public onlyGroupInListOnInit = input<boolean>(false);
29+
public expanded = input<boolean>(false);
3030

3131
public isSliderFilter(filter: AttributeFilterModel): boolean {
3232
return filter.editConfiguration?.filterTool === FilterToolEnum.SLIDER;

projects/core/src/lib/components/filter/filter-list-item/filter-list-item.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
[editableFilters]="editableFilters"
2626
[filterGroupId]="filter.id"
2727
[layerIds]="filter.layerIds"
28-
[onlyGroupInListOnInit]="onlyGroupInListOnInit"></tm-edit-attribute-filter>
28+
[expanded]="editFiltersExpanded"></tm-edit-attribute-filter>
2929
</div>
3030
}
3131
<mat-card-actions align="end">

projects/core/src/lib/components/filter/filter-list-item/filter-list-item.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export class FilterListItemComponent {
3131
}
3232

3333
@Input()
34-
public onlyGroupInListOnInit = false;
34+
public editFiltersExpanded = false;
3535

3636
private store$ = inject(Store);
3737
private removeFilterService = inject(RemoveFilterService);
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
@for (filter of (filters$ | async); track filter.id) {
2-
<tm-filter-list-item [filterGroup]="filter" [onlyGroupInListOnInit]="onlyGroupInListOnInit"></tm-filter-list-item>
1+
@let filters = filters$ | async;
2+
@for (filter of filters; track filter.id) {
3+
<tm-filter-list-item [filterGroup]="filter" [editFiltersExpanded]="filters?.length === 1"></tm-filter-list-item>
34
}
Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Component, OnInit, ChangeDetectionStrategy, inject } from '@angular/core';
22
import { Store } from '@ngrx/store';
33
import { selectFilterGroupsWithLayers } from '../../../state/filter-state/filter.selectors';
4-
import { map, Observable, of, take } from 'rxjs';
4+
import { Observable, of } from 'rxjs';
55
import { ExtendedFilterGroupModel } from '../../../filter/models/extended-filter-group.model';
66

77
@Component({
@@ -15,15 +15,9 @@ export class FilterListComponent implements OnInit {
1515
private store$ = inject(Store);
1616

1717
public filters$: Observable<ExtendedFilterGroupModel[]> = of([]);
18-
public onlyGroupInListOnInit: boolean = false;
1918

2019
public ngOnInit(): void {
2120
this.filters$ = this.store$.select(selectFilterGroupsWithLayers);
22-
23-
this.filters$.pipe(
24-
take(1),
25-
map(groups => groups.length === 1),
26-
).subscribe(onlyGroupInList => this.onlyGroupInListOnInit = onlyGroupInList);
2721
}
2822

2923
}

0 commit comments

Comments
 (0)