Clear selections after batch edit (#9798)

* Clear selections after batch edit * remove redundant selection clears * only refresh after batch saving * use clearer function name
directus · Dec 1, 2021 · a79345a · a79345a
1 parent 6e609ea
commit a79345a
Showing 1 changed file with 10 additions and 4 deletions.
diff --git 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 {