WD-7718 - feat: Remove additional controllers feature (#1676)

canonical · Jan 15, 2024 · 5e8ef26 · 5e8ef26
1 parent 08a85c5
commit 5e8ef26
Show file tree

Hide file tree

Showing 18 changed files with 39 additions and 853 deletions.
diff --git a/HACKING.md b/HACKING.md
@@ -40,7 +40,6 @@ contribute and what kinds of contributions are welcome.
   - [Deploying a local app](#deploying-a-local-app)
   - [Setting up cross model integrations](#setting-up-cross-model-integrations)
   - [Getting models into a broken state](#getting-models-into-a-broken-state)
-  - [Adding additional controllers](#adding-additional-controllers)
 
 ## Setting up the dashboard for development
 
@@ -597,27 +596,3 @@ To get the model out of the broken state run:
 ```shell
 juju exec --app nginx "status-set --application=True active"
 ```
-
-### Adding additional controllers
-
-To add additional controllers in the dashboard you'll need more than one controller. You might
-like to [set up two controllers](#juju-controllers-in-multipass), each in their
-own Multipass.
-
-You might also like to add some models and deploy some applications on each controller.
-
-Once you have your controllers set up, [configure your dashboard](#controller-configuration) to point to one
-of the controllers.
-
-At this point you should probably [accept the
-certificates](#self-signed-certificates) for both controllers.
-
-Load the dashboard and go to the controllers list (click Controllers in the
-sidebar).
-
-Now click the 'Register a controller' button. Fill in the form using the details
-of the second controller (you can get the IP address of the controller using
-`multipass list`) and then click 'Add Controller'.
-
-The second controller should now be visible in the controller list and going to
-the model list should display the models from both controllers.
diff --git a/src/juju/api.test.ts b/src/juju/api.test.ts
@@ -25,6 +25,7 @@ import {
 } from "testing/factories/juju/ModelManagerV9";
 import {
   controllerFactory,
+  controllerInfoFactory,
   modelListInfoFactory,
 } from "testing/factories/juju/juju";
 import { connectionInfoFactory } from "testing/factories/juju/jujulib";
@@ -722,12 +723,8 @@ describe("Juju API", () => {
           jimM: {
             listControllers: jest.fn().mockResolvedValueOnce({
               controllers: [
-                {
-                  "agent-version": "1.2.3",
-                  name: "jaas1",
-                  uuid: "abc123",
-                },
-                { path: "admin/jaas2", uuid: "def456" },
+                controllerInfoFactory.build({ name: "jaas1" }),
+                controllerInfoFactory.build({ name: "jaas2" }),
               ],
             }),
           },
@@ -737,30 +734,21 @@ describe("Juju API", () => {
         .spyOn(jujuLibVersions, "jujuUpdateAvailable")
         .mockImplementationOnce(async () => true)
         .mockImplementationOnce(async () => false);
-      await fetchControllerList(
-        "wss://example.com/api",
-        conn,
-        true,
-        dispatch,
-        () => rootStateFactory.build(),
+      await fetchControllerList("wss://example.com/api", conn, dispatch, () =>
+        rootStateFactory.build(),
       );
       expect(dispatch).toHaveBeenCalledWith(
         jujuActions.updateControllerList({
           wsControllerURL: "wss://example.com/api",
           controllers: [
-            {
-              "agent-version": "1.2.3",
+            controllerInfoFactory.build({
               name: "jaas1",
-              uuid: "abc123",
-              additionalController: true,
               updateAvailable: true,
-            },
-            {
-              path: "admin/jaas2",
-              uuid: "def456",
-              additionalController: true,
+            }),
+            controllerInfoFactory.build({
+              name: "jaas2",
               updateAvailable: false,
-            },
+            }),
           ],
         }),
       );
@@ -781,12 +769,8 @@ describe("Juju API", () => {
         .spyOn(jujuLibVersions, "jujuUpdateAvailable")
         .mockImplementationOnce(async () => true)
         .mockImplementationOnce(async () => false);
-      await fetchControllerList(
-        "wss://example.com/api",
-        conn,
-        true,
-        dispatch,
-        () => rootStateFactory.build(),
+      await fetchControllerList("wss://example.com/api", conn, dispatch, () =>
+        rootStateFactory.build(),
       );
       expect(dispatch).toHaveBeenCalledWith(
         jujuActions.updateControllerList({
@@ -825,7 +809,6 @@ describe("Juju API", () => {
       await fetchControllerList(
         "wss://example.com/api",
         conn,
-        true,
         dispatch,
         () => state,
       );
@@ -836,7 +819,6 @@ describe("Juju API", () => {
             {
               path: "admin/juju1",
               uuid: "abc123",
-              additionalController: true,
               updateAvailable: true,
               version: "1.2.3",
             },
@@ -851,38 +833,25 @@ describe("Juju API", () => {
         facades: {
           jimM: {
             listControllers: jest.fn().mockResolvedValueOnce({
-              controllers: [
-                {
-                  "agent-version": "1.2.3",
-                  name: "jaas1",
-                  uuid: "abc123",
-                },
-              ],
+              controllers: [controllerInfoFactory.build({ name: "jaas1" })],
             }),
           },
         },
       } as unknown as Connection;
       jest
         .spyOn(jujuLibVersions, "jujuUpdateAvailable")
         .mockImplementationOnce(async () => null);
-      await fetchControllerList(
-        "wss://example.com/api",
-        conn,
-        true,
-        dispatch,
-        () => rootStateFactory.build(),
+      await fetchControllerList("wss://example.com/api", conn, dispatch, () =>
+        rootStateFactory.build(),
       );
       expect(dispatch).toHaveBeenCalledWith(
         jujuActions.updateControllerList({
           wsControllerURL: "wss://example.com/api",
           controllers: [
-            {
-              "agent-version": "1.2.3",
+            controllerInfoFactory.build({
               name: "jaas1",
-              uuid: "abc123",
-              additionalController: true,
               updateAvailable: false,
-            },
+            }),
           ],
         }),
       );

diff --git a/src/juju/api.ts b/src/juju/api.ts
@@ -397,25 +397,18 @@ export async function fetchAllModelStatuses(
   @param wsControllerURL The URL of the controller.
   @param conn The Juju controller connection.
   @param reduxStore The applications reduxStore.
-  @param additionalController If this is an additional controller.
 */
 export async function fetchControllerList(
   wsControllerURL: string,
   conn: ConnectionWithFacades,
-  additionalController: boolean,
   dispatch: Store["dispatch"],
   getState: () => RootState,
 ) {
   let controllers: JujuController[] | null = null;
   if (conn.facades.jimM) {
     try {
       const response = await conn.facades.jimM?.listControllers();
-      controllers = response.controllers
-        ? response.controllers.map((controller) => ({
-            ...controller,
-            additionalController,
-          }))
-        : [];
+      controllers = response.controllers ?? [];
     } catch (error) {
       dispatch(
         generalActions.storeConnectionError(
@@ -435,7 +428,6 @@ export async function fetchControllerList(
           uuid: controllerConfig.config["controller-uuid"],
           version: getControllerConnection(getState(), wsControllerURL)
             ?.serverVersion,
-          additionalController,
         },
       ];
     }

diff --git a/src/pages/ControllersIndex/ControllersIndex.test.tsx b/src/pages/ControllersIndex/ControllersIndex.test.tsx
@@ -4,7 +4,6 @@ import userEvent from "@testing-library/user-event";
 import type { RootState } from "store/store";
 import { generalStateFactory } from "testing/factories/general";
 import {
-  additionalControllerFactory,
   controllerFactory,
   jujuStateFactory,
   modelDataApplicationFactory,
@@ -18,7 +17,7 @@ import { connectionInfoFactory } from "testing/factories/juju/jujulib";
 import { rootStateFactory } from "testing/factories/root";
 import { renderComponent } from "testing/utils";
 
-import ControllersIndex, { Label } from "./ControllersIndex";
+import ControllersIndex from "./ControllersIndex";
 
 describe("Controllers table", () => {
   let state: RootState;
@@ -45,67 +44,6 @@ describe("Controllers table", () => {
     expect(screen.getAllByRole("row")).toHaveLength(3);
   });
 
-  it("displays additional controllers", () => {
-    state.general.controllerConnections = {
-      "wss://jimm.jujucharms.com/api": connectionInfoFactory.build({}),
-    };
-    state.juju = jujuStateFactory.build({
-      controllers: {
-        "wss://jimm.jujucharms.com/api": [
-          controllerFactory.build(),
-          additionalControllerFactory.build(),
-        ],
-      },
-    });
-    renderComponent(<ControllersIndex />, { state });
-    const tables = screen.getAllByRole("grid");
-    expect(tables).toHaveLength(2);
-    const additionalRows = within(tables[1]).getAllByRole("row");
-    expect(additionalRows).toHaveLength(2);
-    expect(additionalRows[1]).toHaveTextContent(
-      [
-        "jimm.jujucharms.com",
-        "Connected",
-        "unknown/unknown",
-        "0",
-        "0",
-        "0",
-        "0",
-      ].join(""),
-    );
-  });
-
-  it("displays additional controllers from JIMM", () => {
-    state.general.controllerConnections = {
-      "wss://jimm.jujucharms.com/api": connectionInfoFactory.build(),
-    };
-    state.juju = jujuStateFactory.build({
-      controllers: {
-        "wss://jimm.jujucharms.com/api": [
-          controllerFactory.build(),
-          controllerInfoFactory.build({ additionalController: true }),
-        ],
-      },
-    });
-    renderComponent(<ControllersIndex />, { state });
-    const tables = screen.getAllByRole("grid");
-    expect(tables).toHaveLength(2);
-    const additionalRows = within(tables[1]).getAllByRole("row");
-    expect(additionalRows).toHaveLength(2);
-    expect(additionalRows[1]).toHaveTextContent(
-      [
-        "controller1",
-        "Connected",
-        "unknown/unknown",
-        "0",
-        "0",
-        "0",
-        "0",
-        "1.2.3",
-      ].join(""),
-    );
-  });
-
   it("counts models, machines, apps, and units", () => {
     state.general.controllerConnections = {
       "wss://jimm.jujucharms.com/api": connectionInfoFactory.build(),
@@ -193,17 +131,6 @@ describe("Controllers table", () => {
     ).toBeInTheDocument();
   });
 
-  it("shows 'Register new controller' panel", async () => {
-    renderComponent(<ControllersIndex />, { url: "/controllers" });
-    await userEvent.click(
-      screen.getByRole("button", { name: Label.REGISTER_BUTTON }),
-    );
-    expect(window.location.search).toBe("?panel=register-controller");
-    expect(
-      document.querySelector(".p-panel.register-controller"),
-    ).toBeInTheDocument();
-  });
-
   it("Indicates if a controller has an update available", () => {
     state.juju = jujuStateFactory.build({
       controllers: {