From f6ef7a76c8a2ad87c74ede2466ef15219443d18b Mon Sep 17 00:00:00 2001
From: Kamil Kisiela <kamil.kisiela@gmail.com>
Date: Tue, 24 May 2022 18:14:01 +0200
Subject: [PATCH] Version ID was missing in diff view (#70)

---
 .../pages/[orgId]/[projectId]/[targetId]/history.tsx   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/web/app/pages/[orgId]/[projectId]/[targetId]/history.tsx b/packages/web/app/pages/[orgId]/[projectId]/[targetId]/history.tsx
index 0776926c3..4f0dbef2d 100644
--- a/packages/web/app/pages/[orgId]/[projectId]/[targetId]/history.tsx
+++ b/packages/web/app/pages/[orgId]/[projectId]/[targetId]/history.tsx
@@ -73,7 +73,7 @@ const ChangesBlock: React.FC<{
   );
 };
 
-const DiffView = ({ view }: { view: 'sdl' | 'list' }): ReactElement => {
+const DiffView = ({ view, version }: { view: 'sdl' | 'list'; version: string }): ReactElement => {
   const router = useRouteSelector();
   const [compareQuery] = useQuery({
     query: CompareDocument,
@@ -81,7 +81,7 @@ const DiffView = ({ view }: { view: 'sdl' | 'list' }): ReactElement => {
       organization: router.organizationId,
       project: router.projectId,
       target: router.targetId,
-      version: router.versionId,
+      version,
     },
   });
   const comparison = compareQuery.data?.schemaCompareToPrevious;
@@ -147,12 +147,14 @@ const Page = ({ data, setAfter }: { data: VersionsQuery; setAfter(after: string)
 
   const baseUrl = `/${router.organizationId}/${router.projectId}/${router.targetId}`;
 
+  const currentVersion = router.versionId ?? schemas[0].id;
+
   const renderVersion = (version: SchemaVersionFieldsFragment) => (
     <NextLink key={version.id} href={`${baseUrl}/history/${version.id}`} passHref>
       <a
         className={clsx(
           'flex flex-col rounded-md p-2.5 hover:bg-gray-800/40',
-          router.versionId && router.versionId === version.id && 'bg-gray-800/40'
+          currentVersion === version.id && 'bg-gray-800/40'
         )}
       >
         <h3 className="truncate font-bold">{version.commit.commit}</h3>
@@ -224,7 +226,7 @@ const Page = ({ data, setAfter }: { data: VersionsQuery; setAfter(after: string)
               </ToggleGroup>
             </div>
             <div className="flex h-[65vh] grow overflow-hidden rounded-md border border-gray-800/50">
-              <DiffView view={view} />
+              <DiffView version={currentVersion} view={view} />
             </div>
           </div>
         </>