From 7ab5c020001920f2b55fa7f5eb8bd5e976b464c1 Mon Sep 17 00:00:00 2001
From: Daniel Hougaard <62331820+DanielHougaard@users.noreply.github.com>
Date: Fri, 21 Jun 2024 18:17:16 +0200
Subject: [PATCH] Requested changes

---
 backend/src/lib/fn/object.ts                     | 16 ----------------
 .../src/services/super-admin/super-admin-dal.ts  |  8 +++-----
 .../views/admin/DashboardPage/DashboardPage.tsx  | 10 +++++-----
 3 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/backend/src/lib/fn/object.ts b/backend/src/lib/fn/object.ts
index 8e9ede8db..87db80343 100644
--- a/backend/src/lib/fn/object.ts
+++ b/backend/src/lib/fn/object.ts
@@ -13,22 +13,6 @@ export const pick = <T extends object, TKeys extends keyof T>(obj: T, keys: TKey
   );
 };
 
-/**
- * Omit a list of properties from an object
- * into a new object
- */
-export const omit = <T extends object, TKeys extends keyof T>(obj: T, keys: TKeys[]): Omit<T, TKeys> => {
-  if (!obj) return {} as Omit<T, TKeys>;
-  return (Object.keys(obj) as TKeys[]).reduce(
-    (acc, key) => {
-      if (!keys.includes(key)) {
-        (acc as T)[key] = obj[key];
-      }
-      return acc;
-    },
-    {} as Omit<T, TKeys>
-  );
-};
 /**
  * Removes (shakes out) undefined entries from an
  * object. Optional second argument shakes out values
diff --git a/backend/src/services/super-admin/super-admin-dal.ts b/backend/src/services/super-admin/super-admin-dal.ts
index eae42cbe1..f95040aec 100644
--- a/backend/src/services/super-admin/super-admin-dal.ts
+++ b/backend/src/services/super-admin/super-admin-dal.ts
@@ -26,11 +26,9 @@ export const superAdminDALFactory = (db: TDbClient) => {
   };
 
   const updateById = async (id: string, data: TSuperAdminUpdate, tx?: Knex) => {
-    const updatedConfig = await superAdminOrm.transaction(async (trx) => {
-      await superAdminOrm.updateById(id, data, tx || trx);
-      const config = await findById(id, tx || trx);
-
-      return config;
+    const updatedConfig = await (superAdminOrm || tx).transaction(async (trx: Knex) => {
+      await superAdminOrm.updateById(id, data, trx);
+      return findById(id, trx);
     });
 
     return updatedConfig;
diff --git a/frontend/src/views/admin/DashboardPage/DashboardPage.tsx b/frontend/src/views/admin/DashboardPage/DashboardPage.tsx
index 1c6ba8b8c..6b20b2084 100644
--- a/frontend/src/views/admin/DashboardPage/DashboardPage.tsx
+++ b/frontend/src/views/admin/DashboardPage/DashboardPage.tsx
@@ -226,15 +226,15 @@ export const AdminDashboardPage = () => {
                           dropdownContainerClassName="bg-mineshaft-800"
                           defaultValue={field.value ?? " "}
                           onValueChange={(e) => {
-                            if (e === " ") {
-                              onChange(null);
-                            } else {
-                              onChange(e);
+                            if (e === "EMPTY") {
+                              onChange("");
+                              return;
                             }
+                            onChange(e);
                           }}
                           {...field}
                         >
-                          <SelectItem value=" ">Select organization...</SelectItem>
+                          <SelectItem value="EMPTY">Select organization...</SelectItem>
                           {organizations.data?.map((org) => (
                             <SelectItem key={org.id} value={org.id}>
                               {org.name}