From 307a969ec4db111da75ff26ea2d888bfec72cf89 Mon Sep 17 00:00:00 2001
From: Sofie Hofmann <29145005+sofie29@users.noreply.github.com>
Date: Thu, 18 Feb 2021 08:35:57 +0100
Subject: [PATCH] TSK-1573: Reset distribution targets filter after saving a
 workbasket

---
 .../workbasket-distribution-targets.component.ts                | 2 +-
 web/src/app/shared/store/workbasket-store/workbasket.state.ts   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.ts b/web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.ts
index 6dfc3d7dd..abc93cf65 100644
--- a/web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.ts
+++ b/web/src/app/administration/components/workbasket-distribution-targets/workbasket-distribution-targets.component.ts
@@ -300,7 +300,7 @@ export class WorkbasketDistributionTargetsComponent implements OnInit, OnDestroy
   }
 
   getSelectedIds(): string[] {
-    return this.selectedDistributionTargets.map((distributionTarget) => distributionTarget.workbasketId);
+    return this.selectedDistributionTargetsFilterClone.map((distributionTarget) => distributionTarget.workbasketId);
   }
 
   unselectItems(originList: any[]): any[] {
diff --git a/web/src/app/shared/store/workbasket-store/workbasket.state.ts b/web/src/app/shared/store/workbasket-store/workbasket.state.ts
index f20b6d528..1124afc08 100644
--- a/web/src/app/shared/store/workbasket-store/workbasket.state.ts
+++ b/web/src/app/shared/store/workbasket-store/workbasket.state.ts
@@ -433,6 +433,8 @@ export class WorkbasketState implements NgxsAfterBootstrap {
                 selectedWorkbasket,
                 action: ACTION.READ
               });
+              ctx.dispatch(new ClearFilter('selectedDistributionTargets'));
+              ctx.dispatch(new ClearFilter('availableDistributionTargets'));
             });
           }
           this.requestInProgressService.setRequestInProgress(false);