Fix redirect deletion (Fixes ethercreative#441)

Remove HTML from fail toast (Fixes ethercreative#449)

CHANGELOG.md

@@ -1,6 +1,8 @@
 ## 4.1.1 - 2023-04-19
 ### Fixed
 - Fix redirect page 500 error (Fixes #448)
+- Remove HTML from fail toast (Fixes #449)
+- Fix redirect deletion (Fixes #441)
 
 ## 4.1.0 - 2023-04-12
 ### Fixed

resources/js/_helpers/fail.js

@@ -1,6 +1,6 @@
 /* global Craft */
 export default function fail (message) {
-	Craft.cp.displayError(`<strong>SEO:</strong> ${message}`);
+	Craft.cp.displayError(`SEO: ${message}`);
 	window.console && console.error.apply( // eslint-disable-line no-console
 		console,
 		[
@@ -9,4 +9,4 @@ export default function fail (message) {
 			'font-weight: normal;',
 		]
 	);
-}
+}

resources/js/settings/Redirects.js

@@ -106,7 +106,7 @@ export default class Redirects {
 			));
 
 			Craft.cp.displayNotice(
-				"<strong>SEO:</strong> Redirect added successfully!"
+				"SEO: Redirect added successfully!"
 			);
 			spinner.classList.add("hidden");
 
@@ -115,7 +115,7 @@ export default class Redirects {
 			uri.focus();
 			this.initTables();
 		}, error => {
-			Craft.cp.displayError("<strong>SEO:</strong> " + error);
+			Craft.cp.displayError("SEO: " + error);
 			spinner.classList.add("hidden");
 		});
 	};
@@ -159,13 +159,13 @@ export default class Redirects {
 				));
 			});
 
-			Craft.cp.displayNotice('<strong>SEO:</strong> Redirects added successfully!');
+			Craft.cp.displayNotice('SEO: Redirects added successfully!');
 			spinner.classList.add("hidden");
 
 			redirects.value = '';
 			this.initTables();
 		}, error => {
-			Craft.cp.displayError('<strong>SEO:</strong> ' + error);
+			Craft.cp.displayError('SEO: ' + error);
 			spinner.classList.add("hidden");
 		});
 	};
@@ -209,7 +209,7 @@ export default class Redirects {
 
 			this.tables[siteId].removeChild(row);
 		}, error => {
-			Craft.cp.displayError('<strong>SEO:</strong> ' + error);
+			Craft.cp.displayError('SEO: ' + error);
 			spinner.classList.add("hidden");
 		});
 	};
@@ -257,10 +257,10 @@ export default class Redirects {
 		this.post("DELETE", {
 			id: row.dataset.id
 		}, () => {
-			Craft.cp.displayNotice('<strong>SEO:</strong> Redirect deleted');
+			Craft.cp.displayNotice('SEO: Redirect deleted');
 			this.tables[siteId].removeChild(row);
 		}, error => {
-			Craft.cp.displayNotice('<strong>SEO:</strong> ' + error);
+			Craft.cp.displayNotice('SEO: ' + error);
 		});
 	};
 
@@ -279,9 +279,9 @@ export default class Redirects {
 			action: 'seo/redirects/sort',
 			order: post,
 		}, () => {
-			Craft.cp.displayNotice('<strong>SEO:</strong> Redirect order saved');
+			Craft.cp.displayNotice('SEO: Redirect order saved');
 		}, error => {
-			Craft.cp.displayNotice('<strong>SEO:</strong> ' + error);
+			Craft.cp.displayNotice('SEO: ' + error);
 		});
 	};
 
@@ -482,4 +482,4 @@ export default class Redirects {
 		return true;
 	}
 
-}
+}

src/services/RedirectsService.php

@@ -273,7 +273,11 @@ public function sort ($order)
 	 */
 	public function delete ($id)
 	{
-		$redirect = RedirectRecord::findOne(compact('id'))->delete();
+		$redirect = false;
+
+		try {
+			$redirect = RedirectRecord::findOne(compact('id'))->delete();
+		} catch (\Exception $e) {}
 
 		if ($redirect === false)
 			return 'Unable find redirect with ID: ' . $id;
@@ -338,4 +342,4 @@ private function _isRedirectRegex ($uri)
 		return false;
 	}
 
-}
+}