From eff1bbd0775e2edb96c78d7c7a1a1778d7f1ce61 Mon Sep 17 00:00:00 2001
From: Rohit <45072928+rohittp0@users.noreply.github.com>
Date: Thu, 30 May 2024 11:46:54 +0530
Subject: [PATCH] fix: Gallery View delete using expanded form (#8595)

* fix: gallery view delete using expanded form

* fix: reload table after delete

* refactor: addressed review comments
---
 .../components/smartsheet/expanded-form/index.vue      |  5 ++++-
 .../nc-gui/components/smartsheet/grid/GroupByTable.vue | 10 +++++++++-
 packages/nc-gui/composables/useData.ts                 |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/expanded-form/index.vue b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
index af5eda0ed9..5c31a33acb 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/index.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
@@ -445,7 +445,10 @@ const onDeleteRowClick = () => {
 
 const onConfirmDeleteRowClick = async () => {
   showDeleteRowModal.value = false
-  await deleteRowById(primaryKey.value)
+  // Close expanded form
+  isExpanded.value = false
+
+  await deleteRowById(primaryKey.value || undefined)
   message.success(t('msg.rowDeleted'))
   await reloadViewDataTrigger.trigger({
     shouldShowLoading: false,
diff --git a/packages/nc-gui/components/smartsheet/grid/GroupByTable.vue b/packages/nc-gui/components/smartsheet/grid/GroupByTable.vue
index 730ac4e96c..0d41a9f44a 100644
--- a/packages/nc-gui/components/smartsheet/grid/GroupByTable.vue
+++ b/packages/nc-gui/components/smartsheet/grid/GroupByTable.vue
@@ -136,6 +136,14 @@ const pagination = computed(() => {
     extraStyle: `margin-left: ${scrollBump.value}px;`,
   }
 })
+
+async function deleteSelectedRowsWrapper() {
+  if (!deleteSelectedRows) return
+
+  await deleteSelectedRows()
+  // reload table data
+  await reloadTableData({ shouldShowLoading: true })
+}
 </script>
 
 <template>
@@ -151,7 +159,7 @@ const pagination = computed(() => {
     :expand-form="props.expandForm"
     :row-height="rowHeight"
     :delete-row="deleteRow"
-    :delete-selected-rows="deleteSelectedRows"
+    :delete-selected-rows="deleteSelectedRowsWrapper"
     :delete-range-of-rows="deleteRangeOfRows"
     :update-or-save-row="updateOrSaveRow"
     :remove-row-if-new="removeRowIfNew"
diff --git a/packages/nc-gui/composables/useData.ts b/packages/nc-gui/composables/useData.ts
index 710ca3c763..8812633e92 100644
--- a/packages/nc-gui/composables/useData.ts
+++ b/packages/nc-gui/composables/useData.ts
@@ -11,7 +11,7 @@ export function useData(args: {
   callbacks?: {
     changePage?: (page: number) => Promise<void>
     loadData?: () => Promise<void>
-    globalCallback?: (...args: any[]) => void
+    globalCallback?: (...args: any[]) => Promise<void>,
     syncCount?: () => Promise<void>
     syncPagination?: () => Promise<void>
   }