From dcb4a4e9e7272d54ece6f7c4bf448d450e77b945 Mon Sep 17 00:00:00 2001
From: diced <pranaco2@gmail.com>
Date: Mon, 16 Dec 2024 15:54:19 -0800
Subject: [PATCH] fix: types for export3

---
 .../parts/SettingsServerUtil/ImportButton/Export3Details.tsx  | 2 +-
 src/lib/import/version3/find.ts                               | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/pages/settings/parts/SettingsServerUtil/ImportButton/Export3Details.tsx b/src/components/pages/settings/parts/SettingsServerUtil/ImportButton/Export3Details.tsx
index 9a22a69b..903d4035 100644
--- 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
index c7b5bd07..120d5c2f 100644
--- 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];
 }