fix: update dashboard to network discovery url (#5220)

cypress/e2e/with-users/dashboard/dashboard.spec.ts

@@ -1,9 +1,9 @@
 import { generateMAASURL } from "../../utils";
 
-context("Dashboard", () => {
+context("Network Discovery", () => {
   beforeEach(() => {
     cy.login();
-    cy.visit(generateMAASURL("/dashboard"));
+    cy.visit(generateMAASURL("/network-discovery"));
   });
 
   it("renders the correct heading", () => {

cypress/e2e/with-users/machines/list.spec.ts

@@ -64,8 +64,8 @@ context("Machine listing", () => {
   });
 
   it("replaces the URL when selecting filters", () => {
-    // visit the dashboard first to have a page to go back to
-    const intialPage = generateMAASURL("/dashboard");
+    // visit network discovery first to have a page to go back to
+    const intialPage = generateMAASURL("/network-discovery");
     cy.visit(intialPage);
     cy.visit(generateMAASURL("/machines"));
 

sitespeed.io/login.js

@@ -13,7 +13,7 @@ module.exports = async function (context, commands) {
     name: "skipintro",
     value: "true",
   });
-  await commands.navigate(constructURL(context, "/dashboard"));
+  await commands.navigate(constructURL(context, "/network-discovery"));
   await commands.wait.bySelector("input[name='username']", TIMEOUT);
   await commands.addText.byName("admin", "username");
   await commands.addText.byName("test", "password");

src/app/Routes.test.tsx

@@ -113,8 +113,8 @@ const routes: { title: string; path: string }[] = [
     path: urls.zones.details({ id: 1 }),
   },
   {
-    title: "Dashboard",
-    path: urls.dashboard.index,
+    title: "Network Discovery",
+    path: urls.networkDiscovery.index,
   },
 ];
 

src/app/Routes.tsx

@@ -6,7 +6,6 @@ import urls from "app/base/urls";
 import NotFound from "app/base/views/NotFound";
 import ControllerDetails from "app/controllers/views/ControllerDetails";
 import ControllerList from "app/controllers/views/ControllerList";
-import Dashboard from "app/dashboard/views/Dashboard";
 import DeviceDetails from "app/devices/views/DeviceDetails";
 import DeviceList from "app/devices/views/DeviceList";
 import DomainDetails from "app/domains/views/DomainDetails";
@@ -16,6 +15,7 @@ import Intro from "app/intro/views/Intro";
 import KVM from "app/kvm/views/KVM";
 import MachineDetails from "app/machines/views/MachineDetails";
 import Machines from "app/machines/views/Machines";
+import NetworkDiscovery from "app/networkDiscovery/views/NetworkDiscovery";
 import Pools from "app/pools/views/Pools";
 import Preferences from "app/preferences/views/Preferences";
 import Settings from "app/settings/views/Settings";
@@ -58,10 +58,18 @@ const Routes = (): JSX.Element => (
     <Route
       element={
         <ErrorBoundary>
-          <Dashboard />
+          <NetworkDiscovery />
         </ErrorBoundary>
       }
-      path={`${urls.dashboard.index}/*`}
+      path={`${urls.networkDiscovery.index}/*`}
+    />
+    <Route
+      element={<Redirect to={urls.networkDiscovery.index} />}
+      path={urls.networkDiscovery.legacyIndex}
+    />
+    <Route
+      element={<Redirect to={urls.networkDiscovery.configuration} />}
+      path={urls.networkDiscovery.legacyConfiguration}
     />
     <Route
       element={

src/app/base/components/AppSideNavigation/constants.ts

@@ -94,7 +94,7 @@ const navGroups: NavGroup[] = [
       },
       {
         label: "Network discovery",
-        url: urls.dashboard.index,
+        url: urls.networkDiscovery.index,
       },
     ],
   },

src/app/base/side-panel-context.tsx

@@ -3,10 +3,6 @@ import { createContext, useCallback, useContext, useState } from "react";
 
 import { ControllerSidePanelViews } from "app/controllers/constants";
 import type { ControllerSidePanelContent } from "app/controllers/types";
-import {
-  DashboardSidePanelViews,
-  type DashboardSidePanelContent,
-} from "app/dashboard/views/constants";
 import { DeviceSidePanelViews } from "app/devices/constants";
 import type { DeviceSidePanelContent } from "app/devices/types";
 import {
@@ -21,6 +17,10 @@ import { KVMSidePanelViews } from "app/kvm/constants";
 import type { KVMSidePanelContent } from "app/kvm/types";
 import { MachineSidePanelViews } from "app/machines/constants";
 import type { MachineSidePanelContent } from "app/machines/types";
+import {
+  NetworkDiscoverySidePanelViews,
+  type NetworkDiscoverySidePanelContent,
+} from "app/networkDiscovery/views/constants";
 import {
   SubnetSidePanelViews,
   type SubnetSidePanelContent,
@@ -58,7 +58,7 @@ export type SidePanelContent =
   | SubnetSidePanelContent
   | DomainDetailsSidePanelContent
   | DomainListSidePanelContent
-  | DashboardSidePanelContent
+  | NetworkDiscoverySidePanelContent
   | VLANDetailsSidePanelContent
   | FabricDetailsSidePanelContent
   | SubnetDetailsSidePanelContent
@@ -86,7 +86,7 @@ export const SidePanelViews = {
   ...SubnetSidePanelViews,
   ...DomainDetailsSidePanelViews,
   ...DomainListSidePanelViews,
-  ...DashboardSidePanelViews,
+  ...NetworkDiscoverySidePanelViews,
   ...VLANDetailsSidePanelViews,
   ...FabricDetailsSidePanelViews,
   ...SubnetDetailsSidePanelViews,

src/app/base/urls.ts

@@ -1,11 +1,11 @@
 import { default as controllers } from "app/controllers/urls";
-import { default as dashboard } from "app/dashboard/urls";
 import { default as devices } from "app/devices/urls";
 import { default as domains } from "app/domains/urls";
 import { default as images } from "app/images/urls";
 import { default as intro } from "app/intro/urls";
 import { default as kvm } from "app/kvm/urls";
 import { default as machines } from "app/machines/urls";
+import { default as networkDiscovery } from "app/networkDiscovery/urls";
 import { default as pools } from "app/pools/urls";
 import { default as preferences } from "app/preferences/urls";
 import { default as settings } from "app/settings/urls";
@@ -16,7 +16,7 @@ import { default as zones } from "app/zones/urls";
 const urls = {
   index: "/",
   controllers,
-  dashboard,
+  networkDiscovery,
   devices,
   domains,
   images,

src/app/intro/components/IntroSection/IntroSection.test.tsx

@@ -56,10 +56,10 @@ describe("IntroSection", () => {
       </Router>,
       { state }
     );
-    expect(history.location.pathname).toBe(urls.dashboard.index);
+    expect(history.location.pathname).toBe(urls.machines.index);
   });
 
-  it("redirects to the dashboard for admins", () => {
+  it("redirects to the machine list for admins", () => {
     state.user = userStateFactory({
       auth: authStateFactory({
         user: userFactory({ completed_intro: true, is_superuser: true }),
@@ -69,7 +69,7 @@ describe("IntroSection", () => {
       <IntroSection shouldExitIntro={true}>Intro content</IntroSection>,
       { route: "/intro/user", state }
     );
-    expect(window.location.pathname).toBe(urls.dashboard.index);
+    expect(window.location.pathname).toBe(urls.machines.index);
   });
 
   it("redirects to the machine list for non-admins", () => {

src/app/intro/hooks.test.tsx

@@ -47,7 +47,7 @@ describe("hooks", () => {
       const { result } = renderHook(() => useExitURL(), {
         wrapper: generateWrapper(store),
       });
-      expect(result.current).toBe(urls.dashboard.index);
+      expect(result.current).toBe(urls.machines.index);
     });
 
     it("gets the exit URL for a non-admin", () => {

src/app/intro/hooks.ts

@@ -1,13 +1,9 @@
-import { useSelector } from "react-redux";
-
 import urls from "app/base/urls";
-import authSelectors from "app/store/auth/selectors";
 
 /**
  * Get the URL to redirect to when the intro closes.
  * @returns The URL to redirect to.
  */
 export const useExitURL = (): string => {
-  const authUser = useSelector(authSelectors.get);
-  return authUser?.is_superuser ? urls.dashboard.index : urls.machines.index;
+  return urls.machines.index;
 };

src/app/intro/views/Intro.test.tsx

@@ -67,7 +67,7 @@ describe("Intro", () => {
       route: "/intro",
       state,
     });
-    expect(window.location.pathname).toBe(urls.dashboard.index);
+    expect(window.location.pathname).toBe(urls.machines.index);
   });
 
   it("returns to the start when loading the user intro and the main intro is incomplete", () => {

src/app/intro/views/MaasIntroSuccess/MaasIntroSuccess.test.tsx

@@ -57,7 +57,7 @@ describe("MaasIntroSuccess", () => {
     ).toHaveProperty("href", `http://example.com${urls.intro.user}`);
   });
 
-  it("links to the dashboard if an admin that has completed the user intro", () => {
+  it("links to the machine list if an admin that has completed the user intro", () => {
     state.user.auth = authStateFactory({
       user: userFactory({ completed_intro: true, is_superuser: true }),
     });
@@ -67,7 +67,7 @@ describe("MaasIntroSuccess", () => {
     });
     expect(
       screen.getByRole("link", { name: MaasIntroSuccessLabels.FinishSetup })
-    ).toHaveProperty("href", `http://example.com${urls.dashboard.index}`);
+    ).toHaveProperty("href", `http://example.com${urls.machines.index}`);
   });
 
   it("links to the machine list if a non-admin that has completed the user intro", () => {

src/app/intro/views/UserIntro/UserIntro.test.tsx

@@ -77,7 +77,7 @@ describe("UserIntro", () => {
       route: "/intro/user",
       state,
     });
-    expect(window.location.pathname).toBe(urls.dashboard.index);
+    expect(window.location.pathname).toBe(urls.machines.index);
   });
 
   it("disables the continue button if there are no ssh keys", () => {
@@ -153,7 +153,7 @@ describe("UserIntro", () => {
       route: "/intro/user",
       state,
     });
-    expect(window.location.pathname).toBe(urls.dashboard.index);
+    expect(window.location.pathname).toBe(urls.machines.index);
   });
 
   it("can skip the user setup", async () => {

src/app/networkDiscovery/urls.ts

@@ -0,0 +1,8 @@
+const urls = {
+  configuration: "/network-discovery/configuration",
+  index: "/network-discovery",
+  legacyIndex: "/dashboard",
+  legacyConfiguration: "/dashboard/configuration",
+};
+
+export default urls;

src/app/dashboard/views/DiscoveriesList/DiscoveriesList.test.tsx → src/app/networkDiscovery/views/DiscoveriesList/DiscoveriesList.test.tsx

@@ -37,7 +37,7 @@ import {
 } from "testing/utils";
 
 const mockStore = configureStore<RootState, {}>();
-const route = "/dashboard";
+const route = "/network-discovery";
 describe("DiscoveriesList", () => {
   let state: RootState;
 

src/app/dashboard/views/DiscoveriesList/DiscoveriesList.tsx → src/app/networkDiscovery/views/DiscoveriesList/DiscoveriesList.tsx

@@ -192,7 +192,7 @@ const DiscoveriesList = (): JSX.Element => {
   const saving = useSelector(discoverySelectors.saving);
   const saved = useSelector(discoverySelectors.saved);
 
-  useWindowTitle("Dashboard");
+  useWindowTitle("Network Discovery");
 
   useFetchActions([discoveryActions.fetch]);
 

src/app/dashboard/views/DiscoveryAddForm/DiscoveryAddForm.test.tsx → src/app/networkDiscovery/views/DiscoveryAddForm/DiscoveryAddForm.test.tsx

@@ -139,7 +139,7 @@ describe("DiscoveryAddForm", () => {
     const store = mockStore(state);
     renderWithBrowserRouter(
       <DiscoveryAddForm discovery={discovery} onClose={jest.fn()} />,
-      { route: "/dashboard", store }
+      { route: "/network-discovery", store }
     );
     const expectedActions = [
       "device/fetch",
@@ -164,7 +164,7 @@ describe("DiscoveryAddForm", () => {
     const store = mockStore(state);
     renderWithBrowserRouter(
       <DiscoveryAddForm discovery={discovery} onClose={jest.fn()} />,
-      { route: "/dashboard", store }
+      { route: "/network-discovery", store }
     );
     expect(screen.getByText("Loading")).toBeInTheDocument();
   });
@@ -173,7 +173,7 @@ describe("DiscoveryAddForm", () => {
     // Render the form with default state.
     const { rerender } = renderWithBrowserRouter(
       <DiscoveryAddForm discovery={discovery} onClose={jest.fn()} />,
-      { route: "/dashboard", state }
+      { route: "/network-discovery", state }
     );
     const error = "Name is invalid";
     // Change the device state to included the errors (as if it has changed via an API response).
@@ -192,7 +192,7 @@ describe("DiscoveryAddForm", () => {
     const store = mockStore(state);
     renderWithBrowserRouter(
       <DiscoveryAddForm discovery={discovery} onClose={jest.fn()} />,
-      { route: "/dashboard", store }
+      { route: "/network-discovery", store }
     );
 
     await userEvent.selectOptions(
@@ -251,7 +251,7 @@ describe("DiscoveryAddForm", () => {
     const store = mockStore(state);
     renderWithBrowserRouter(
       <DiscoveryAddForm discovery={discovery} onClose={jest.fn()} />,
-      { route: "/dashboard", store }
+      { route: "/network-discovery", store }
     );
 
     await userEvent.selectOptions(
@@ -310,7 +310,7 @@ describe("DiscoveryAddForm", () => {
     const store = mockStore(state);
     renderWithBrowserRouter(
       <DiscoveryAddForm discovery={discovery} onClose={jest.fn()} />,
-      { route: "/dashboard", store }
+      { route: "/network-discovery", store }
     );
 
     await userEvent.click(
@@ -329,7 +329,7 @@ describe("DiscoveryAddForm", () => {
     const store = mockStore(state);
     renderWithBrowserRouter(
       <DiscoveryAddForm discovery={discovery} onClose={jest.fn()} />,
-      { route: "/dashboard", store }
+      { route: "/network-discovery", store }
     );
 
     await userEvent.clear(
@@ -353,7 +353,7 @@ describe("DiscoveryAddForm", () => {
     const store = mockStore(state);
     const { rerender } = renderWithBrowserRouter(
       <DiscoveryAddForm discovery={discovery} onClose={jest.fn()} />,
-      { route: "/dashboard", store }
+      { route: "/network-discovery", store }
     );
 
     await userEvent.selectOptions(