Normalize routes before comparison for editing redirect.

Author: jimafisk

defaults/core/cms/providers/gitea.js

@@ -1,5 +1,5 @@
 import { env } from '../../../generated/env.js';
-import { makeUrl } from '../url_checker.js';
+import { makeUrl, normalizeRoute } from '../url_checker.js';
 import evaluateRoute from '../route_eval.js';
 
 const repoUrl = makeUrl(env.cms.repo);
@@ -96,7 +96,7 @@ export async function commitGitea(commitList, shadowContent, action, encoding, u
                 if (commitList.length === 1 && commitList[0].file.lastIndexOf('.json') > 0) {
                     let evaluatedRoute = evaluateRoute(commitList[0]);
                     // Redirect only if new route is being created
-                    if (evaluatedRoute !== location.pathname) {
+                    if (normalizeRoute(evaluatedRoute) !== normalizeRoute(location.pathname)) {
                         history.pushState({
                             isNew: true,
                             route: evaluatedRoute

defaults/core/cms/providers/gitlab.js

@@ -1,5 +1,5 @@
 import { env } from '../../../generated/env.js';
-import { makeUrl } from '../url_checker.js';
+import { makeUrl, normalizeRoute } from '../url_checker.js';
 import evaluateRoute from '../route_eval.js';
 
 const repoUrl = makeUrl(env.cms.repo);
@@ -70,7 +70,7 @@ export async function commitGitlab(commitList, shadowContent, action, encoding,
             if (commitList.length === 1 && commitList[0].file.lastIndexOf('.json') > 0) {
                 let evaluatedRoute = evaluateRoute(commitList[0]);
                 // Redirect only if new route is being created
-                if (evaluatedRoute !== location.pathname) {
+                if (normalizeRoute(evaluatedRoute) !== normalizeRoute(location.pathname)) {
                     history.pushState({
                         isNew: true,
                         route: evaluatedRoute

defaults/core/cms/providers/local.js

@@ -1,4 +1,5 @@
 import { env } from '../../../generated/env.js';
+import { normalizeRoute } from '../url_checker.js';
 import evaluateRoute from '../route_eval.js';
 
 export async function postLocal(commitList, shadowContent, action, encoding) {
@@ -28,7 +29,7 @@ export async function postLocal(commitList, shadowContent, action, encoding) {
             if (commitList.length === 1 && commitList[0].file.lastIndexOf('.json') > 0) {
                 let evaluatedRoute = evaluateRoute(commitList[0]);
                 // Redirect only if new route is being created
-                if (evaluatedRoute !== location.pathname) {
+                if (normalizeRoute(evaluatedRoute) !== normalizeRoute(location.pathname)) {
                     history.pushState({
                         isNew: true,
                         route: evaluatedRoute

defaults/core/cms/url_checker.js

@@ -4,4 +4,9 @@ export const makeUrl = string => {
   } catch (_) {
     return new URL("https://gitlab.com");
   }
+}
+
+export const normalizeRoute = route => {
+  // Remove leading and trailing slashes
+  return route.replace(/^\/+|\/+$/g, '');
 }