Add hashroute redirect with machine listing fallthrough. (#1177)

canonical · May 29, 2020 · 60b84f0 · 60b84f0
1 parent 6fab5f7
commit 60b84f0
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 5 deletions.
diff --git a/legacy/src/app/entry.js b/legacy/src/app/entry.js
@@ -253,7 +253,7 @@ function configureMaas(
   $locationProvider,
   $compileProvider,
   tagsInputConfigProvider,
-  $urlRouterProvider
+  $urlRouterProvider,
 ) {
   // Disable debugInfo unless in a Jest context.
   // Re-enable debugInfo in development by running

diff --git a/legacy/src/app/routes.js b/legacy/src/app/routes.js
@@ -148,8 +148,14 @@ const configureRoutes = ($stateProvider, $urlRouterProvider) => {
       template: podDetailsTmpl,
       controller: "PodDetailsController",
     })
-    .state("pods", { url: prefixRoute("/pods"), redirectTo: prefixRoute("/kvm") })
-    .state("podDetails", { url: prefixRoute("/pod/:id"), redirectTo: prefixRoute("/kvm/:id") })
+    .state("pods", {
+      url: prefixRoute("/pods"),
+      redirectTo: prefixRoute("/kvm"),
+    })
+    .state("podDetails", {
+      url: prefixRoute("/pod/:id"),
+      redirectTo: prefixRoute("/kvm/:id"),
+    })
     .state("master.rsd", {
       url: prefixRoute("/rsd"),
       template: podsListTmpl,
@@ -227,6 +233,26 @@ const configureRoutes = ($stateProvider, $urlRouterProvider) => {
       template: dashboardTmpl,
       controller: "DashboardController",
     });
+
+  $urlRouterProvider.otherwise(($injector, $location) => {
+    // Redirect old hash routes to new routes
+    if ($location.hash()) {
+      window.history.pushState(
+        null,
+        null,
+        `${process.env.BASENAME}${
+          process.env.ANGULAR_BASENAME
+        }${$location.hash()}`
+      );
+    } else {
+      // fallthrough redirect machine listing
+      window.history.pushState(
+        null,
+        null,
+        `${process.env.BASENAME}${process.env.REACT_BASENAME}/machines`
+      );
+    }
+  });
 };
 
 export default configureRoutes;
diff --git a/legacy/src/app/services/tests/test_region.js b/legacy/src/app/services/tests/test_region.js
@@ -10,7 +10,11 @@ import MockWebSocket from "testing/websocket";
 
 describe("RegionConnection", function() {
   // Load the MAAS module to test.
-  beforeEach(angular.mock.module("MAAS"));
+  beforeEach(
+    angular.mock.module("MAAS", ($urlRouterProvider) =>
+      $urlRouterProvider.deferIntercept()
+    )
+  );
 
   // Grab the needed angular pieces.
   var $timeout, $rootScope, $q, $cookies, $window;

diff --git a/root/src/root-application.js b/root/src/root-application.js
@@ -15,7 +15,10 @@ registerApplication({
     showLoading();
     return import("@maas-ui/maas-ui-legacy");
   },
-  activeWhen: `${process.env.BASENAME}${process.env.ANGULAR_BASENAME}`,
+  activeWhen: (location) =>
+    location.pathname.startsWith(
+      `${process.env.BASENAME}${process.env.ANGULAR_BASENAME}`
+    ) || location.hash.startsWith("#"),
 });
 
 registerApplication({