From 4c8c54877067562319dd3737e87f8d6c2377b095 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Tue, 30 Jun 2026 10:10:19 +0000
Subject: [PATCH] Fix transition

---
 .../previews/GlobalPreviewDrawer.tsx          |  5 ---
 .../src/components/previews/PreviewDrawer.tsx | 40 +++++++++++++------
 .../src/states/PreviewDrawerState.tsx         |  7 +---
 3 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/src/frontend/src/components/previews/GlobalPreviewDrawer.tsx b/src/frontend/src/components/previews/GlobalPreviewDrawer.tsx
index d398f404ea..43b768d470 100644
--- a/src/frontend/src/components/previews/GlobalPreviewDrawer.tsx
+++ b/src/frontend/src/components/previews/GlobalPreviewDrawer.tsx
@@ -8,11 +8,6 @@ export default function GlobalPreviewDrawer() {
   const instance = usePreviewDrawerState((state) => state.instance);
   const closePreview = usePreviewDrawerState((state) => state.closePreview);
 
-  // Only skip rendering before the drawer has ever been opened
-  if (modelType === undefined || id === undefined) {
-    return null;
-  }
-
   return (
     <PreviewDrawer
       modelType={modelType}
diff --git a/src/frontend/src/components/previews/PreviewDrawer.tsx b/src/frontend/src/components/previews/PreviewDrawer.tsx
index dc3173c719..8848b4d250 100644
--- a/src/frontend/src/components/previews/PreviewDrawer.tsx
+++ b/src/frontend/src/components/previews/PreviewDrawer.tsx
@@ -17,32 +17,38 @@ export default function PreviewDrawer({
   opened,
   onClose
 }: Readonly<{
-  modelType: ModelType;
-  id: number;
+  modelType?: ModelType;
+  id?: number | string;
   instance?: any;
   filters?: Record<string, any>;
   opened: boolean;
   onClose: () => void;
 }>) {
-  const modelInfo = getModelInfo(modelType);
-  const apiEndpoint = ModelInformationDict[modelType].api_endpoint;
+  const modelInfo = modelType ? getModelInfo(modelType) : null;
+  const apiEndpoint = modelType
+    ? ModelInformationDict[modelType].api_endpoint
+    : undefined;
 
   const { instance: fetchedInstance, instanceQuery } = useInstance({
-    endpoint: apiEndpoint,
+    endpoint: apiEndpoint!,
     pk: id,
     hasPrimaryKey: true,
     defaultValue: {},
     params: filters,
-    disabled: !!providedInstance
+    disabled: !!providedInstance || !modelType || !id
   });
 
   const instance = useMemo(() => {
     return providedInstance ?? fetchedInstance;
   }, [providedInstance, fetchedInstance]);
 
-  const previewComponent: PreviewType = useMemo(() => {
+  const previewComponent: PreviewType | null = useMemo(() => {
+    if (!modelType || !modelInfo || id == null) return null;
+
     const component: PreviewType | null = getPreviewComponentForModel({
-      modelType
+      modelType,
+      instance,
+      modelId: typeof id === 'string' ? Number(id) : id
     });
 
     if (component == null) {
@@ -55,13 +61,17 @@ export default function PreviewDrawer({
     }
 
     return component;
-  }, [modelType]);
+  }, [modelType, id, instance]);
 
   return (
     <Drawer
       position='right'
       size='xl'
-      title={<StylishText size='lg'>{previewComponent.title}</StylishText>}
+      title={
+        previewComponent ? (
+          <StylishText size='lg'>{previewComponent.title}</StylishText>
+        ) : null
+      }
       opened={opened}
       onClose={onClose}
       withCloseButton
@@ -72,9 +82,13 @@ export default function PreviewDrawer({
       }}
     >
       <Stack gap='xs'>
-        <Divider />
-        <LoadingOverlay visible={instanceQuery.isFetching} />
-        {previewComponent.preview}
+        {previewComponent && (
+          <>
+            <Divider />
+            <LoadingOverlay visible={instanceQuery.isFetching} />
+            {previewComponent.preview}
+          </>
+        )}
       </Stack>
     </Drawer>
   );
diff --git a/src/frontend/src/states/PreviewDrawerState.tsx b/src/frontend/src/states/PreviewDrawerState.tsx
index 479e7644e3..9e2c82bb54 100644
--- a/src/frontend/src/states/PreviewDrawerState.tsx
+++ b/src/frontend/src/states/PreviewDrawerState.tsx
@@ -30,12 +30,7 @@ export const usePreviewDrawerState = create<PreviewDrawerStateProps>()(
     },
 
     closePreview: () => {
-      set({
-        isOpen: false,
-        modelType: undefined,
-        id: undefined,
-        instance: undefined
-      });
+      set({ isOpen: false });
     }
   })
 );