diff --git a/frontend/packages/data-portal/app/components/BrowseData/DatasetTable.tsx b/frontend/packages/data-portal/app/components/BrowseData/DatasetTable.tsx index 0b24a8097..dfa60fe7c 100644 --- a/frontend/packages/data-portal/app/components/BrowseData/DatasetTable.tsx +++ b/frontend/packages/data-portal/app/components/BrowseData/DatasetTable.tsx @@ -183,16 +183,19 @@ export function DatasetTable() { ), }), - columnHelper.accessor('runs_aggregate.aggregate.count', { - header: i18n.runs, - cell: ({ getValue }) => ( - - ), - }), + columnHelper.accessor( + (dataset) => dataset.runs_aggregate.aggregate?.count, + { + header: i18n.runs, + cell: ({ getValue }) => ( + + ), + }, + ), columnHelper.display({ id: 'annotated-objects', diff --git a/frontend/packages/data-portal/app/components/Dataset/DatasetHeader.tsx b/frontend/packages/data-portal/app/components/Dataset/DatasetHeader.tsx index 3e22e7c80..037bcf55b 100644 --- a/frontend/packages/data-portal/app/components/Dataset/DatasetHeader.tsx +++ b/frontend/packages/data-portal/app/components/Dataset/DatasetHeader.tsx @@ -15,99 +15,111 @@ export function DatasetHeader() { const drawer = useDatasetDrawer() return ( -
-
-
- {/* back button */} - {previousUrl && ( -
- - - - Back to Results - - +
+
+
+
+ {/* back button */} + {previousUrl && ( +
+ + + + Back to Results + + +
+ )} +
+ {/* dataset title */} +

+ {dataset.title} +

+ {/* portal ID */} +
+

+ {i18n.portalIdBlank} +

+

+ {dataset.id} +

+
- )} -
- {/* dataset title */} -

- {dataset.title} -

- {/* portal ID */} -
-

- {i18n.portalIdBlank} +

{i18n.releaseDate(dataset.release_date)}

+
+

+ {i18n.lastModified( + dataset.last_modified_date ?? dataset.deposition_date, + )}

-

{dataset.id}

-
- {/* dates */} -
-

{i18n.releaseDate(dataset.release_date)}

-
-

- {i18n.lastModified( - dataset.last_modified_date ?? dataset.deposition_date, - )} -

+ {/* actions */} +
+ + +
- - {/* actions */} -
- - +
+ + {/* add key photo here */}
-
- - {/* add key photo here */} -
-
-
+
+ ) } diff --git a/frontend/packages/data-portal/app/components/Dataset/RunsTable.tsx b/frontend/packages/data-portal/app/components/Dataset/RunsTable.tsx index faffe059b..595acfd4c 100644 --- a/frontend/packages/data-portal/app/components/Dataset/RunsTable.tsx +++ b/frontend/packages/data-portal/app/components/Dataset/RunsTable.tsx @@ -61,7 +61,7 @@ export function RunsTable() { }), columnHelper.accessor( - (run) => run.tiltseries_aggregate.aggregate?.avg?.tilt_series_quality, + (run) => run.tiltseries_aggregate?.aggregate?.avg?.tilt_series_quality, { header: i18n.tiltSeriesQualityScore, cell: ({ getValue }) => { diff --git a/frontend/packages/data-portal/app/components/FilterPanel.tsx b/frontend/packages/data-portal/app/components/FilterPanel.tsx index 556956afb..874698452 100644 --- a/frontend/packages/data-portal/app/components/FilterPanel.tsx +++ b/frontend/packages/data-portal/app/components/FilterPanel.tsx @@ -6,7 +6,7 @@ export function FilterPanel() { className={cns( 'flex flex-col flex-shrink-0', 'w-[200px] items-center justify-center', - 'border-r border-sds-gray-300', + 'border-t border-r border-sds-gray-300', )} >

Filters

diff --git a/frontend/packages/data-portal/app/routes/datasets.$id.tsx b/frontend/packages/data-portal/app/routes/datasets.$id.tsx index 16d48113c..8e8848ae9 100644 --- a/frontend/packages/data-portal/app/routes/datasets.$id.tsx +++ b/frontend/packages/data-portal/app/routes/datasets.$id.tsx @@ -14,6 +14,7 @@ import { FilterPanel } from 'app/components/FilterPanel' import { MAX_PER_PAGE } from 'app/constants/pagination' import { useDatasetById } from 'app/hooks/useDatasetById' import { useCloseDatasetDrawerOnUnmount } from 'app/state/drawer' +import { cns } from 'app/utils/cns' const GET_DATASET_BY_ID = gql(` query GetDatasetById($id: Int, $run_limit: Int, $run_offset: Int) { @@ -148,34 +149,44 @@ export default function DatasetByIdPage() { } return ( - <> -
- - -
- - -
-
- - - -
- setPage(page + 1)} - onPreviousPage={() => setPage(page - 1)} - onPageChange={(nextPage) => setPage(nextPage)} - /> -
+
+ + +
+ + +
+
+ + + +
+ setPage(page + 1)} + onPreviousPage={() => setPage(page - 1)} + onPageChange={(nextPage) => setPage(nextPage)} + />
- - +
) } diff --git a/frontend/packages/data-portal/tailwind.config.ts b/frontend/packages/data-portal/tailwind.config.ts index 13515fb4c..23e6e18db 100644 --- a/frontend/packages/data-portal/tailwind.config.ts +++ b/frontend/packages/data-portal/tailwind.config.ts @@ -8,6 +8,10 @@ export default { extend: { ...sds, + screens: { + 'screen-2040': '2040px', + }, + maxWidth: { content: '1600px', },