ENH Confirm user wishes to delete link

silverstripe · Jan 24, 2024 · 5eb19d7 · 5eb19d7
1 parent fce5499
commit 5eb19d7
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/lang/en.js b/client/lang/en.js
@@ -7,8 +7,10 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
 } else {
   ss.i18n.addDictionary('en', {
     "LinkField.SAVE_SUCCESS": "Saved link",
-    "LinkField.CONFIRM_ARCHIVE": "Archived link",
-    "LinkField.CONFIRM_DELETE": "Deleted link",
+    "LinkField.ARCHIVE_CONFIRM": "Are you sure you want to archive this link?",
+    "LinkField.DELETE_CONFIRM": "Are you sure you want to delete this link?",
+    "LinkField.ARCHIVE_SUCCESS": "Archived link",
+    "LinkField.DELETE_SUCCESS": "Deleted link",
     "LinkField.ARCHIVE_ERROR": "Failed to archive link",
     "LinkField.DELETE_ERROR": "Failed to delete link",
     "LinkField.ADD_LINK": "Add Link",

diff --git a/client/lang/src/en.json b/client/lang/src/en.json
@@ -1,7 +1,9 @@
 {
     "LinkField.SAVE_SUCCESS": "Saved link",
-    "LinkField.CONFIRM_ARCHIVE": "Archived link",
-    "LinkField.CONFIRM_DELETE": "Deleted link",
+    "LinkField.ARCHIVE_CONFIRM": "Are you sure you want to archive this link?",
+    "LinkField.DELETE_CONFIRM": "Are you sure you want to delete this link?",
+    "LinkField.ARCHIVE_SUCCESS": "Archived link",
+    "LinkField.DELETE_SUCCESS": "Deleted link",
     "LinkField.ARCHIVE_ERROR": "Failed to archive link",
     "LinkField.DELETE_ERROR": "Failed to delete link",
     "LinkField.ADD_LINK": "Add Link",

diff --git a/client/src/components/LinkField/LinkField.js b/client/src/components/LinkField/LinkField.js
@@ -132,16 +132,22 @@ const LinkField = ({
   /**
    * Update the component when the 'Delete' button in the LinkPicker is clicked
    */
-  const onDelete = (linkID) => {
+  const onDelete = (linkID, deleteType) => {
+    const versionState = data[linkID]?.versionState || '';
+    const isVersioned = ['draft', 'modified', 'published'].includes(versionState);
+    const deleteText = isVersioned
+      ? i18n._t('LinkField.ARCHIVE_CONFIRM', 'Are you sure you want to archive this link?')
+      : i18n._t('LinkField.DELETE_CONFIRM', 'Are you sure you want to delete this link?');
+    if (!window.confirm(deleteText)) {
+      return;
+    }
     let endpoint = joinUrlPaths(Config.getSection(section).form.linkForm.deleteUrl, linkID.toString());
     const parsedURL = url.parse(endpoint);
     const parsedQs = qs.parse(parsedURL.query);
     parsedQs.ownerID = ownerID;
     parsedQs.ownerClass = ownerClass;
     parsedQs.ownerRelation = ownerRelation;
     endpoint = url.format({ ...parsedURL, search: qs.stringify(parsedQs)});
-    const versionState = data[linkID]?.versionState || '';
-    const isVersioned = ['draft', 'modified', 'published'].includes(versionState);
     const successText = isVersioned
       ? i18n._t('LinkField.ARCHIVE_SUCCESS', 'Archived link')
       : i18n._t('LinkField.DELETE_SUCCESS', 'Deleted link');