feat(DeleteConfirm): Add filename into title

cozy · Dec 27, 2023 · 946ef76 · 946ef76
1 parent 094cb3d
commit 946ef76
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/src/drive/locales/en.json b/src/drive/locales/en.json
@@ -260,7 +260,7 @@
     "more": "More"
   },
   "DeleteConfirm": {
-    "title": "Delete this element? |||| Delete these elements?",
+    "title": "Delete %{filename}? |||| Delete %{smart_count} %{type}?",
     "trash": "It will be moved to the Trash. |||| They will be moved to the Trash.",
     "restore": "You can still restore it whenever you want. |||| You can still restore them whenever you want.",
     "share_accepted": "Sharing will be stopped. The following contacts will keep a copy, but your changes will no longer be synchronised:",

diff --git a/src/drive/locales/fr.json b/src/drive/locales/fr.json
@@ -260,7 +260,7 @@
     "more": "Afficher plus d'action"
   },
   "DeleteConfirm": {
-    "title": "Supprimer cet élément ? |||| Supprimer ces éléments ?",
+    "title": "Supprimer %{filename} ? |||| Supprimer %{smart_count} %{type} ?",
     "trash": "Cet élément sera déplacé dans la corbeille. |||| Ces éléments seront déplacés dans la corbeille.",
     "restore": "Vous pouvez toujours le restaurer quand vous voulez.",
     "share_accepted": "Le partage sera arrêté. Ainsi, les contacts suivant conserveront une copie mais vos changements ne seront plus synchronisés :",

diff --git a/src/drive/web/modules/drive/DeleteConfirm.jsx b/src/drive/web/modules/drive/DeleteConfirm.jsx
@@ -1,18 +1,19 @@
 import React, { useCallback, useEffect, useState } from 'react'
+
 import { useClient } from 'cozy-client'
 import { ConfirmDialog } from 'cozy-ui/transpiled/react/CozyDialogs'
 import Button from 'cozy-ui/transpiled/react/deprecated/Button'
-import { buildAlbumByIdQuery } from 'drive/web/modules/queries'
 import { Media, Img, Bd } from 'cozy-ui/transpiled/react/deprecated/Media'
 import Icon from 'cozy-ui/transpiled/react/Icon'
 import Stack from 'cozy-ui/transpiled/react/Stack'
-
 import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
-
 import { SharedDocument, SharedRecipientsList } from 'cozy-sharing'
+import { splitFilename } from 'cozy-client/dist/models/file'
 
+import { buildAlbumByIdQuery } from 'drive/web/modules/queries'
 import { trashFiles } from 'drive/web/modules/actions/utils'
 import { DOCTYPE_ALBUMS } from 'drive/lib/doctypes'
+import { getEntriesTypeTranslated } from 'drive/lib/entries'
 
 const Message = ({ type, fileCount }) => {
   const ico =
@@ -80,11 +81,17 @@ export const DeleteConfirm = ({
     onClose()
   }, [client, files, afterConfirmation, onClose])
 
+  const entriesType = getEntriesTypeTranslated(t, files)
+
   return (
     <ConfirmDialog
       open={true}
       onClose={onClose}
-      title={t('DeleteConfirm.title', fileCount)}
+      title={t('DeleteConfirm.title', {
+        filename: splitFilename(files[0]).filename,
+        smart_count: fileCount,
+        type: entriesType
+      })}
       content={
         <Stack>
           <Message type="trash" fileCount={fileCount} />

diff --git a/src/drive/web/modules/drive/DeleteConfirm.spec.jsx b/src/drive/web/modules/drive/DeleteConfirm.spec.jsx
@@ -29,7 +29,7 @@ describe('DeleteConfirm', () => {
       </AppLike>
     )
 
-    expect(getByText('Delete this element?')).toBeTruthy()
+    expect(getByText('Delete foobar10?')).toBeTruthy()
 
     const confirmButton = getByText('Remove')
     fireEvent.click(confirmButton)