Merge pull request #1360 from thunderstore-io/02-24-enable_beta_switch_on_all_pages_but

Enable beta switch on all pages but

Author: Oksamies

apps/cyberstorm-remix/public/cyberstorm-static/scripts/beta-switch.js

@@ -1,4 +1,3 @@
-const enabledPages = ["/communities", "c/[^/]+/?$"];
 const legacyProd = {
   protocol: "https://",
   hostname: "thunderstore.io",
@@ -36,6 +35,12 @@ const betaDev = {
   tld: "temp",
 };
 async function checkBetaRedirect(legacy, beta, goToBetaRoR2) {
+  const legacyOnlyPages = [
+    "/settings",
+    "/package/create",
+    "c/[^/]+/p/[^/]+/[^/]+/wiki/?$",
+    "c/[^/]+/p/[^/]+/[^/]+/source/?$",
+  ];
   if (goToBetaRoR2) {
     window.location.assign(
       `${beta.protocol}${beta.hostname}${beta.port !== "" ? ":" : ""}${
@@ -44,35 +49,35 @@ async function checkBetaRedirect(legacy, beta, goToBetaRoR2) {
     );
   } else {
     let switchProject = legacy;
+    let path = window.location.pathname;
     if (window.location.hostname === beta.hostname) {
       switchProject = legacy;
     } else if (window.location.hostname === legacy.hostname) {
       switchProject = beta;
+      legacyOnlyPages.forEach((regPath) => {
+        const regExecuted = new RegExp(regPath).exec(window.location.pathname);
+        const found = regExecuted !== null && regExecuted.length < 2;
+        if (found) {
+          path = "/communities";
+        }
+      });
     }
     window.location.assign(
       `${switchProject.protocol}${switchProject.hostname}${
         switchProject.port !== "" ? ":" : ""
-      }${switchProject.port}${window.location.pathname}`
+      }${switchProject.port}${path}`
     );
   }
 }
 async function insertSwitchButton(legacy, beta) {
-  let betaIsAvailable = false;
-  enabledPages.forEach((regPath) => {
-    const regExecuted = new RegExp(regPath).exec(window.location.pathname);
-    const found = regExecuted !== null && regExecuted.length < 2;
-    if (!betaIsAvailable && found) {
-      betaIsAvailable = true;
-    }
-  });
   const isDoNotRenderPage =
     window.location.hostname === legacy.hostname &&
     window.location.pathname.startsWith("/communities");
   const goToBetaRoR2 =
     window.location.hostname === legacy.hostname &&
     (window.location.pathname === "/" ||
       window.location.pathname === "/package/");
-  if ((betaIsAvailable && !isDoNotRenderPage) || goToBetaRoR2) {
+  if (!isDoNotRenderPage || goToBetaRoR2) {
     const switchButton = document.createElement("button");
     if (window.location.hostname === beta.hostname) {
       switchButton.setAttribute(

packages/beta-switch/src/index.ts

@@ -1,4 +1,4 @@
-const enabledPages = ["/communities", "c/[^/]+/?$"];
+// const enabledPages = ["/communities", "c/[^/]+/?$"];
 
 type UrlStructure = {
   protocol: string;
@@ -54,6 +54,13 @@ async function checkBetaRedirect(
   beta: UrlStructure,
   goToBetaRoR2: boolean
 ) {
+  const legacyOnlyPages = [
+    "/settings",
+    "/package/create",
+    "c/[^/]+/p/[^/]+/[^/]+/wiki/?$",
+    "c/[^/]+/p/[^/]+/[^/]+/source/?$",
+  ];
+
   if (goToBetaRoR2) {
     // Don't include the search params as those differ in projects and are not handled gracefully
     window.location.assign(
@@ -63,31 +70,44 @@ async function checkBetaRedirect(
     );
   } else {
     let switchProject = legacy;
+    let path = window.location.pathname;
 
     if (window.location.hostname === beta.hostname) {
       switchProject = legacy;
     } else if (window.location.hostname === legacy.hostname) {
       switchProject = beta;
+      legacyOnlyPages.forEach((regPath) => {
+        const regExecuted = new RegExp(regPath).exec(window.location.pathname);
+        const found = regExecuted !== null && regExecuted.length < 2;
+        if (found) {
+          path = "/communities";
+        }
+      });
+      // legacyOnlyPages.forEach((lop) => {
+      //   if (window.location.pathname.startsWith(lop)) {
+      //     path = "/";
+      //   }
+      // });
     }
 
     // Don't include the search params as those differ in projects and are not handled gracefully
     window.location.assign(
       `${switchProject.protocol}${switchProject.hostname}${
         switchProject.port !== "" ? ":" : ""
-      }${switchProject.port}${window.location.pathname}`
+      }${switchProject.port}${path}`
     );
   }
 }
 
 async function insertSwitchButton(legacy: UrlStructure, beta: UrlStructure) {
-  let betaIsAvailable = false;
-  enabledPages.forEach((regPath) => {
-    const regExecuted = new RegExp(regPath).exec(window.location.pathname);
-    const found = regExecuted !== null && regExecuted.length < 2;
-    if (!betaIsAvailable && found) {
-      betaIsAvailable = true;
-    }
-  });
+  // let betaIsAvailable = false;
+  // enabledPages.forEach((regPath) => {
+  //   const regExecuted = new RegExp(regPath).exec(window.location.pathname);
+  //   const found = regExecuted !== null && regExecuted.length < 2;
+  //   if (!betaIsAvailable && found) {
+  //     betaIsAvailable = true;
+  //   }
+  // });
 
   const isDoNotRenderPage =
     window.location.hostname === legacy.hostname &&
@@ -98,7 +118,7 @@ async function insertSwitchButton(legacy: UrlStructure, beta: UrlStructure) {
     (window.location.pathname === "/" ||
       window.location.pathname === "/package/");
 
-  if ((betaIsAvailable && !isDoNotRenderPage) || goToBetaRoR2) {
+  if (!isDoNotRenderPage || goToBetaRoR2) {
     const switchButton = document.createElement("button");
 
     // Add styles
@@ -125,7 +145,7 @@ async function insertSwitchButton(legacy: UrlStructure, beta: UrlStructure) {
       window.location.hostname === legacy.hostname ? "beta" : "legacy"
     }`;
 
-    // Insert button to desktop
+    // Insert button to mobile
     if (
       window.location.hostname === beta.hostname ||
       window.location.pathname.startsWith("/communities")