Requested changes

This commit is contained in:
Daniel Hougaard
2024-06-21 18:17:16 +02:00
parent c735beea32
commit 7ab5c02000
3 changed files with 8 additions and 26 deletions

View File

@@ -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

View File

@@ -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;

View File

@@ -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}