fix: types for export3

diced · Dec 16, 2024 · dcb4a4e · dcb4a4e
1 parent 4d472a1
commit dcb4a4e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/components/pages/settings/parts/SettingsServerUtil/ImportButton/Export3Details.tsx b/src/components/pages/settings/parts/SettingsServerUtil/ImportButton/Export3Details.tsx
@@ -71,7 +71,7 @@ export default function Export3Details({ export3 }: { export3: Export3 }) {
   const folderRows = Object.entries(export3.folders).map(([id, folder]) => (
     <Table.Tr key={id}>
       <Table.Td>{folder.name}</Table.Td>
-      <Table.Td>{findUser(export3, folder.user)?.username ?? 'unknown'}</Table.Td>
+      <Table.Td>{findUser(export3, folder?.user)?.username ?? 'unknown'}</Table.Td>
       <Table.Td>{folder.public ? <IconCheck size='1rem' /> : <IconX size='1rem' />}</Table.Td>
       <Table.Td>{new Date(folder.created_at).toLocaleString()}</Table.Td>
       <Table.Td>{findFilesByUser(export3, id).length}</Table.Td>

diff --git a/src/lib/import/version3/find.ts b/src/lib/import/version3/find.ts
@@ -1,6 +1,8 @@
 import { Export3 } from './validateExport';
 
-export function findUser(export3: Export3, id: string) {
+export function findUser(export3: Export3, id: string | undefined | null) {
+  if (!id) return null;
+
   return export3.users[id];
 }