ENH Allow URLs without trailing slashes

silverstripe · Jan 12, 2023 · 9038589 · 9038589
1 parent c49737d
commit 9038589
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 16 deletions.
diff --git a/client/dist/js/TinyMCE_ssembed.js b/client/dist/js/TinyMCE_ssembed.js
diff --git a/client/dist/js/TinyMCE_sslink-file.js b/client/dist/js/TinyMCE_sslink-file.js
diff --git a/client/dist/js/TinyMCE_ssmedia.js b/client/dist/js/TinyMCE_ssmedia.js
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/boot/index.js b/client/src/boot/index.js
@@ -6,6 +6,7 @@ import applyTransform from 'boot/applyTransform';
 import registerReducers from 'boot/registerReducers';
 import registerComponents from 'boot/registerComponents';
 import registerQueries from 'boot/registerQueries';
+import { joinLinks } from 'lib/urls';
 
 document.addEventListener('DOMContentLoaded', () => {
   registerComponents();
@@ -18,19 +19,19 @@ document.addEventListener('DOMContentLoaded', () => {
     path: '/',
     routes: [
       {
-        path: `${baseURL}/show/:folderId/:viewAction/:fileId`,
+        path: joinLinks(baseURL, 'show/:folderId/:viewAction/:fileId'),
         component: AssetAdminRouter,
       },
       {
-        path: `${baseURL}/show/:folderId/:viewAction`,
+        path: joinLinks(baseURL, 'show/:folderId/:viewAction'),
         component: AssetAdminRouter,
       },
       {
-        path: `${baseURL}/show/:folderId`,
+        path: joinLinks(baseURL, 'show/:folderId'),
         component: AssetAdminRouter,
       },
       {
-        path: `${baseURL}`,
+        path: baseURL,
         component: AssetAdminRouter,
       },
     ],

diff --git a/client/src/components/InsertEmbedModal/InsertEmbedModal.js b/client/src/components/InsertEmbedModal/InsertEmbedModal.js
@@ -5,6 +5,7 @@ import { connect } from 'react-redux';
 import FormBuilderModal from 'components/FormBuilderModal/FormBuilderModal';
 import * as schemaActions from 'state/schema/SchemaActions';
 import PropTypes from 'prop-types';
+import { joinLinks } from 'lib/urls';
 
 const sectionConfigKey = 'SilverStripe\\AssetAdmin\\Controller\\AssetAdmin';
 
@@ -174,7 +175,7 @@ function mapStateToProps(state, ownProps) {
   const targetUrl = ownProps.fileAttributes ? ownProps.fileAttributes.Url : '';
   const baseEditUrl = sectionConfig.form.remoteEditForm.schemaUrl;
 
-  const editUrl = targetUrl && `${baseEditUrl}/?embedurl=${encodeURIComponent(targetUrl)}`;
+  const editUrl = targetUrl && joinLinks(baseEditUrl, `/?embedurl=${encodeURIComponent(targetUrl)}`);
   const createUrl = sectionConfig.form.remoteCreateForm.schemaUrl;
 
   const schemaUrl = editUrl || createUrl;

diff --git a/client/src/containers/AssetAdmin/AssetAdminRouter.js b/client/src/containers/AssetAdmin/AssetAdminRouter.js
@@ -7,6 +7,7 @@ import { decodeQuery } from 'lib/DataFormat';
 import qs from 'qs';
 import CONSTANTS from 'constants/index';
 import configShape from 'lib/configShape';
+import { joinLinks } from 'lib/urls';
 
 const sectionConfigKey = 'SilverStripe\\AssetAdmin\\Controller\\AssetAdmin';
 
@@ -29,15 +30,15 @@ function buildUrl({ base, folderId, fileId, query, action }) {
 
   let url = null;
   if (fileId) {
-    url = `${base}/show/${folderId}/${CONSTANTS.ACTIONS.EDIT_FILE}/${fileId}`;
+    url = joinLinks(base, `show/${folderId}/${CONSTANTS.ACTIONS.EDIT_FILE}/${fileId}`);
   } else if (folderId) {
-    url = `${base}/show/${folderId}`;
+    url = joinLinks(base, `show/${folderId}`);
   } else {
-    url = `${base}/`;
+    url = base;
   }
 
   if (action === CONSTANTS.ACTIONS.CREATE_FOLDER) {
-    url = `${base}/show/${folderId || 0}/${action}`;
+    url = joinLinks(base, `show/${folderId || 0}/${action}`);
   }
 
   const hasQuery = query && Object.keys(query).length > 0;