From da450a20ad94a03da44b6a2f8c42eac2f38f70d4 Mon Sep 17 00:00:00 2001
From: Azri Kahar <42867097+azrikahar@users.noreply.github.com>
Date: Thu, 2 Dec 2021 04:49:20 +0800
Subject: [PATCH] Clear selections after batch edit (#9798)

* Clear selections after batch edit

* remove redundant selection clears

* only refresh after batch saving

* use clearer function name
---
 app/src/modules/content/routes/collection.vue | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/src/modules/content/routes/collection.vue b/app/src/modules/content/routes/collection.vue
index c4292fbbfea9b0..0789ec19ec1798 100644
--- a/app/src/modules/content/routes/collection.vue
+++ b/app/src/modules/content/routes/collection.vue
@@ -222,7 +222,7 @@
 				v-model:active="batchEditActive"
 				:primary-keys="selection"
 				:collection="collection"
-				@refresh="refresh"
+				@refresh="drawerBatchRefresh"
 			/>
 
 			<template #sidebar>
@@ -442,6 +442,7 @@ export default defineComponent({
 			bookmarkIsMine,
 			bookmarkSaving,
 			clearLocalSave,
+			drawerBatchRefresh,
 			refresh,
 			refreshInterval,
 			currentLayout,
@@ -453,6 +454,11 @@ export default defineComponent({
 			await layoutRef.value?.state?.refresh?.();
 		}
 
+		async function drawerBatchRefresh() {
+			selection.value = [];
+			await refresh();
+		}
+
 		function useBreadcrumb() {
 			const breadcrumb = computed(() => [
 				{
@@ -499,9 +505,9 @@ export default defineComponent({
 						data: batchPrimaryKeys,
 					});
 
+					selection.value = [];
 					await refresh();
 
-					selection.value = [];
 					confirmDelete.value = false;
 				} catch (err: any) {
 					error.value = err;
@@ -527,10 +533,10 @@ export default defineComponent({
 						},
 					});
 
-					confirmArchive.value = false;
 					selection.value = [];
-
 					await refresh();
+
+					confirmArchive.value = false;
 				} catch (err: any) {
 					error.value = err;
 				} finally {