Merge branch 'DEVELOP' of ssh://git.eclipse.org:29418/openk-usermodules/org.eclipse.openk-usermodules.gridFailureInformation.frontend into SI-1947-BUG-Schnellfilter-qualifiziert-filtert-nicht-veroeffentlich
diff --git a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-list/grid-failure-list.component.html b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-list/grid-failure-list.component.html
index c3964c6..dd0a22b 100644
--- a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-list/grid-failure-list.component.html
+++ b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-list/grid-failure-list.component.html
@@ -40,7 +40,7 @@
{{ 'GridFailures.ChoosedGridFailureInformations' | translate }}
</label>
<div class="diverse-condensation-btns">
- <button class="btn btn-primary" (click)="clearGridFailureCondensation()">
+ <button class="btn btn-primary" (click)="clearGridFailureCondensation(); cancelCondesation()">
{{ 'CancelBtn' | translate }}
</button>
<div class="diverse-condensation-btns" *visibleByRight="[RolesEnum.CREATOR, RolesEnum.QUALIFIER, RolesEnum.PUBLISHER]">
diff --git a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-list/grid-failure-list.component.ts b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-list/grid-failure-list.component.ts
index d42744b..ea701c7 100644
--- a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-list/grid-failure-list.component.ts
+++ b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-list/grid-failure-list.component.ts
@@ -126,12 +126,15 @@
this._gridApi.onFilterChanged();
}
-
+ public cancelCondesation(): void {
+ this.sandbox.cancelCondesation();
+ }
public clearGridFailureCondensation(): void {
this.sandbox.clearGridFailureCondensation();
this.showCondensationTable = false;
this.enableSelectionMode = false;
this._changeMode();
+ this._gridApi.setFilterModel(this.sandbox.filterOptions.filterModel);
}
public condenseChoosedGridFailureInformations(): void {
@@ -168,11 +171,11 @@
this._changeMode();
}
- public navigateToDetails(id: string) {
+ public navigateToDetails(id: string): void {
this._router.navigate(['/grid-failures', id]);
}
- public setMapFilter() {
+ public setMapFilter(): void {
const filterModel = this._gridApi.getFilterModel();
const isColumnFilterActive = !!Object.keys(filterModel).length;
const filteredGridFailureMapList: GridFailure[] = [];
diff --git a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-list/grid-failure.sandbox.ts b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-list/grid-failure.sandbox.ts
index 0db9128..c4b4d65 100644
--- a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-list/grid-failure.sandbox.ts
+++ b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-list/grid-failure.sandbox.ts
@@ -74,7 +74,10 @@
this.condenseBranch = null;
this.condensationList = [];
}
-
+ public cancelCondesation(): void {
+ this.condensationList = [];
+ this.gridFailureList$.pipe(take(1)).subscribe(gridFailures => (this.overviewGridFailureList = gridFailures));
+ }
public addItemToCondensationList(data: GridFailure): void {
if (this.condensationList.find(item => item.id == data.id) != null || data.condensed === true) {
return;
