fix: wording while deleting draft dataset

public/locales/en/dataset.json

@@ -68,7 +68,8 @@
       },
       "deleteDatasetModal": {
         "title": "Delete Dataset",
-        "message": "Are you sure you want to delete this dataset? This action cannot be undone.",
+        "messageDraft": "Are you sure you want to delete this draft version? Files will be reverted to the most recently published version. You cannot undelete this draft.",
+        "messageDataset": "Are you sure you want to delete this dataset? You cannot undelete this dataset.",
         "defaultDatasetDeleteError": "An error occurred while deleting the dataset."
       }
     },
@@ -137,7 +138,8 @@
       "heading": "Unpublished Dataset Private URL",
       "alertText": "This unpublished dataset is being privately shared."
     },
-    "datasetDeletedSuccess": "The dataset has been deleted."
+    "datasetDeletedSuccessDraft": "The dataset draft has been deleted.",
+    "datasetDeletedSuccessDataset": "The dataset has been deleted."
   },
   "termsTab": {
     "editTermsButton": "Edit Term Requirements",

public/locales/es/dataset.json

@@ -68,7 +68,8 @@
       },
       "deleteDatasetModal": {
         "title": "Eliminar dataset",
-        "message": "¿Seguro que quieres eliminar este dataset? Esta acción no se puede deshacer.",
+        "messageDraft": "¿Seguro que quieres eliminar esta versión borrador? No podrás recuperar este borrador.",
+        "messageDataset": "¿Seguro que quieres eliminar este dataset? Esta acción no se puede deshacer.",
         "defaultDatasetDeleteError": "Ocurrió un error al eliminar el dataset."
       }
     },
@@ -137,7 +138,8 @@
       "heading": "URL privada de dataset no publicado",
       "alertText": "Este dataset no publicado se está compartiendo de forma privada."
     },
-    "datasetDeletedSuccess": "El dataset ha sido eliminado."
+    "datasetDeletedSuccessDraft": "El borrador del dataset ha sido eliminado.",
+    "datasetDeletedSuccessDataset": "El dataset ha sido eliminado."
   },
   "termsTab": {
     "editTermsButton": "Editar requisitos de términos",

src/sections/dataset/dataset-action-buttons/edit-dataset-menu/delete-draft-dataset/ConfirmDeleteDraftDatasetModal.tsx

@@ -9,18 +9,25 @@ interface ConfirmDeleteDraftDatasetModalProps {
   handleDelete: () => void
   isDeletingDataset: boolean
   errorDeletingDataset: string | null
+  hasReleasedVersion: boolean
 }
 
 export const ConfirmDeleteDraftDatasetModal = ({
   show,
   handleClose,
   handleDelete,
   isDeletingDataset,
-  errorDeletingDataset
+  errorDeletingDataset,
+  hasReleasedVersion
 }: ConfirmDeleteDraftDatasetModalProps) => {
   const { t: tShared } = useTranslation('shared')
   const { t } = useTranslation('dataset')
-  const modalTitle = t('datasetActionButtons.editDataset.deleteDatasetModal.title')
+  const modalTitle = hasReleasedVersion
+    ? t('datasetActionButtons.editDataset.delete.draft')
+    : t('datasetActionButtons.editDataset.delete.released')
+  const modalMessage = hasReleasedVersion
+    ? t('datasetActionButtons.editDataset.deleteDatasetModal.messageDraft')
+    : t('datasetActionButtons.editDataset.deleteDatasetModal.messageDataset')
 
   return (
     <Modal
@@ -35,8 +42,7 @@ export const ConfirmDeleteDraftDatasetModal = ({
       <Modal.Body>
         <Stack gap={2}>
           <Stack direction="horizontal" gap={2} className={styles.message}>
-            <ExclamationTriangle />{' '}
-            <span>{t('datasetActionButtons.editDataset.deleteDatasetModal.message')}</span>
+            <ExclamationTriangle /> <span>{modalMessage}</span>
           </Stack>
           {errorDeletingDataset && (
             <Stack direction="horizontal" gap={2} className={`${styles.message} ${styles.error}`}>

src/sections/dataset/dataset-action-buttons/edit-dataset-menu/delete-draft-dataset/DeleteDraftDatasetButton.tsx

@@ -22,6 +22,7 @@ export function DeleteDraftDatasetButton({
   const [showConfirmationModal, setShowConfirmationModal] = useState(false)
   const navigate = useNavigate()
   const { t } = useTranslation('dataset')
+  const hasReleasedVersion = dataset.version.someDatasetVersionHasBeenReleased
 
   const handleOpenModal = () => setShowConfirmationModal(true)
   const handleCloseModal = () => setShowConfirmationModal(false)
@@ -45,7 +46,13 @@ export function DeleteDraftDatasetButton({
       navigate(`${Route.DATASETS}?${searchParams.toString()}`)
     }
 
-    toast.success(t('alerts.datasetDeletedSuccess'))
+    toast.success(
+      t(
+        hasReleasedVersion
+          ? 'alerts.datasetDeletedSuccessDraft'
+          : 'alerts.datasetDeletedSuccessDataset'
+      )
+    )
   }
 
   if (
@@ -59,7 +66,7 @@ export function DeleteDraftDatasetButton({
     <>
       <DropdownSeparator />
       <DropdownButtonItem onClick={handleOpenModal}>
-        {dataset.version.someDatasetVersionHasBeenReleased
+        {hasReleasedVersion
           ? t('datasetActionButtons.editDataset.delete.draft')
           : t('datasetActionButtons.editDataset.delete.released')}
       </DropdownButtonItem>
@@ -69,6 +76,7 @@ export function DeleteDraftDatasetButton({
         handleDelete={() => handleDeleteDraftDataset(dataset.persistentId)}
         isDeletingDataset={isDeletingDataset}
         errorDeletingDataset={errorDeletingDataset}
+        hasReleasedVersion={hasReleasedVersion}
       />
     </>
   )

src/stories/dataset/delete-draft-dataset/ConfirmDeleteDatasetModal.stories.tsx

@@ -18,7 +18,8 @@ export const Default: Story = {
       handleClose={() => {}}
       handleDelete={() => {}}
       isDeletingDataset={false}
-      errorDeletingDataset={null}></ConfirmDeleteDraftDatasetModal>
+      errorDeletingDataset={null}
+      hasReleasedVersion={true}></ConfirmDeleteDraftDatasetModal>
   )
 }
 export const DeleteInProgress: Story = {
@@ -28,7 +29,8 @@ export const DeleteInProgress: Story = {
       isDeletingDataset={true}
       handleClose={() => {}}
       handleDelete={() => {}}
-      errorDeletingDataset={null}></ConfirmDeleteDraftDatasetModal>
+      errorDeletingDataset={null}
+      hasReleasedVersion={true}></ConfirmDeleteDraftDatasetModal>
   )
 }
 export const WithError: Story = {
@@ -38,8 +40,7 @@ export const WithError: Story = {
       isDeletingDataset={true}
       handleClose={() => {}}
       handleDelete={() => {}}
-      errorDeletingDataset={
-        Error('Error deleting dataset').message
-      }></ConfirmDeleteDraftDatasetModal>
+      errorDeletingDataset={Error('Error deleting dataset').message}
+      hasReleasedVersion={true}></ConfirmDeleteDraftDatasetModal>
   )
 }

tests/component/sections/dataset/dataset-action-buttons/edit-dataset-menu/DeleteDraftDatasetButton.spec.tsx

@@ -83,7 +83,7 @@ describe('DeleteDraftDatasetButton', () => {
     cy.findByRole('button', { name: 'Delete Dataset' }).click()
 
     cy.findByRole('dialog').should('exist')
-    cy.findByText(/Are you sure you want to delete this dataset?/i).should('exist')
+    cy.findByText(/Are you sure you want to delete this dataset\?/i).should('exist')
   })
 
   it('closes confirmation modal when cancel is clicked', () => {
@@ -121,6 +121,26 @@ describe('DeleteDraftDatasetButton', () => {
     cy.findByText(/The dataset has been deleted./).should('exist')
   })
 
+  it('shows draft-specific messaging and toast when a released dataset draft is deleted', () => {
+    repository.deleteDatasetDraft = cy.stub().resolves()
+    cy.customMount(
+      <DeleteDraftDatasetButton
+        datasetRepository={repository}
+        dataset={DatasetMother.create({
+          permissions: DatasetPermissionsMother.createWithDeleteDatasetAllowed(),
+          locks: [],
+          version: DatasetVersionMother.createReleasedWithLatestVersionIsADraft()
+        })}
+      />
+    )
+
+    cy.findByRole('button', { name: 'Delete Draft Version' }).click()
+    cy.findByRole('dialog').should('exist')
+    cy.findByText(/Are you sure you want to delete this draft version\?/i).should('exist')
+    cy.findByRole('button', { name: 'Delete' }).click()
+    cy.findByText(/The dataset draft has been deleted./).should('exist')
+  })
+
   it('should not delete dataset if delete button clicked and repository fails', () => {
     repository.deleteDatasetDraft = cy.stub().rejects(new Error('Some unknown error'))
     cy.customMount(

tests/component/sections/dataset/dataset-action-buttons/edit-dataset-menu/EditDatasetMenu.spec.tsx

@@ -203,7 +203,7 @@ describe('EditDatasetMenu', () => {
     )
     cy.findByRole('button', { name: 'Edit Dataset' }).click()
     cy.findByRole('button', { name: /Delete/ }).click()
-    cy.findByText(/Are you sure you want to delete this dataset?/i).should('exist')
+    cy.findByText(/Are you sure you want to delete this dataset\?/i).should('exist')
     cy.findByRole('button', { name: 'Delete' }).click()
     cy.findByText(/The dataset has been deleted./).should('exist')
 

tests/e2e-integration/e2e/sections/dataset/Dataset.spec.tsx

@@ -304,7 +304,7 @@ describe('Dataset', () => {
 
           cy.findByRole('button', { name: 'Edit Dataset' }).should('exist').click()
           cy.findByRole('button', { name: 'Delete Dataset' }).should('exist').click()
-          cy.findByText(/Are you sure you want to delete this dataset?/i).should('exist')
+          cy.findByText(/Are you sure you want to delete this dataset\?/i).should('exist')
           cy.findByRole('button', { name: 'Delete' }).should('exist').click()
           cy.findByText(/The dataset has been deleted./i).should('exist')
         })