mirror of
https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend
synced 2025-12-28 22:42:11 +01:00
Merged PR 1389: #3307 Filter Wird Nicht Gerendert
#3307 Filter Wird Nicht Gerendert
This commit is contained in:
committed by
Andreas Schickinger
parent
7fa2e7862d
commit
3c4612d15c
@@ -1,4 +1,4 @@
|
||||
<button class="filter" [class.active]="hasFilter$ | async" (click)="toggleFilterOverlay(); shellFilterOverlay.open()">
|
||||
<button class="filter" [class.active]="hasFilter$ | async" (click)="shellFilterOverlay.open()">
|
||||
<ui-icon size="20px" icon="filter_alit"></ui-icon>
|
||||
<span class="label">Filter</span>
|
||||
</button>
|
||||
@@ -6,8 +6,5 @@
|
||||
<router-outlet></router-outlet>
|
||||
|
||||
<shell-filter-overlay #shellFilterOverlay>
|
||||
<page-goods-in-search-filter
|
||||
*ngIf="showFilterOverlay"
|
||||
(close)="toggleFilterOverlay(); shellFilterOverlay.close()"
|
||||
></page-goods-in-search-filter>
|
||||
<page-goods-in-search-filter *ngIf="shellFilterOverlay.isOpen" (close)="shellFilterOverlay.close()"> </page-goods-in-search-filter>
|
||||
</shell-filter-overlay>
|
||||
|
||||
@@ -33,7 +33,6 @@ import { GoodsInSearchMainAutocompleteProvider } from './providers/goods-in-sear
|
||||
})
|
||||
export class GoodsInSearchComponent implements OnInit, OnDestroy {
|
||||
private _onDestroy$ = new Subject();
|
||||
showFilterOverlay = false;
|
||||
|
||||
hasFilter$ = combineLatest([this._goodsInSearchStore.filter$, this._goodsInSearchStore.defaultSettings$]).pipe(
|
||||
map(([filter, defaultFilter]) => !isEqual(filter?.getQueryParams(), UiFilter.create(defaultFilter).getQueryParams()))
|
||||
@@ -69,8 +68,4 @@ export class GoodsInSearchComponent implements OnInit, OnDestroy {
|
||||
this._onDestroy$.next();
|
||||
this._onDestroy$.complete();
|
||||
}
|
||||
|
||||
toggleFilterOverlay() {
|
||||
this.showFilterOverlay = !this.showFilterOverlay;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<button class="filter" [class.active]="hasFilter$ | async" (click)="toggleFilterOverlay(); shellFilterOverlay.open()">
|
||||
<button class="filter" [class.active]="hasFilter$ | async" (click)="shellFilterOverlay.open()">
|
||||
<ui-icon size="20px" icon="filter_alit"></ui-icon>
|
||||
<span class="label">Filter</span>
|
||||
</button>
|
||||
@@ -6,9 +6,6 @@
|
||||
<router-outlet></router-outlet>
|
||||
|
||||
<shell-filter-overlay #shellFilterOverlay>
|
||||
<page-goods-out-search-filter
|
||||
[processId]="processId$ | async"
|
||||
*ngIf="showFilterOverlay"
|
||||
(close)="toggleFilterOverlay(); shellFilterOverlay.close()"
|
||||
></page-goods-out-search-filter>
|
||||
<page-goods-out-search-filter [processId]="processId$ | async" (close)="shellFilterOverlay.close()" *ngIf="shellFilterOverlay.isOpen">
|
||||
</page-goods-out-search-filter>
|
||||
</shell-filter-overlay>
|
||||
|
||||
@@ -31,7 +31,6 @@ import { GoodsOutSearchMainAutocompleteProvider } from './providers/goods-out-se
|
||||
})
|
||||
export class GoodsOutSearchComponent implements OnInit, OnDestroy {
|
||||
private _onDestroy$ = new Subject();
|
||||
showFilterOverlay = false;
|
||||
|
||||
hasFilter$ = combineLatest([this._goodsOutSearchStore.filter$, this._goodsOutSearchStore.defaultSettings$]).pipe(
|
||||
map(([filter, defaultFilter]) => !isEqual(filter?.getQueryParams(), UiFilter.create(defaultFilter).getQueryParams()))
|
||||
@@ -69,8 +68,4 @@ export class GoodsOutSearchComponent implements OnInit, OnDestroy {
|
||||
this._onDestroy$.next();
|
||||
this._onDestroy$.complete();
|
||||
}
|
||||
|
||||
toggleFilterOverlay() {
|
||||
this.showFilterOverlay = !this.showFilterOverlay;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user