Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Fix hydration errors throughout app #1507

Merged
merged 4 commits into from
Jan 24, 2025
Merged

fix: Fix hydration errors throughout app #1507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c696b25
bchu1 Jan 23, 2025
514b33e
all of them
bchu1 Jan 23, 2025
9930d73
bchu1 Jan 23, 2025
e368bbe
lit
bchu1 Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions frontend/packages/data-portal/app/components/AnnotatedObjectsList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import Paper from '@mui/material/Paper'
import Skeleton from '@mui/material/Skeleton'
import { range } from 'lodash-es'
import { ReactNode } from 'react'
Expand Down Expand Up @@ -65,11 +64,7 @@ export function AnnotatedObjectsList({
<Tooltip
classes={{ tooltip: '!p-0 !bg-transparent' }}
placement="left"
tooltip={
<Paper className="p-sds-m text-black w-[250px]" elevation={4}>
<List className="font-semibold">{nodes}</List>
</Paper>
}
tooltip={<List className="font-semibold">{nodes}</List>}
>
<div
className={cns(
Expand Down
15 changes: 8 additions & 7 deletions frontend/packages/data-portal/app/components/BrowseData/DatasetTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ export function DatasetTable() {
try {
return [
columnHelper.accessor('key_photo_thumbnail_url', {
header: () => <p />,
// eslint-disable-next-line jsx-a11y/control-has-associated-label
header: () => <td />,

cell({ row: { original: dataset } }) {
const datasetUrl = getDatasetUrl(dataset.id)
Expand Down Expand Up @@ -143,7 +144,7 @@ export function DatasetTable() {
width={DatasetTableWidths.id}
>
<div className="flex flex-col flex-auto gap-sds-xxxs min-h-[100px]">
<p
<div
className={cnsNoMerge(
'text-sds-body-m leading-sds-body-m font-semibold text-sds-color-primitive-blue-400',
!isClickingOnEmpiarId &&
Expand All @@ -155,17 +156,17 @@ export function DatasetTable() {
) : (
<TableLink to={datasetUrl}>{dataset.title}</TableLink>
)}
</p>
</div>

<p className="text-sds-body-xxs leading-sds-body-xxs text-sds-color-semantic-text-base-primary">
<div className="text-sds-body-xxs leading-sds-body-xxs text-sds-color-semantic-text-base-primary">
{isLoadingDebounced ? (
<Skeleton className="max-w-[120px]" variant="text" />
) : (
`${t('datasetId')}: ${IdPrefix.Dataset}-${dataset.id}`
)}
</p>
</div>

<p className="text-sds-body-xxs leading-sds-body-xxs text-sds-color-primitive-gray-500 mt-sds-s">
<div className="text-sds-body-xxs leading-sds-body-xxs text-sds-color-primitive-gray-500 mt-sds-s">
{isLoadingDebounced ? (
<>
<Skeleton className="max-w-[80%] mt-2" variant="text" />
Expand All @@ -178,7 +179,7 @@ export function DatasetTable() {
) : (
<AuthorList authors={dataset.authors} compact />
)}
</p>
</div>
</div>
</TableCell>
)
Expand Down
4 changes: 2 additions & 2 deletions frontend/packages/data-portal/app/components/BrowseData/DepositionTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ export function DepositionTable() {
try {
return [
columnHelper.accessor('keyPhotoThumbnailUrl', {
header: () => <p />,

// eslint-disable-next-line jsx-a11y/control-has-associated-label
header: () => <td />,
cell({ row: { original: deposition } }) {
const depositionUrl = `/depositions/${deposition.id}`

Expand Down
3 changes: 2 additions & 1 deletion frontend/packages/data-portal/app/components/Dataset/RunsTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ export function RunsTable() {
(run) => run.tomograms.edges[0]?.node.keyPhotoThumbnailUrl ?? undefined,
{
id: 'key-photo',
header: () => <p />,
// eslint-disable-next-line jsx-a11y/control-has-associated-label
header: () => <td />,
cell: ({ getValue, row: { original: run } }) => (
<TableCell
width={RunTableWidths.photo}
Expand Down
11 changes: 6 additions & 5 deletions frontend/packages/data-portal/app/components/Deposition/DatasetsTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ export function DatasetsTable() {
try {
return [
columnHelper.accessor('key_photo_thumbnail_url', {
header: () => <p />,
// eslint-disable-next-line jsx-a11y/control-has-associated-label
header: () => <td />,

cell({ row: { original: dataset } }) {
const datasetUrl = getDatasetUrl(dataset.id)
Expand Down Expand Up @@ -140,7 +141,7 @@ export function DatasetsTable() {
width={DepositionPageDatasetTableWidths.id}
>
<div className="flex flex-col flex-auto gap-sds-xxxs min-h-[100px]">
<p
<div
className={cnsNoMerge(
'text-sds-body-m leading-sds-body-m font-semibold text-sds-color-primitive-blue-400',
'group-hover:text-sds-color-primitive-blue-500',
Expand All @@ -151,7 +152,7 @@ export function DatasetsTable() {
) : (
<TableLink to={datasetUrl}>{dataset.title}</TableLink>
)}
</p>
</div>

<p className="text-sds-body-xxs leading-sds-body-xxs text-sds-color-semantic-text-base-primary">
{isLoadingDebounced ? (
Expand All @@ -161,7 +162,7 @@ export function DatasetsTable() {
)}
</p>

<p className="text-sds-body-xxs leading-sds-body-xxs text-sds-color-primitive-gray-500 mt-sds-s">
<div className="text-sds-body-xxs leading-sds-body-xxs text-sds-color-primitive-gray-500 mt-sds-s">
{isLoadingDebounced ? (
<>
<Skeleton className="max-w-[80%] mt-2" variant="text" />
Expand All @@ -174,7 +175,7 @@ export function DatasetsTable() {
) : (
<AuthorList authors={dataset.authors} compact />
)}
</p>
</div>
</div>
</TableCell>
)
Expand Down
4 changes: 2 additions & 2 deletions frontend/packages/data-portal/app/components/Deposition/MethodLinks/MethodLinksOverview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function MethodTypeSection({
<h3 className="text-sds-caps-xxxs leading-sds-caps-xxxs font-semibold uppercase">
{t('methodType')}
</h3>
<p className="flex flex-row gap-sds-xxs text-sds-body-xxs leading-sds-body-xxs col-start-1">
<div className="flex flex-row gap-sds-xxs text-sds-body-xxs leading-sds-body-xxs col-start-1">
{t(methodLabels[methodType])}
<Tooltip
// FIXME: make arrow centred on icon
Expand All @@ -50,7 +50,7 @@ function MethodTypeSection({
className="!text-sds-color-primitive-gray-500"
/>
</Tooltip>
</p>
</div>
<h3 className="text-sds-caps-xxxs leading-sds-caps-xxxs font-semibold uppercase col-start-2 row-start-1">
{t('methodLinks')}
</h3>
Expand Down
4 changes: 2 additions & 2 deletions frontend/packages/data-portal/app/components/Table/CellHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export function CellHeader({
!tooltip ? 'hover:!text-sds-color-semantic-text-base-secondary' : ''
}
>
<p className="line-clamp-1">
<div className="line-clamp-1">
<Tooltip
className="inline"
tooltip={tooltip}
Expand All @@ -63,7 +63,7 @@ export function CellHeader({
>
{children}
</Tooltip>
</p>
</div>

{subHeader && (
<p className="text-sds-body-xxxs leading-sds-body-xxxs font-normal">
Expand Down
4 changes: 2 additions & 2 deletions frontend/packages/data-portal/app/components/Table/TableCell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export function TableCell({
className={cns('align-top px-3 py-4', cellProps.className)}
style={cellProps.style}
>
<p className="text-sds-body-s leading-sds-body-s font-normal">
<div className="text-sds-body-s leading-sds-body-s font-normal">
<Tooltip
className="inline"
tooltip={primaryText}
Expand All @@ -67,7 +67,7 @@ export function TableCell({
>
{primaryText}
</Tooltip>
</p>
</div>
</td>
)
}
Expand Down
Loading