+
+ {/* back button */}
+ {previousUrl && (
+
+
+
+
+ Back to Results
+
+
+
+ )}
+
+ {/* dataset title */}
+
+ {dataset.title}
+
+ {/* portal ID */}
+
+
+ {i18n.portalIdBlank}
+
+
{dataset.id}
+
+
-
-
{i18n.releaseDate(dataset.release_date)}
-
-
- {i18n.lastModified(
- dataset.last_modified_date ?? dataset.deposition_date,
+ {/* dates */}
+
+ >
+
{i18n.releaseDate(dataset.release_date)}
+
+
+ {i18n.lastModified(
+ dataset.last_modified_date ?? dataset.deposition_date,
+ )}
+
+
+
+ {/* actions */}
+
+
+ }
+ sdsType="primary"
+ sdsStyle="rounded"
+ >
+ Download Dataset
+
+
+ }
+ sdsType="secondary"
+ sdsStyle="rounded"
+ onClick={drawer.toggle}
+ >
+ More Info
+
+
+
+
+
+ {/* add key photo here */}
diff --git a/frontend/packages/data-portal/app/components/Dataset/DatasetMetadataDrawer.tsx b/frontend/packages/data-portal/app/components/Dataset/DatasetMetadataDrawer.tsx
index 8d64592a6..8b6ab5300 100644
--- a/frontend/packages/data-portal/app/components/Dataset/DatasetMetadataDrawer.tsx
+++ b/frontend/packages/data-portal/app/components/Dataset/DatasetMetadataDrawer.tsx
@@ -34,7 +34,7 @@ const ACTIVE_TAB_PARAM = 'tab'
export function DatasetMetadataDrawer() {
const drawer = useDatasetDrawer()
- const dataset = useDatasetById()
+ const { dataset } = useDatasetById()
const [searchParams, setSearchParams] = useSearchParams()
const activeTab = (searchParams.get(ACTIVE_TAB_PARAM) ??
diff --git a/frontend/packages/data-portal/app/components/Dataset/DatasetMetadataTable.tsx b/frontend/packages/data-portal/app/components/Dataset/DatasetMetadataTable.tsx
index 4dd9e1851..bf82b1217 100644
--- a/frontend/packages/data-portal/app/components/Dataset/DatasetMetadataTable.tsx
+++ b/frontend/packages/data-portal/app/components/Dataset/DatasetMetadataTable.tsx
@@ -5,7 +5,7 @@ import { AccordionMetadataTable } from './AccordionMetadataTable'
import { getTableData } from './utils'
export function DatasetMetadataTable() {
- const dataset = useDatasetById()
+ const { dataset } = useDatasetById()
const datasetMetadata = getTableData(
{
label: i18n.depositionDate,
@@ -13,7 +13,7 @@ export function DatasetMetadataTable() {
},
{
label: i18n.affiliationName,
- values: dataset.authors
+ values: dataset.authors_with_affiliation
.map((author) => author.affiliation_name)
.filter((value): value is string => !!value),
},
diff --git a/frontend/packages/data-portal/app/components/Dataset/SampleAndExperimentConditionsTable.tsx b/frontend/packages/data-portal/app/components/Dataset/SampleAndExperimentConditionsTable.tsx
index cfe723a8f..9e30a0a13 100644
--- a/frontend/packages/data-portal/app/components/Dataset/SampleAndExperimentConditionsTable.tsx
+++ b/frontend/packages/data-portal/app/components/Dataset/SampleAndExperimentConditionsTable.tsx
@@ -5,7 +5,7 @@ import { AccordionMetadataTable } from './AccordionMetadataTable'
import { getTableData } from './utils'
export function SampleAndExperimentConditionsTable() {
- const dataset = useDatasetById()
+ const { dataset } = useDatasetById()
const sampleAndExperimentConditions = getTableData(
{
diff --git a/frontend/packages/data-portal/app/components/Dataset/TiltSeriesTable.tsx b/frontend/packages/data-portal/app/components/Dataset/TiltSeriesTable.tsx
index 8756bebf0..5cdffeece 100644
--- a/frontend/packages/data-portal/app/components/Dataset/TiltSeriesTable.tsx
+++ b/frontend/packages/data-portal/app/components/Dataset/TiltSeriesTable.tsx
@@ -5,7 +5,7 @@ import { AccordionMetadataTable } from './AccordionMetadataTable'
import { getTableData } from './utils'
export function TiltSeriesTable() {
- const dataset = useDatasetById()
+ const { dataset } = useDatasetById()
const tiltSeriesData = dataset.runs[0]?.tiltseries[0]
const tiltSeries = tiltSeriesData
diff --git a/frontend/packages/data-portal/app/components/Layout/TopNavigation.tsx b/frontend/packages/data-portal/app/components/Layout/TopNavigation.tsx
index d59768222..485e6fcdd 100644
--- a/frontend/packages/data-portal/app/components/Layout/TopNavigation.tsx
+++ b/frontend/packages/data-portal/app/components/Layout/TopNavigation.tsx
@@ -15,7 +15,7 @@ export function TopNavigation() {