From 90b58518bb6f506a76ca4d63e1e1391be1cec129 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tha=C3=AFs?= Date: Thu, 8 Feb 2024 14:46:35 -0300 Subject: [PATCH] =?UTF-8?q?feat:=20change=20RecordShowPage=20Relation=20Ca?= =?UTF-8?q?rd=20field=20display=20for=20TO=5FONE=5FOB=E2=80=A6=20(#3596)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit feat: change RecordShowPage Relation Card field display for TO_ONE_OBJECT relation fields Closes #3409 Co-authored-by: Charles Bochet --- .../RecordRelationFieldCardSection.tsx | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/packages/twenty-front/src/modules/object-record/record-relation-card/components/RecordRelationFieldCardSection.tsx b/packages/twenty-front/src/modules/object-record/record-relation-card/components/RecordRelationFieldCardSection.tsx index d19315ab4..ec49fc348 100644 --- a/packages/twenty-front/src/modules/object-record/record-relation-card/components/RecordRelationFieldCardSection.tsx +++ b/packages/twenty-front/src/modules/object-record/record-relation-card/components/RecordRelationFieldCardSection.tsx @@ -6,7 +6,6 @@ import qs from 'qs'; import { useRecoilValue } from 'recoil'; import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem'; -import { parseFieldRelationType } from '@/object-metadata/utils/parseFieldRelationType'; import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord'; import { FieldContext } from '@/object-record/record-field/contexts/FieldContext'; import { usePersistField } from '@/object-record/record-field/hooks/usePersistField'; @@ -19,7 +18,7 @@ import { useRelationPicker } from '@/object-record/relation-picker/hooks/useRela import { RelationPickerScope } from '@/object-record/relation-picker/scopes/RelationPickerScope'; import { EntityForSelect } from '@/object-record/relation-picker/types/EntityForSelect'; import { ObjectRecord } from '@/object-record/types/ObjectRecord'; -import { IconForbid, IconPlus } from '@/ui/display/icon'; +import { IconForbid, IconPencil, IconPlus } from '@/ui/display/icon'; import { useIcons } from '@/ui/display/icon/hooks/useIcons'; import { LightIconButton } from '@/ui/input/button/components/LightIconButton'; import { Card } from '@/ui/layout/card/components/Card'; @@ -121,6 +120,7 @@ export const RecordRelationFieldCardSection = () => { >(recordStoreFamilySelector({ recordId: entityId, fieldName })); const isToOneObject = relationType === 'TO_ONE_OBJECT'; + const isFromManyObjects = relationType === 'FROM_MANY_OBJECTS'; const relationRecords: ObjectRecord[] = fieldValue && isToOneObject @@ -184,13 +184,11 @@ export const RecordRelationFieldCardSection = () => { {fieldDefinition.label} - {parseFieldRelationType(relationFieldMetadataItem) === - 'TO_ONE_OBJECT' && - relationRecords.length > 0 && ( - - All ({relationRecords.length}) - - )} + {isFromManyObjects && ( + + All ({relationRecords.length}) + + )} { clickableComponent={ }