From 7a3eabc5293612b7951b5d947a31f1908a64cc2e Mon Sep 17 00:00:00 2001
From: Andrew Kingston <andrew@kingston.dev>
Date: Sun, 23 Jun 2024 20:55:00 +0100
Subject: [PATCH] Add progress indicators to all other bulk operations and
 select more modified cells

---
 .../grid/controls/BulkDeleteHandler.svelte    | 44 +++++++++++++----
 .../controls/BulkDuplicationHandler.svelte    | 47 ++++++++++++++-----
 .../grid/controls/ClipboardHandler.svelte     | 10 ++--
 .../grid/overlays/MenuOverlay.svelte          | 12 +++--
 .../src/components/grid/stores/rows.js        |  7 +--
 5 files changed, 87 insertions(+), 33 deletions(-)

diff --git a/packages/frontend-core/src/components/grid/controls/BulkDeleteHandler.svelte b/packages/frontend-core/src/components/grid/controls/BulkDeleteHandler.svelte
index fb05348fa4..9793f2ee27 100644
--- a/packages/frontend-core/src/components/grid/controls/BulkDeleteHandler.svelte
+++ b/packages/frontend-core/src/components/grid/controls/BulkDeleteHandler.svelte
@@ -1,7 +1,8 @@
 <script>
-  import { Modal, ModalContent } from "@budibase/bbui"
+  import { Modal, ModalContent, ProgressBar } from "@budibase/bbui"
   import { getContext, onMount } from "svelte"
   import { parseCellID } from "../lib/utils"
+  import { sleep } from "../../../utils/utils"
 
   const {
     selectedRows,
@@ -13,15 +14,20 @@
     selectedRowCount,
     selectedCells,
   } = getContext("grid")
+  const duration = 260
 
   let rowsModal
   let cellsModal
+  let processing = false
+  let progressPercentage = 0
 
   $: rowsToDelete = Object.entries($selectedRows)
     .map(entry => $rows.find(x => x._id === entry[0]))
     .filter(x => x != null)
 
   const handleBulkDeleteRequest = () => {
+    progressPercentage = 0
+    menu.actions.close()
     if ($selectedRowCount) {
       rowsModal?.show()
     } else if ($selectedCellCount) {
@@ -30,15 +36,18 @@
   }
 
   const bulkDeleteRows = async () => {
+    processing = true
     const count = rowsToDelete.length
-    await rows.actions.deleteRows(rowsToDelete)
+    await rows.actions.deleteRows(rowsToDelete, progress => {
+      progressPercentage = progress * 100
+    })
+    await sleep(duration)
     $notifications.success(`Deleted ${count} row${count === 1 ? "" : "s"}`)
-
-    // Ensure menu is closed, as we may have triggered this from there
-    menu.actions.close()
+    processing = false
   }
 
   const bulkDeleteCells = async () => {
+    processing = true
     let changeMap = {}
     for (let row of $selectedCells) {
       for (let cellId of row) {
@@ -49,10 +58,11 @@
         changeMap[rowId][field] = null
       }
     }
-    await rows.actions.bulkUpdate(changeMap)
-
-    // Ensure menu is closed, as we may have triggered this from there
-    menu.actions.close()
+    await rows.actions.bulkUpdate(changeMap, progress => {
+      progressPercentage = progress * 100
+    })
+    await sleep(duration)
+    processing = false
   }
 
   onMount(() => subscribe("request-bulk-delete", handleBulkDeleteRequest))
@@ -68,6 +78,14 @@
   >
     Are you sure you want to delete {$selectedRowCount}
     row{$selectedRowCount === 1 ? "" : "s"}?
+    {#if processing}
+      <ProgressBar
+        size="L"
+        value={progressPercentage}
+        {duration}
+        width="100%"
+      />
+    {/if}
   </ModalContent>
 </Modal>
 
@@ -81,5 +99,13 @@
   >
     Are you sure you want to delete {$selectedCellCount}
     cell{$selectedCellCount === 1 ? "" : "s"}?
+    {#if processing}
+      <ProgressBar
+        size="L"
+        value={progressPercentage}
+        {duration}
+        width="100%"
+      />
+    {/if}
   </ModalContent>
 </Modal>
diff --git a/packages/frontend-core/src/components/grid/controls/BulkDuplicationHandler.svelte b/packages/frontend-core/src/components/grid/controls/BulkDuplicationHandler.svelte
index 4fbf79b81c..d0c998228a 100644
--- a/packages/frontend-core/src/components/grid/controls/BulkDuplicationHandler.svelte
+++ b/packages/frontend-core/src/components/grid/controls/BulkDuplicationHandler.svelte
@@ -1,30 +1,51 @@
 <script>
-  import { Modal, ModalContent } from "@budibase/bbui"
+  import { Modal, ModalContent, ProgressBar } from "@budibase/bbui"
   import { getContext, onMount } from "svelte"
   import { getCellID } from "../lib/utils"
+  import { sleep } from "../../../utils/utils"
 
   const {
     selectedRows,
     rows,
     subscribe,
-    focusedCellId,
-    stickyColumn,
-    columns,
     selectedRowCount,
+    allVisibleColumns,
+    selectedCells,
   } = getContext("grid")
+  const duration = 260
 
   let modal
+  let progressPercentage = 0
+  let processing = false
 
   // Deletion callback when confirmed
   const performDuplication = async () => {
+    progressPercentage = 0
+    processing = true
+
+    // duplicate rows
     const rowsToDuplicate = Object.keys($selectedRows).map(id => {
       return rows.actions.getRow(id)
     })
-    const newRows = await rows.actions.bulkDuplicate(rowsToDuplicate)
-    if (newRows[0]) {
-      const column = $stickyColumn?.name || $columns[0].name
-      $focusedCellId = getCellID(newRows[0]._id, column)
+    const newRows = await rows.actions.bulkDuplicate(
+      rowsToDuplicate,
+      progress => {
+        progressPercentage = progress * 100
+      }
+    )
+
+    // Select new cells to highlight them
+    if (newRows.length) {
+      const firstRow = newRows[0]
+      const lastRow = newRows[newRows.length - 1]
+      const firstCol = $allVisibleColumns[0]
+      const lastCol = $allVisibleColumns[$allVisibleColumns.length - 1]
+      const startCellId = getCellID(firstRow._id, firstCol.name)
+      const endCellId = getCellID(lastRow._id, lastCol.name)
+      selectedCells.actions.selectRange(startCellId, endCellId)
     }
+    await sleep(duration)
+    processing = false
   }
 
   onMount(() => subscribe("request-bulk-duplicate", () => modal?.show()))
@@ -40,9 +61,13 @@
   >
     Are you sure you want to duplicate {$selectedRowCount}
     row{$selectedRowCount === 1 ? "" : "s"}?
-    {#if $selectedRowCount >= 10}
-      <br /><br />
-      This may take a few seconds.
+    {#if processing}
+      <ProgressBar
+        size="L"
+        value={progressPercentage}
+        {duration}
+        width="100%"
+      />
     {/if}
   </ModalContent>
 </Modal>
diff --git a/packages/frontend-core/src/components/grid/controls/ClipboardHandler.svelte b/packages/frontend-core/src/components/grid/controls/ClipboardHandler.svelte
index ab6385bd5e..142f6419ad 100644
--- a/packages/frontend-core/src/components/grid/controls/ClipboardHandler.svelte
+++ b/packages/frontend-core/src/components/grid/controls/ClipboardHandler.svelte
@@ -9,7 +9,7 @@
 
   let modal
   let progressPercentage = 0
-  let pasting = false
+  let processing = false
 
   const handleCopyRequest = () => {
     if (!$copyAllowed) {
@@ -34,12 +34,12 @@
   }
 
   const performBulkPaste = async () => {
-    pasting = true
+    processing = true
     await clipboard.actions.paste(progress => {
       progressPercentage = progress * 100
     })
     await sleep(duration)
-    pasting = false
+    processing = false
   }
 
   onMount(() => subscribe("copy", handleCopyRequest))
@@ -48,14 +48,14 @@
 
 <Modal bind:this={modal}>
   <ModalContent
-    title="Confirm bulk paste"
+    title="Confirm paste"
     confirmText="Continue"
     cancelText="Cancel"
     onConfirm={performBulkPaste}
     size="M"
   >
     Are you sure you want to paste? This will update multiple values.
-    {#if pasting}
+    {#if processing}
       <ProgressBar
         size="L"
         value={progressPercentage}
diff --git a/packages/frontend-core/src/components/grid/overlays/MenuOverlay.svelte b/packages/frontend-core/src/components/grid/overlays/MenuOverlay.svelte
index 5e433140d9..bc67db58c7 100644
--- a/packages/frontend-core/src/components/grid/overlays/MenuOverlay.svelte
+++ b/packages/frontend-core/src/components/grid/overlays/MenuOverlay.svelte
@@ -9,9 +9,6 @@
     focusedRow,
     menu,
     rows,
-    columns,
-    focusedCellId,
-    stickyColumn,
     config,
     dispatch,
     focusedRowId,
@@ -21,6 +18,8 @@
     copyAllowed,
     pasteAllowed,
     selectedCellCount,
+    allVisibleColumns,
+    selectedCells,
   } = getContext("grid")
 
   let anchor
@@ -42,8 +41,11 @@
     menu.actions.close()
     const newRow = await rows.actions.duplicateRow($focusedRow)
     if (newRow) {
-      const column = $stickyColumn?.name || $columns[0].name
-      $focusedCellId = getCellID(newRow._id, column)
+      const firstCol = $allVisibleColumns[0]
+      const lastCol = $allVisibleColumns[$allVisibleColumns.length - 1]
+      const startCellId = getCellID(newRow._id, firstCol.name)
+      const endCellId = getCellID(newRow._id, lastCol.name)
+      selectedCells.actions.selectRange(startCellId, endCellId)
     }
   }
 
diff --git a/packages/frontend-core/src/components/grid/stores/rows.js b/packages/frontend-core/src/components/grid/stores/rows.js
index 6f9794c2da..4358b24594 100644
--- a/packages/frontend-core/src/components/grid/stores/rows.js
+++ b/packages/frontend-core/src/components/grid/stores/rows.js
@@ -320,7 +320,7 @@ export const createActions = context => {
   }
 
   // Duplicates multiple rows, inserting them after the last source row
-  const bulkDuplicate = async rowsToDupe => {
+  const bulkDuplicate = async (rowsToDupe, progressCallback) => {
     // Find index of last row
     const $rowLookupMap = get(rowLookupMap)
     const index = Math.max(...rowsToDupe.map(row => $rowLookupMap[row._id]))
@@ -336,15 +336,16 @@ export const createActions = context => {
     // Create rows
     let saved = []
     let failed = 0
-    for (let clone of clones) {
+    for (let i = 0; i < clones.length; i++) {
       try {
-        saved.push(await datasource.actions.addRow(clone))
+        saved.push(await datasource.actions.addRow(clones[i]))
         rowCacheMap[saved._id] = true
         await sleep(50) // Small sleep to ensure we avoid rate limiting
       } catch (error) {
         failed++
         console.error("Duplicating row failed", error)
       }
+      progressCallback?.((i + 1) / clones.length)
     }
 
     // Add to state