Confirmation before deleting in the Dashboard

app/gui/src/dashboard/components/dashboard/Permission.tsx

@@ -19,7 +19,7 @@
 import { Text } from '#/components/AriaComponents'
 import * as object from '#/utilities/object'
 
-const ASSET_TYPE_TO_TEXT_ID: Readonly<Record<backendModule.AssetType, text.TextId>> = {
+export const ASSET_TYPE_TO_TEXT_ID: Readonly<Record<backendModule.AssetType, text.TextId>> = {
   [backendModule.AssetType.directory]: 'directoryAssetType',
   [backendModule.AssetType.project]: 'projectAssetType',
   [backendModule.AssetType.file]: 'fileAssetType',

app/gui/src/dashboard/layouts/AssetContextMenu.tsx

@@ -21,6 +21,7 @@
 
 import * as backendModule from '#/services/Backend'
 
+import { ASSET_TYPE_TO_TEXT_ID } from '#/components/dashboard/Permission'
 import { ContextMenuEntry as PaywallContextMenuEntry } from '#/components/Paywall'
 import {
   copyAssetsMutationOptions,
@@ -337,31 +338,19 @@
             action="delete"
             label={isCloud ? getText('moveToTrashShortcut') : getText('deleteShortcut')}
             doAction={() => {
-              if (isCloud) {
-                if (asset.type === backendModule.AssetType.directory) {
-                  setModal(
-                    <ConfirmDeleteModal
-                      defaultOpen
-                      actionText={getText('trashTheAssetTypeTitle', asset.type, asset.title)}
-                      onConfirm={async () => {
-                        await deleteAssetsMutation([[asset.id], false])
-                      }}
-                    />,
-                  )
-                } else {
-                  void deleteAssetsMutation([[asset.id], false])
-                }
-              } else {
-                setModal(
-                  <ConfirmDeleteModal
-                    defaultOpen
-                    actionText={getText('deleteTheAssetTypeTitle', asset.type, asset.title)}
-                    onConfirm={async () => {
-                      await deleteAssetsMutation([[asset.id], false])
-                    }}
-                  />,
-                )
-              }
+              setModal(
+                <ConfirmDeleteModal
+                  defaultOpen
+                  actionText={getText(
+                    isCloud ? 'trashTheAssetTypeTitle' : 'deleteTheAssetTypeTitle',
+                    getText(ASSET_TYPE_TO_TEXT_ID[asset.type]),
+                    asset.title,
+                  )}
+                  onConfirm={async () => {
+                    await deleteAssetsMutation([[asset.id], false])
+                  }}
+                />,
+              )
             }}
           />
         )}

app/gui/src/dashboard/layouts/AssetsTableContextMenu.tsx

@@ -128,7 +128,7 @@
   })
 
   // This is not a React component even though it contains JSX.
   const doDeleteAll = useEventCallback(async () => {
     const selectedIds = selectedAssets.map((asset) => asset.id)
     const deleteAll = async () => {
       unsetModal()
@@ -136,27 +136,20 @@
 
       await deleteAssetsMutation.mutateAsync([selectedIds, false])
     }
-    if (
-      isCloud &&
-      selectedIds.every((key) => getAsset(key)?.type !== backendModule.AssetType.directory)
-    ) {
-      await deleteAll()
-    } else {
-      const firstKey = selectedIds[0]
-      const soleAssetName =
-        firstKey != null ? (getAsset(firstKey)?.title ?? '(unknown)') : '(unknown)'
-      setModal(
-        <ConfirmDeleteModal
-          defaultOpen
-          actionText={
-            selectedIds.length === 1 ?
-              getText('deleteSelectedAssetActionText', soleAssetName)
-            : getText('deleteSelectedAssetsActionText', selectedIds.length)
-          }
-          onConfirm={deleteAll}
-        />,
-      )
-    }
+    const firstKey = selectedIds[0]
+    const soleAssetName =
+      firstKey != null ? (getAsset(firstKey)?.title ?? '(unknown)') : '(unknown)'
+    setModal(
+      <ConfirmDeleteModal
+        defaultOpen
+        actionText={
+          selectedIds.length === 1 ?
+            getText('deleteSelectedAssetActionText', soleAssetName)
+          : getText('deleteSelectedAssetsActionText', selectedIds.length)
+        }
+        onConfirm={deleteAll}
+      />,
+    )
   })
 
   const copyIdsMenuEntry = showDeveloperIds && (