From ad61c238738e36f3ee13f101ee24e3c06621693c Mon Sep 17 00:00:00 2001
From: Diogo Castro <diogo.castro@cern.ch>
Date: Sun, 14 May 2023 12:36:05 +0200
Subject: [PATCH 1/3] Allow deletion of named servers

---
 .../ServerDashboard/ServerDashboard.jsx       | 70 ++++++++++++++++---
 jsx/src/util/withAPI.js                       | 10 ++-
 2 files changed, 68 insertions(+), 12 deletions(-)

diff --git a/jsx/src/components/ServerDashboard/ServerDashboard.jsx b/jsx/src/components/ServerDashboard/ServerDashboard.jsx
index d177fb98..616f5a68 100644
--- a/jsx/src/components/ServerDashboard/ServerDashboard.jsx
+++ b/jsx/src/components/ServerDashboard/ServerDashboard.jsx
@@ -45,11 +45,11 @@ const ServerDashboard = (props) => {
     adminAsc = (e) => e.sort((a) => (a.admin ? 1 : -1)),
     dateDesc = (e) =>
       e.sort((a, b) =>
-        new Date(a.last_activity) - new Date(b.last_activity) > 0 ? -1 : 1,
+        new Date(a.last_activity) - new Date(b.last_activity) > 0 ? -1 : 1
       ),
     dateAsc = (e) =>
       e.sort((a, b) =>
-        new Date(a.last_activity) - new Date(b.last_activity) > 0 ? 1 : -1,
+        new Date(a.last_activity) - new Date(b.last_activity) > 0 ? 1 : -1
       ),
     runningAsc = (e) => e.sort((a) => (a.server == null ? -1 : 1)),
     runningDesc = (e) => e.sort((a) => (a.server == null ? 1 : -1));
@@ -74,6 +74,7 @@ const ServerDashboard = (props) => {
     shutdownHub,
     startServer,
     stopServer,
+    deleteServer,
     startAll,
     stopAll,
     history,
@@ -143,7 +144,7 @@ const ServerDashboard = (props) => {
                     dispatchPageUpdate(
                       data.items,
                       data._pagination,
-                      name_filter,
+                      name_filter
                     );
                   })
                   .catch(() => {
@@ -167,6 +168,50 @@ const ServerDashboard = (props) => {
     );
   };
 
+  const DeleteServerButton = ({ serverName, userName }) => {
+    if (serverName === "") {
+      return null;
+    }
+    var [isDisabled, setIsDisabled] = useState(false);
+    return (
+      <button
+        className="btn btn-danger btn-xs stop-button"
+        // It's not possible to delete unnamed servers
+        disabled={isDisabled}
+        onClick={() => {
+          setIsDisabled(true);
+          deleteServer(userName, serverName)
+            .then((res) => {
+              if (res.status < 300) {
+                updateUsers(...slice)
+                  .then((data) => {
+                    dispatchPageUpdate(
+                      data.items,
+                      data._pagination,
+                      name_filter
+                    );
+                  })
+                  .catch(() => {
+                    setIsDisabled(false);
+                    setErrorAlert(`Failed to update users list.`);
+                  });
+              } else {
+                setErrorAlert(`Failed to delete server.`);
+                setIsDisabled(false);
+              }
+              return res;
+            })
+            .catch(() => {
+              setErrorAlert(`Failed to delete server.`);
+              setIsDisabled(false);
+            });
+        }}
+      >
+        Delete Server
+      </button>
+    );
+  };
+
   const StartServerButton = ({ serverName, userName }) => {
     var [isDisabled, setIsDisabled] = useState(false);
     return (
@@ -183,7 +228,7 @@ const ServerDashboard = (props) => {
                     dispatchPageUpdate(
                       data.items,
                       data._pagination,
-                      name_filter,
+                      name_filter
                     );
                   })
                   .catch(() => {
@@ -324,6 +369,10 @@ const ServerDashboard = (props) => {
                 userName={user.name}
                 style={{ marginRight: 20 }}
               />
+              <DeleteServerButton
+                serverName={server.name}
+                userName={user.name}
+              />
               <a
                 href={`${base_url}spawn/${user.name}${
                   server.name ? "/" + server.name : ""
@@ -483,7 +532,7 @@ const ServerDashboard = (props) => {
                               failedServers.length > 1 ? "servers" : "server"
                             }. ${
                               failedServers.length > 1 ? "Are they " : "Is it "
-                            } already running?`,
+                            } already running?`
                           );
                         }
                         return res;
@@ -494,11 +543,11 @@ const ServerDashboard = (props) => {
                             dispatchPageUpdate(
                               data.items,
                               data._pagination,
-                              name_filter,
+                              name_filter
                             );
                           })
                           .catch(() =>
-                            setErrorAlert(`Failed to update users list.`),
+                            setErrorAlert(`Failed to update users list.`)
                           );
                         return res;
                       })
@@ -523,7 +572,7 @@ const ServerDashboard = (props) => {
                               failedServers.length > 1 ? "servers" : "server"
                             }. ${
                               failedServers.length > 1 ? "Are they " : "Is it "
-                            } already stopped?`,
+                            } already stopped?`
                           );
                         }
                         return res;
@@ -534,11 +583,11 @@ const ServerDashboard = (props) => {
                             dispatchPageUpdate(
                               data.items,
                               data._pagination,
-                              name_filter,
+                              name_filter
                             );
                           })
                           .catch(() =>
-                            setErrorAlert(`Failed to update users list.`),
+                            setErrorAlert(`Failed to update users list.`)
                           );
                         return res;
                       })
@@ -582,6 +631,7 @@ ServerDashboard.propTypes = {
   shutdownHub: PropTypes.func,
   startServer: PropTypes.func,
   stopServer: PropTypes.func,
+  deleteServer: PropTypes.func,
   startAll: PropTypes.func,
   stopAll: PropTypes.func,
   dispatch: PropTypes.func,
diff --git a/jsx/src/util/withAPI.js b/jsx/src/util/withAPI.js
index 28cb25d8..abce6a5f 100644
--- a/jsx/src/util/withAPI.js
+++ b/jsx/src/util/withAPI.js
@@ -7,17 +7,23 @@ const withAPI = withProps(() => ({
       `/users?include_stopped_servers&offset=${offset}&limit=${limit}&name_filter=${
         name_filter || ""
       }`,
-      "GET",
+      "GET"
     ).then((data) => data.json()),
   updateGroups: (offset, limit) =>
     jhapiRequest(`/groups?offset=${offset}&limit=${limit}`, "GET").then(
-      (data) => data.json(),
+      (data) => data.json()
     ),
   shutdownHub: () => jhapiRequest("/shutdown", "POST"),
   startServer: (name, serverName = "") =>
     jhapiRequest("/users/" + name + "/servers/" + (serverName || ""), "POST"),
   stopServer: (name, serverName = "") =>
     jhapiRequest("/users/" + name + "/servers/" + (serverName || ""), "DELETE"),
+  deleteServer: (name, serverName = "") =>
+    jhapiRequest(
+      "/users/" + name + "/servers/" + (serverName || ""),
+      "DELETE",
+      { remove: true }
+    ),
   startAll: (names) =>
     names.map((e) => jhapiRequest("/users/" + e + "/server", "POST")),
   stopAll: (names) =>

From 9d68107722f45290f64dcae2f16c243524591ffe Mon Sep 17 00:00:00 2001
From: Diogo Castro <diogo.castro@cern.ch>
Date: Sun, 14 May 2023 18:23:52 +0200
Subject: [PATCH 2/3] Add test case for named servers Adapt all tests

---
 .../ServerDashboard/ServerDashboard.jsx       |   6 +-
 .../ServerDashboard/ServerDashboard.test.js   | 107 ++++++++++++------
 2 files changed, 79 insertions(+), 34 deletions(-)

diff --git a/jsx/src/components/ServerDashboard/ServerDashboard.jsx b/jsx/src/components/ServerDashboard/ServerDashboard.jsx
index 616f5a68..260ddb7f 100644
--- a/jsx/src/components/ServerDashboard/ServerDashboard.jsx
+++ b/jsx/src/components/ServerDashboard/ServerDashboard.jsx
@@ -323,7 +323,11 @@ const ServerDashboard = (props) => {
     const userServerName = user.name + serverNameDash;
     const open = collapseStates[userServerName] || false;
     return [
-      <tr key={`${userServerName}-row`} className="user-row">
+      <tr
+        key={`${userServerName}-row`}
+        data-testid={`user-row-${userServerName}`}
+        className="user-row"
+      >
         <td data-testid="user-row-name">
           <span>
             <Button
diff --git a/jsx/src/components/ServerDashboard/ServerDashboard.test.js b/jsx/src/components/ServerDashboard/ServerDashboard.test.js
index 5abb0691..04f5a8dc 100644
--- a/jsx/src/components/ServerDashboard/ServerDashboard.test.js
+++ b/jsx/src/components/ServerDashboard/ServerDashboard.test.js
@@ -2,7 +2,7 @@ import React from "react";
 import "@testing-library/jest-dom";
 import { act } from "react-dom/test-utils";
 import userEvent from "@testing-library/user-event";
-import { render, screen, fireEvent } from "@testing-library/react";
+import { render, screen, fireEvent, getByText } from "@testing-library/react";
 import { HashRouter, Switch } from "react-router-dom";
 import { Provider, useSelector } from "react-redux";
 import { createStore } from "redux";
@@ -43,6 +43,31 @@ var mockAsync = (data) =>
 var mockAsyncRejection = () =>
   jest.fn().mockImplementation(() => Promise.reject());
 
+var bar_servers = {
+  "": {
+    name: "",
+    last_activity: "2020-12-07T20:58:02.437408Z",
+    started: "2020-12-07T20:58:01.508266Z",
+    pending: null,
+    ready: false,
+    state: { pid: 12345 },
+    url: "/user/bar/",
+    user_options: {},
+    progress_url: "/hub/api/users/bar/progress",
+  },
+  servername: {
+    name: "servername",
+    last_activity: "2020-12-07T20:58:02.437408Z",
+    started: "2020-12-07T20:58:01.508266Z",
+    pending: null,
+    ready: false,
+    state: { pid: 12345 },
+    url: "/user/bar/servername",
+    user_options: {},
+    progress_url: "/hub/api/users/bar/servername/progress",
+  },
+};
+
 var mockAppState = () =>
   Object.assign({}, initialState, {
     user_data: [
@@ -78,19 +103,7 @@ var mockAppState = () =>
         pending: null,
         created: "2020-12-07T18:46:27.115528Z",
         last_activity: "2020-12-07T20:43:51.013613Z",
-        servers: {
-          "": {
-            name: "",
-            last_activity: "2020-12-07T20:58:02.437408Z",
-            started: "2020-12-07T20:58:01.508266Z",
-            pending: null,
-            ready: false,
-            state: { pid: 12345 },
-            url: "/user/bar/",
-            user_options: {},
-            progress_url: "/hub/api/users/bar/progress",
-          },
-        },
+        servers: bar_servers,
       },
     ],
     user_page: {
@@ -150,9 +163,11 @@ test("Renders users from props.user_data into table", async () => {
 
   let foo = screen.getByTestId("user-name-div-foo");
   let bar = screen.getByTestId("user-name-div-bar");
+  let bar_server = screen.getByTestId("user-name-div-bar-servername");
 
   expect(foo).toBeVisible();
   expect(bar).toBeVisible();
+  expect(bar_server).toBeVisible();
 });
 
 test("Renders correctly the status of a single-user server", async () => {
@@ -162,10 +177,13 @@ test("Renders correctly the status of a single-user server", async () => {
     render(serverDashboardJsx(callbackSpy));
   });
 
-  let start = screen.getByText("Start Server");
-  let stop = screen.getByText("Stop Server");
+  let start_elems = screen.getAllByText("Start Server");
+  expect(start_elems.length).toBe(Object.keys(bar_servers).length);
+  start_elems.forEach((start) => {
+    expect(start).toBeVisible();
+  });
 
-  expect(start).toBeVisible();
+  let stop = screen.getByText("Stop Server");
   expect(stop).toBeVisible();
 });
 
@@ -176,9 +194,12 @@ test("Renders spawn page link", async () => {
     render(serverDashboardJsx(callbackSpy));
   });
 
-  let link = screen.getByText("Spawn Page").closest("a");
-  let url = new URL(link.href);
-  expect(url.pathname).toEqual("/spawn/bar");
+  for (let server in bar_servers) {
+    let row = screen.getByTestId(`user-row-bar${server ? "-" + server : ""}`);
+    let link = getByText(row, "Spawn Page").closest("a");
+    let url = new URL(link.href);
+    expect(url.pathname).toEqual("/spawn/bar" + (server ? "/" + server : ""));
+  }
 });
 
 test("Invokes the startServer event on button click", async () => {
@@ -188,10 +209,11 @@ test("Invokes the startServer event on button click", async () => {
     render(serverDashboardJsx(callbackSpy));
   });
 
-  let start = screen.getByText("Start Server");
+  let start_elems = screen.getAllByText("Start Server");
+  expect(start_elems.length).toBe(Object.keys(bar_servers).length);
 
   await act(async () => {
-    fireEvent.click(start);
+    fireEvent.click(start_elems[0]);
   });
 
   expect(callbackSpy).toHaveBeenCalled();
@@ -381,7 +403,7 @@ test("Shows a UI error dialogue when start all servers fails", async () => {
             />
           </Switch>
         </HashRouter>
-      </Provider>,
+      </Provider>
     );
   });
 
@@ -415,7 +437,7 @@ test("Shows a UI error dialogue when stop all servers fails", async () => {
             />
           </Switch>
         </HashRouter>
-      </Provider>,
+      </Provider>
     );
   });
 
@@ -449,14 +471,15 @@ test("Shows a UI error dialogue when start user server fails", async () => {
             />
           </Switch>
         </HashRouter>
-      </Provider>,
+      </Provider>
     );
   });
 
-  let start = screen.getByText("Start Server");
+  let start_elems = screen.getAllByText("Start Server");
+  expect(start_elems.length).toBe(Object.keys(bar_servers).length);
 
   await act(async () => {
-    fireEvent.click(start);
+    fireEvent.click(start_elems[0]);
   });
 
   let errorDialog = screen.getByText("Failed to start server.");
@@ -483,14 +506,15 @@ test("Shows a UI error dialogue when start user server returns an improper statu
             />
           </Switch>
         </HashRouter>
-      </Provider>,
+      </Provider>
     );
   });
 
-  let start = screen.getByText("Start Server");
+  let start_elems = screen.getAllByText("Start Server");
+  expect(start_elems.length).toBe(Object.keys(bar_servers).length);
 
   await act(async () => {
-    fireEvent.click(start);
+    fireEvent.click(start_elems[0]);
   });
 
   let errorDialog = screen.getByText("Failed to start server.");
@@ -517,7 +541,7 @@ test("Shows a UI error dialogue when stop user servers fails", async () => {
             />
           </Switch>
         </HashRouter>
-      </Provider>,
+      </Provider>
     );
   });
 
@@ -551,7 +575,7 @@ test("Shows a UI error dialogue when stop user server returns an improper status
             />
           </Switch>
         </HashRouter>
-      </Provider>,
+      </Provider>
     );
   });
 
@@ -597,7 +621,7 @@ test("Search for user calls updateUsers with name filter", async () => {
             />
           </Switch>
         </HashRouter>
-      </Provider>,
+      </Provider>
     );
   });
 
@@ -656,3 +680,20 @@ test("Interacting with PaginationFooter causes state update and refresh via useE
   // expect(callbackSpy.mock.calls).toHaveLength(2);
   // expect(callbackSpy).toHaveBeenCalledWith(2, 2, "");
 });
+
+test("Server delete button exists for named servers", async () => {
+  let callbackSpy = mockAsync();
+
+  await act(async () => {
+    render(serverDashboardJsx(callbackSpy));
+  });
+
+  for (let server in bar_servers) {
+    if (server === "") {
+      continue;
+    }
+    let row = screen.getByTestId(`user-row-bar-${server}`);
+    let delete_button = getByText(row, "Delete Server");
+    expect(delete_button).toBeEnabled();
+  }
+});

From b0367c21f378c10b9d245b41405bfe93e578b3a0 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Tue, 23 May 2023 15:33:07 +0000
Subject: [PATCH 3/3] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 .../ServerDashboard/ServerDashboard.jsx       | 22 +++++++++----------
 .../ServerDashboard/ServerDashboard.test.js   | 14 ++++++------
 jsx/src/util/withAPI.js                       |  6 ++---
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/jsx/src/components/ServerDashboard/ServerDashboard.jsx b/jsx/src/components/ServerDashboard/ServerDashboard.jsx
index 260ddb7f..4385395d 100644
--- a/jsx/src/components/ServerDashboard/ServerDashboard.jsx
+++ b/jsx/src/components/ServerDashboard/ServerDashboard.jsx
@@ -45,11 +45,11 @@ const ServerDashboard = (props) => {
     adminAsc = (e) => e.sort((a) => (a.admin ? 1 : -1)),
     dateDesc = (e) =>
       e.sort((a, b) =>
-        new Date(a.last_activity) - new Date(b.last_activity) > 0 ? -1 : 1
+        new Date(a.last_activity) - new Date(b.last_activity) > 0 ? -1 : 1,
       ),
     dateAsc = (e) =>
       e.sort((a, b) =>
-        new Date(a.last_activity) - new Date(b.last_activity) > 0 ? 1 : -1
+        new Date(a.last_activity) - new Date(b.last_activity) > 0 ? 1 : -1,
       ),
     runningAsc = (e) => e.sort((a) => (a.server == null ? -1 : 1)),
     runningDesc = (e) => e.sort((a) => (a.server == null ? 1 : -1));
@@ -144,7 +144,7 @@ const ServerDashboard = (props) => {
                     dispatchPageUpdate(
                       data.items,
                       data._pagination,
-                      name_filter
+                      name_filter,
                     );
                   })
                   .catch(() => {
@@ -188,7 +188,7 @@ const ServerDashboard = (props) => {
                     dispatchPageUpdate(
                       data.items,
                       data._pagination,
-                      name_filter
+                      name_filter,
                     );
                   })
                   .catch(() => {
@@ -228,7 +228,7 @@ const ServerDashboard = (props) => {
                     dispatchPageUpdate(
                       data.items,
                       data._pagination,
-                      name_filter
+                      name_filter,
                     );
                   })
                   .catch(() => {
@@ -536,7 +536,7 @@ const ServerDashboard = (props) => {
                               failedServers.length > 1 ? "servers" : "server"
                             }. ${
                               failedServers.length > 1 ? "Are they " : "Is it "
-                            } already running?`
+                            } already running?`,
                           );
                         }
                         return res;
@@ -547,11 +547,11 @@ const ServerDashboard = (props) => {
                             dispatchPageUpdate(
                               data.items,
                               data._pagination,
-                              name_filter
+                              name_filter,
                             );
                           })
                           .catch(() =>
-                            setErrorAlert(`Failed to update users list.`)
+                            setErrorAlert(`Failed to update users list.`),
                           );
                         return res;
                       })
@@ -576,7 +576,7 @@ const ServerDashboard = (props) => {
                               failedServers.length > 1 ? "servers" : "server"
                             }. ${
                               failedServers.length > 1 ? "Are they " : "Is it "
-                            } already stopped?`
+                            } already stopped?`,
                           );
                         }
                         return res;
@@ -587,11 +587,11 @@ const ServerDashboard = (props) => {
                             dispatchPageUpdate(
                               data.items,
                               data._pagination,
-                              name_filter
+                              name_filter,
                             );
                           })
                           .catch(() =>
-                            setErrorAlert(`Failed to update users list.`)
+                            setErrorAlert(`Failed to update users list.`),
                           );
                         return res;
                       })
diff --git a/jsx/src/components/ServerDashboard/ServerDashboard.test.js b/jsx/src/components/ServerDashboard/ServerDashboard.test.js
index 04f5a8dc..b70ac2a4 100644
--- a/jsx/src/components/ServerDashboard/ServerDashboard.test.js
+++ b/jsx/src/components/ServerDashboard/ServerDashboard.test.js
@@ -403,7 +403,7 @@ test("Shows a UI error dialogue when start all servers fails", async () => {
             />
           </Switch>
         </HashRouter>
-      </Provider>
+      </Provider>,
     );
   });
 
@@ -437,7 +437,7 @@ test("Shows a UI error dialogue when stop all servers fails", async () => {
             />
           </Switch>
         </HashRouter>
-      </Provider>
+      </Provider>,
     );
   });
 
@@ -471,7 +471,7 @@ test("Shows a UI error dialogue when start user server fails", async () => {
             />
           </Switch>
         </HashRouter>
-      </Provider>
+      </Provider>,
     );
   });
 
@@ -506,7 +506,7 @@ test("Shows a UI error dialogue when start user server returns an improper statu
             />
           </Switch>
         </HashRouter>
-      </Provider>
+      </Provider>,
     );
   });
 
@@ -541,7 +541,7 @@ test("Shows a UI error dialogue when stop user servers fails", async () => {
             />
           </Switch>
         </HashRouter>
-      </Provider>
+      </Provider>,
     );
   });
 
@@ -575,7 +575,7 @@ test("Shows a UI error dialogue when stop user server returns an improper status
             />
           </Switch>
         </HashRouter>
-      </Provider>
+      </Provider>,
     );
   });
 
@@ -621,7 +621,7 @@ test("Search for user calls updateUsers with name filter", async () => {
             />
           </Switch>
         </HashRouter>
-      </Provider>
+      </Provider>,
     );
   });
 
diff --git a/jsx/src/util/withAPI.js b/jsx/src/util/withAPI.js
index abce6a5f..1b49f46a 100644
--- a/jsx/src/util/withAPI.js
+++ b/jsx/src/util/withAPI.js
@@ -7,11 +7,11 @@ const withAPI = withProps(() => ({
       `/users?include_stopped_servers&offset=${offset}&limit=${limit}&name_filter=${
         name_filter || ""
       }`,
-      "GET"
+      "GET",
     ).then((data) => data.json()),
   updateGroups: (offset, limit) =>
     jhapiRequest(`/groups?offset=${offset}&limit=${limit}`, "GET").then(
-      (data) => data.json()
+      (data) => data.json(),
     ),
   shutdownHub: () => jhapiRequest("/shutdown", "POST"),
   startServer: (name, serverName = "") =>
@@ -22,7 +22,7 @@ const withAPI = withProps(() => ({
     jhapiRequest(
       "/users/" + name + "/servers/" + (serverName || ""),
       "DELETE",
-      { remove: true }
+      { remove: true },
     ),
   startAll: (names) =>
     names.map((e) => jhapiRequest("/users/" + e + "/server", "POST")),