Skip to content

Commit

Permalink
fix: Fix merge conflict on depositions page (#959)
Browse files Browse the repository at this point in the history
  • Loading branch information
bchu1 authored Jul 29, 2024
1 parent 92a8549 commit 655dd44
Showing 1 changed file with 10 additions and 7 deletions.
17 changes: 10 additions & 7 deletions frontend/packages/data-portal/app/routes/depositions.$id.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,17 @@ export default function DatasetByIdPage() {

return (
<TablePageLayout
title={t('depositionData')}
type={t('datasets')}
filteredCount={
deposition.filtered_datasets_aggregate.aggregate?.count ?? 0
}
header={<DepositionHeader />}
table={<DatasetsTable />}
totalCount={deposition.datasets_aggregate.aggregate?.count ?? 0}
tabs={[
{
title: t('depositionData'),
table: <DatasetsTable />,
totalCount: deposition.datasets_aggregate.aggregate?.count ?? 0,
filteredCount:
deposition.filtered_datasets_aggregate.aggregate?.count ?? 0,
countLabel: t('datasets'),
},
]}
/>
)
}

0 comments on commit 655dd44

Please sign in to comment.