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

Jump to bottom

fix(ui): update relationship cell formatted value when when search changes #6208

Merged
merged 5 commits into from
May 20, 2024
Merged

fix(ui): update relationship cell formatted value when when search changes #6208

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
79346df
fix(ui): update relationship cell formatted value when when search ch…
r1tsuu May 4, 2024
fa4f25e
chore: update relationship cell in list view
JessChowdhury May 7, 2024
1ad8600
chore: use cellData instead of searchParams to refresh relationship i…
JessChowdhury May 7, 2024
e0c6dbe
chore: adds e2e test for relationship field
JessChowdhury May 8, 2024
1b6e029
Merge branch 'beta' into fix/cell-relationship-same-state
JessChowdhury May 14, 2024
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
11 changes: 10 additions & 1 deletion packages/ui/src/elements/Table/DefaultCell/fields/Relationship/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import type { CellComponentProps, DefaultCellComponentProps } from 'payload/type
import { getTranslation } from '@payloadcms/translations'
import { useIntersect } from '@payloadcms/ui/hooks/useIntersect'
import { useConfig } from '@payloadcms/ui/providers/Config'
import { useSearchParams } from '@payloadcms/ui/providers/SearchParams'
import { useTranslation } from '@payloadcms/ui/providers/Translation'
import { canUseDOM } from '@payloadcms/ui/utilities/canUseDOM'
import { formatDocTitle } from '@payloadcms/ui/utilities/formatDocTitle'
Expand Down Expand Up @@ -33,13 +34,14 @@ export const RelationshipCell: React.FC<RelationshipCellProps> = ({
const { documents, getRelationships } = useListRelationships()
const [hasRequested, setHasRequested] = useState(false)
const { i18n, t } = useTranslation()
const { searchParams } = useSearchParams()
const [memoizedSearchParams, setMemoizedSearchParams] = useState(searchParams)
JessChowdhury marked this conversation as resolved.
Show resolved Hide resolved

const isAboveViewport = canUseDOM ? entry?.boundingClientRect?.top < window.innerHeight : false

useEffect(() => {
if (cellData && isAboveViewport && !hasRequested) {
const formattedValues: Value[] = []

const arrayCellData = Array.isArray(cellData) ? cellData : [cellData]
arrayCellData
.slice(0, arrayCellData.length < totalToShow ? arrayCellData.length : totalToShow)
Expand Down Expand Up @@ -71,6 +73,13 @@ export const RelationshipCell: React.FC<RelationshipCellProps> = ({
getRelationships,
])

useEffect(() => {
if (searchParams !== memoizedSearchParams && hasRequested) {
setHasRequested(false)
setMemoizedSearchParams(searchParams)
}
}, [searchParams, hasRequested, memoizedSearchParams])

return (
<div className={baseClass} ref={intersectionRef}>
{values.map(({ relationTo, value }, i) => {
Expand Down
Loading