fix default redirect

adobe · Jun 26, 2023 · acfcd31 · acfcd31
1 parent 621d6eb
commit acfcd31
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/express/scripts/content-replace.js b/express/scripts/content-replace.js
@@ -15,6 +15,7 @@ import {
   getMetadata,
   titleCase,
   createTag,
+  getHelixEnv,
 } from './scripts.js';
 import fetchAllTemplatesMetadata from './all-templates-metadata.js';
 
@@ -215,3 +216,19 @@ await (async function updateMetadataForTemplates() {
     browseByCat.remove();
   }
 }());
+
+(function validatePage() {
+  const env = getHelixEnv();
+  const title = document.querySelector('title');
+  if ((env && env.name !== 'stage') && getMetadata('live') === 'N') {
+    window.location.replace('/express/templates/');
+  }
+
+  if (title && title.innerText.match(/{{(.*?)}}/)) {
+    window.location.replace('/404');
+  }
+
+  if (env && env.name !== 'stage' && window.location.pathname.endsWith('/express/templates/default')) {
+    window.location.replace('/404');
+  }
+}());
diff --git a/express/scripts/template-redirect.js b/express/scripts/template-redirect.js
@@ -10,30 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-import { getHelixEnv, getLocale, getMetadata } from './scripts.js';
+import { getLocale } from './scripts.js';
 import fetchAllTemplatesMetadata from './all-templates-metadata.js';
 
 async function existsTemplatePage(url) {
   const allTemplatesMetadata = await fetchAllTemplatesMetadata();
   return allTemplatesMetadata.some((e) => e.url === url);
 }
 
-(function validatePage() {
-  const env = getHelixEnv();
-  const title = document.querySelector('title');
-  if ((env && env.name !== 'stage') && getMetadata('live') === 'N') {
-    window.location.replace('/express/templates/');
-  }
-
-  if (title && title.innerText.match(/{{(.*?)}}/)) {
-    window.location.replace('/404');
-  }
-
-  if (env && env.name !== 'stage' && window.location.pathname.endsWith('/express/templates/default')) {
-    window.location.replace('/404');
-  }
-}());
-
 (async function redirectToExistingPage() {
   // TODO: check if the search query points to an existing page. If so, redirect.
   const params = new Proxy(new URLSearchParams(window.location.search), {