No commit message

chanzuckerberg · Jan 17, 2025 · 22f3340 · 22f3340
1 parent 53190ef
commit 22f3340
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/frontend/packages/data-portal/app/components/Download/ConfigureTomogramDownloadContent.tsx b/frontend/packages/data-portal/app/components/Download/ConfigureTomogramDownloadContent.tsx
@@ -29,7 +29,7 @@ export function ConfigureTomogramDownloadContent() {
 
   const {
     tomogramToDownload,
-    allAnnotationFiles = [],
+    allAnnotationShapes = [],
     allTomograms = [],
     runId,
   } = useDownloadModalContext()
@@ -84,7 +84,7 @@ export function ConfigureTomogramDownloadContent() {
         <Radio
           value={DownloadConfig.AllAnnotations}
           label={t('downloadAllAnnotations')}
-          disabled={allAnnotationFiles.length === 0}
+          disabled={allAnnotationShapes.length === 0}
           disabledTooltip={t('noAnnotationsAvailableToDownload')}
           description={t('downloadAvailableAnnotationsInSupported')}
           onClick={setAllAnnotationsConfig}

diff --git a/frontend/packages/data-portal/app/components/Download/DownloadOptionsContent.tsx b/frontend/packages/data-portal/app/components/Download/DownloadOptionsContent.tsx
@@ -124,7 +124,7 @@ export function DownloadOptionsContent() {
       {annotationShapeToDownload && (
         <ModalSubtitle
           label={t('alignmentId')}
-          value={`${IdPrefix.Alignment}-${annotationShapeToDownload.id}`}
+          value={`${IdPrefix.Alignment}-${annotationShapeToDownload.id}`} Wait for Kira's PR cuz of merge conflicts
         />
       )}
       {fileFormat && (

diff --git a/frontend/packages/data-portal/app/context/DownloadModal.context.ts b/frontend/packages/data-portal/app/context/DownloadModal.context.ts
@@ -1,6 +1,5 @@
 import { createContext, useContext } from 'react'
 
-import { GetRunByIdQuery } from 'app/__generated__/graphql'
 import { AnnotationShape, TomogramV2 } from 'app/types/gqlResponseTypes'
 
 export type DownloadModalType = 'dataset' | 'runs' | 'annotation'
@@ -9,7 +8,7 @@ export interface DownloadModalContextValue {
   annotationShapeToDownload?: AnnotationShape
   tomogramToDownload?: TomogramV2
 
-  allAnnotationFiles?: GetRunByIdQuery['annotation_files']
+  allAnnotationShapes?: AnnotationShape[]
   allTomograms?: TomogramV2[]
   allTomogramProcessing?: string[]
   datasetId?: number

diff --git a/frontend/packages/data-portal/app/routes/runs.$id.tsx b/frontend/packages/data-portal/app/routes/runs.$id.tsx
@@ -228,14 +228,14 @@ export default function RunByIdPage() {
         <DownloadModal
           annotationShapeToDownload={activeAnnotationShape}
           tomogramToDownload={activeTomogram}
-          allAnnotationFiles={annotationFiles}
+          allAnnotationShapes={annotationShapes}
           allTomograms={tomograms}
           allTomogramProcessing={processingMethods}
           datasetId={run.dataset.id}
           datasetTitle={run.dataset.title}
           fileSize={fileSize}
           httpsPath={httpsPath}
-          objectName={activeAnnotationShape?.object_name}
+          objectName={activeAnnotationShape?.annotation?.objectName}
           runId={run.id}
           runName={run.name}
           s3Path={match({
@@ -259,11 +259,9 @@ export default function RunByIdPage() {
             .with(
               { annotationId },
               () =>
-                activeAnnotationShape?.files.find(
-                  (file) =>
-                    file.format === fileFormat &&
-                    file.shape_type === objectShapeType,
-                )?.s3_path,
+                activeAnnotationShape?.annotationFiles.edges.find(
+                  (file) => file.node.format === fileFormat,
+                )?.node.s3Path,
             )
             .otherwise(() => undefined)}
           tomogramId={activeTomogram?.id ?? undefined}