From 36a636129fdcd4819c9ec7656caeee1bce9e71e3 Mon Sep 17 00:00:00 2001
From: mbecker20 <becker.maxh@gmail.com>
Date: Fri, 8 Apr 2022 01:59:29 -0700
Subject: [PATCH] remove owners whose account have been deleted

---
 core/src/routes/users.ts                                  | 2 ++
 frontend/src/components/deployment/tabs/config/Owners.tsx | 4 ++--
 frontend/src/components/users/Users.tsx                   | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/src/routes/users.ts b/core/src/routes/users.ts
index edeee468e..5b559e5f5 100644
--- a/core/src/routes/users.ts
+++ b/core/src/routes/users.ts
@@ -43,6 +43,8 @@ const users = fp((app: FastifyInstance, _: {}, done: () => void) => {
       return;
     }
     await app.users.findByIdAndDelete(id);
+    app.deployments.updateMany({}, { $pull: { owners: toDelete.username } });
+    app.builds.updateMany({}, { $pull: { owners: toDelete.username } });
     app.broadcast(USER_UPDATE, {});
     res.send(`deleted user ${id} (${toDelete.username})`);
   });
diff --git a/frontend/src/components/deployment/tabs/config/Owners.tsx b/frontend/src/components/deployment/tabs/config/Owners.tsx
index b0d50b01d..69977048d 100644
--- a/frontend/src/components/deployment/tabs/config/Owners.tsx
+++ b/frontend/src/components/deployment/tabs/config/Owners.tsx
@@ -53,7 +53,7 @@ const Owners: Component<{}> = (p) => {
                   onConfirm={async () => {
                     await addOwnerToDeployment(deployment._id!, user.username);
                     pushNotification("good", "owner added to deployment");
-										setUserSearch("");
+                    setUserSearch("");
                   }}
                 >
                   {user.username}
@@ -74,7 +74,7 @@ const Owners: Component<{}> = (p) => {
                 color="red"
                 onConfirm={async () => {
                   await removeOwnerFromDeployment(deployment._id!, owner);
-                  pushNotification("good", "user added to collaborators");
+                  pushNotification("good", "user removed from collaborators");
                 }}
               >
                 remove
diff --git a/frontend/src/components/users/Users.tsx b/frontend/src/components/users/Users.tsx
index 42fd3f4e6..3d4ab90b9 100644
--- a/frontend/src/components/users/Users.tsx
+++ b/frontend/src/components/users/Users.tsx
@@ -22,7 +22,7 @@ import s from "./users.module.scss";
 
 const Users: Component<{}> = (p) => {
   const { ws } = useAppState();
-  const [users, { refetch }] = createResource(getUsers);
+  const [users, { refetch }] = createResource(() => getUsers());
   onCleanup(ws.subscribe([USER_UPDATE], refetch));
   const [search, setSearch] = createSignal("");
   const filteredUsers = createMemo(() =>