From c8fea1997db8111939d3e9fbc877db735c48c531 Mon Sep 17 00:00:00 2001
From: Florent POITTEVIN <poittevin.florent@gmail.com>
Date: Mon, 27 Apr 2020 15:54:29 +0200
Subject: [PATCH] fix: 1279 on aip when change tab content display is not the
good one
---
.../components/routables/aip-list/aip-list.routable.ts | 10 +++++++---
.../routables/aip-tabs/aip-tabs.routable.scss | 2 ++
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/app/features/preservation/aip/components/routables/aip-list/aip-list.routable.ts b/src/app/features/preservation/aip/components/routables/aip-list/aip-list.routable.ts
index c2ef88ca9..3b6f60929 100644
--- a/src/app/features/preservation/aip/components/routables/aip-list/aip-list.routable.ts
+++ b/src/app/features/preservation/aip/components/routables/aip-list/aip-list.routable.ts
@@ -81,8 +81,10 @@ export class AipListRoutable extends SharedAbstractListRoutable<Aip, Preservatio
@OverrideProperty()
skipInitialQuery: boolean = true;
+ private readonly KEY_ARCHIVAL_UNIT: keyof Aip = "archivalUnit";
+
columnsSkippedToClear: string[] = [
- "archivalUnit",
+ this.KEY_ARCHIVAL_UNIT,
];
storagion_number: number | undefined = undefined;
@@ -216,8 +218,10 @@ export class AipListRoutable extends SharedAbstractListRoutable<Aip, Preservatio
getAipListWithParameter(isArchivalUnit: boolean | undefined): void {
let queryParameter = ResourceState.queryParametersSnapshot(this.store, PreservationAipState);
queryParameter = QueryParametersUtil.clone(queryParameter);
- if (!isNullOrUndefined(isArchivalUnit)) {
- MappingObjectUtil.set(queryParameter.search.searchItems, "archivalUnit", isArchivalUnit.toString());
+ if (isNullOrUndefined(isArchivalUnit)) {
+ MappingObjectUtil.delete(queryParameter.search.searchItems, this.KEY_ARCHIVAL_UNIT);
+ } else {
+ MappingObjectUtil.set(queryParameter.search.searchItems, this.KEY_ARCHIVAL_UNIT, isArchivalUnit.toString());
}
this.store.dispatch(new PreservationAipAction.GetAll(queryParameter, false));
}
diff --git a/src/app/features/preservation/aip/components/routables/aip-tabs/aip-tabs.routable.scss b/src/app/features/preservation/aip/components/routables/aip-tabs/aip-tabs.routable.scss
index e9d037a8b..f27594f61 100644
--- a/src/app/features/preservation/aip/components/routables/aip-tabs/aip-tabs.routable.scss
+++ b/src/app/features/preservation/aip/components/routables/aip-tabs/aip-tabs.routable.scss
@@ -2,6 +2,8 @@
@import "src/sass/abstracts/mixins";
:host {
+ flex: 1;
+
.tab-header {
margin-top: 20px;
padding: 0 $padding-content-desktop;
--
GitLab