Skip to content

The open alternative to Salesforce, designed for AI.

Show the real remaining count on relation card widgets (#27813)

Charles Bochetec3b267acf79
diff --git a/packages/twenty-front/src/modules/object-record/graphql/types/RecordGqlOperationFindDuplicatesResults.ts b/packages/twenty-front/src/modules/object-record/graphql/types/RecordGqlOperationFindDuplicatesResults.ts
deleted file mode 100644
index 9989626a04c..00000000000
--- a/packages/twenty-front/src/modules/object-record/graphql/types/RecordGqlOperationFindDuplicatesResults.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { type RecordGqlConnectionEdgesRequired } from '@/object-record/graphql/types/RecordGqlConnectionEdgesRequired';
-
-export type RecordGqlOperationFindDuplicatesResult = {
- [objectNamePlural: string]: RecordGqlConnectionEdgesRequired[];
-};
diff --git a/packages/twenty-front/src/modules/object-record/hooks/__mocks__/useFindDuplicateRecords.ts b/packages/twenty-front/src/modules/object-record/hooks/__mocks__/useFindDuplicateRecords.ts
deleted file mode 100644
index 8e1d0f59584..00000000000
--- a/packages/twenty-front/src/modules/object-record/hooks/__mocks__/useFindDuplicateRecords.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { PERSON_FRAGMENT_WITH_DEPTH_ZERO_RELATIONS } from '@/object-record/hooks/__mocks__/personFragments';
-import { gql } from '@apollo/client';
-import { mockedPersonRecords } from '~/testing/mock-data/generated/data/people/mock-people-data';
-
-const peopleMock = [...mockedPersonRecords];
-
-export const query = gql`
- query FindDuplicatePerson($ids: [UUID!]!) {
- personDuplicates(ids: $ids) {
- edges {
- node {
- ${PERSON_FRAGMENT_WITH_DEPTH_ZERO_RELATIONS}
- }
- cursor
- }
- pageInfo {
- hasNextPage
- startCursor
- endCursor
- }
- }
- }
-`;
-
-export const variables = {
- ids: ['6205681e-7c11-40b4-9e32-f523dbe54590'],
-};
-
-export const responseData = {
- personDuplicates: [
- {
- edges: [
- {
- node: { ...peopleMock[0], updatedAt: '' },
- cursor: 'cursor1',
- },
- {
- node: { ...peopleMock[1], updatedAt: '' },
- cursor: 'cursor2',
- },
- ],
- pageInfo: {
- hasNextPage: false,
- startCursor: 'cursor1',
- endCursor: 'cursor2',
- },
- },
- ],
-};
diff --git a/packages/twenty-front/src/modules/object-record/hooks/__tests__/useFindDuplicateRecords.test.tsx b/packages/twenty-front/src/modules/object-record/hooks/__tests__/useFindDuplicateRecords.test.tsx
deleted file mode 100644
index 2f52cc1783b..00000000000
--- a/packages/twenty-front/src/modules/object-record/hooks/__tests__/useFindDuplicateRecords.test.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import { renderHook, waitFor } from '@testing-library/react';
-
-import { useFindDuplicateRecords } from '@/object-record/hooks/useFindDuplicateRecords';
-
-import { getJestMetadataAndApolloMocksWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksWrapper';
-import {
- query,
- responseData,
- variables,
-} from '@/object-record/hooks/__mocks__/useFindDuplicateRecords';
-
-const mocks = [
- {
- request: {
- query,
- variables,
- },
- result: jest.fn(() => ({
- data: responseData,
- })),
- },
-];
-
-const Wrapper = getJestMetadataAndApolloMocksWrapper({
- apolloMocks: mocks,
-});
-
-describe('useFindDuplicateRecords', () => {
- it('should fetch duplicate records and return the correct data', async () => {
- const objectRecordId = '6205681e-7c11-40b4-9e32-f523dbe54590';
- const objectNameSingular = 'person';
-
- const { result } = renderHook(
- () =>
- useFindDuplicateRecords({
- objectRecordIds: [objectRecordId],
- objectNameSingular,
- }),
- {
- wrapper: Wrapper,
- },
- );
-
- expect(result.current.loading).toBe(true);
-
- await waitFor(() => {
- expect(result.current.loading).toBe(false);
- expect(result.current.results).toBeDefined();
- });
-
- expect(mocks[0].result).toHaveBeenCalled();
- });
-});
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useFindDuplicateRecords.ts b/packages/twenty-front/src/modules/object-record/hooks/useFindDuplicateRecords.ts
deleted file mode 100644
index bd0070d924f..00000000000
--- a/packages/twenty-front/src/modules/object-record/hooks/useFindDuplicateRecords.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import { useQuery } from '@apollo/client/react';
-import { useMemo } from 'react';
-import { isDefined } from 'twenty-shared/utils';
-
-import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { type ObjectMetadataItemIdentifier } from '@/object-metadata/types/ObjectMetadataItemIdentifier';
-import { getRecordsFromRecordConnection } from '@/object-record/cache/utils/getRecordsFromRecordConnection';
-import { type RecordGqlConnectionEdgesRequired } from '@/object-record/graphql/types/RecordGqlConnectionEdgesRequired';
-import { type RecordGqlOperationFindDuplicatesResult } from '@/object-record/graphql/types/RecordGqlOperationFindDuplicatesResults';
-import { useFindDuplicateRecordsQuery } from '@/object-record/hooks/useFindDuplicatesRecordsQuery';
-import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
-import { getFindDuplicateRecordsQueryResponseField } from '@/object-record/utils/getFindDuplicateRecordsQueryResponseField';
-
-export const useFindDuplicateRecords = <T extends ObjectRecord = ObjectRecord>({
- objectRecordIds = [],
- objectNameSingular,
- skip,
-}: ObjectMetadataItemIdentifier & {
- objectRecordIds: string[] | undefined;
- skip?: boolean;
-}) => {
- const findDuplicateQueryStateIdentifier = objectNameSingular;
-
- const apolloCoreClient = useApolloCoreClient();
-
- const { objectMetadataItem } = useObjectMetadataItem({
- objectNameSingular,
- });
-
- const { findDuplicateRecordsQuery } = useFindDuplicateRecordsQuery({
- objectNameSingular,
- });
-
- const queryResponseField = getFindDuplicateRecordsQueryResponseField(
- objectMetadataItem.nameSingular,
- );
-
- const { data, loading, error } =
- useQuery<RecordGqlOperationFindDuplicatesResult>(
- findDuplicateRecordsQuery,
- {
- skip: !!skip,
- variables: {
- ids: objectRecordIds,
- },
- client: apolloCoreClient,
- },
- );
-
- const objectResults = data?.[queryResponseField];
-
- const results = useMemo(
- () =>
- objectResults?.map((result: RecordGqlConnectionEdgesRequired) => {
- return isDefined(result)
- ? (getRecordsFromRecordConnection({
- recordConnection: result,
- }) as T[])
- : [];
- }),
- [objectResults],
- );
-
- return {
- objectMetadataItem,
- results,
- loading,
- error,
- queryStateIdentifier: findDuplicateQueryStateIdentifier,
- };
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/components/RecordFieldList.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/components/RecordFieldList.tsx
index 5a1db918ed1..05b83e9e198 100644
--- a/packages/twenty-front/src/modules/object-record/record-field-list/components/RecordFieldList.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field-list/components/RecordFieldList.tsx
@@ -1,47 +1,33 @@
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
import { FieldDescriptionTooltipProvider } from '@/object-record/record-field/ui/components/FieldDescriptionTooltipProvider';
-import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
import { formatFieldMetadataItemAsColumnDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsColumnDefinition';
import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
import { useIsRecordReadOnly } from '@/object-record/read-only/hooks/useIsRecordReadOnly';
import { isRecordFieldReadOnly } from '@/object-record/read-only/utils/isRecordFieldReadOnly';
import { RecordFieldListCellEditModePortal } from '@/object-record/record-field-list/anchored-portal/components/RecordFieldListCellEditModePortal';
import { RecordFieldListCellHoveredPortal } from '@/object-record/record-field-list/anchored-portal/components/RecordFieldListCellHoveredPortal';
-import { useFieldListFieldMetadataItems } from '@/object-record/record-field-list/hooks/useFieldListFieldMetadataItems';
-import { RecordDetailDuplicatesSection } from '@/object-record/record-field-list/record-detail-section/duplicate/components/RecordDetailDuplicatesSection';
-import { RecordDetailMorphRelationSection } from '@/object-record/record-field-list/record-detail-section/relation/components/RecordDetailMorphRelationSection';
-import { RecordDetailRelationSection } from '@/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSection';
+import { useRecordFieldListNonRelationFieldMetadataItems } from '@/object-record/record-field-list/hooks/useRecordFieldListNonRelationFieldMetadataItems';
import { RecordFieldListComponentInstanceContext } from '@/object-record/record-field-list/states/contexts/RecordFieldListComponentInstanceContext';
import { recordFieldListHoverPositionComponentState } from '@/object-record/record-field-list/states/recordFieldListHoverPositionComponentState';
import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
import { RecordFieldComponentInstanceContext } from '@/object-record/record-field/ui/states/contexts/RecordFieldComponentInstanceContext';
-import { isJunctionRelationForbidden } from '@/object-record/record-field/ui/utils/junction/isJunctionRelationForbidden';
import { RecordInlineCell } from '@/object-record/record-inline-cell/components/RecordInlineCell';
import { PropertyBox } from '@/object-record/record-inline-cell/property-box/components/PropertyBox';
import { useRecordShowContainerActions } from '@/object-record/record-show/hooks/useRecordShowContainerActions';
import { useRecordShowContainerData } from '@/object-record/record-show/hooks/useRecordShowContainerData';
import { getRecordFieldInputInstanceId } from '@/object-record/utils/getRecordFieldInputId';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
-import { FieldMetadataType } from 'twenty-shared/types';
type RecordFieldListProps = {
instanceId: string;
objectNameSingular: string;
objectRecordId: string;
- showDuplicatesSection?: boolean;
- showRelationSections?: boolean;
- excludeFieldMetadataIds?: string[];
- excludeCreatedAtAndUpdatedAt?: boolean;
};
export const RecordFieldList = ({
instanceId,
objectNameSingular,
objectRecordId,
- showDuplicatesSection = true,
- showRelationSections = true,
- excludeFieldMetadataIds = [],
- excludeCreatedAtAndUpdatedAt = true,
}: RecordFieldListProps) => {
const { recordLoading } = useRecordShowContainerData({
objectRecordId,
@@ -52,7 +38,6 @@ export const RecordFieldList = ({
});
const { objectPermissionsByObjectMetadataId } = useObjectPermissions();
- const { objectMetadataItems } = useObjectMetadataItems();
const { useUpdateOneObjectRecordMutation } = useRecordShowContainerActions({
objectNameSingular,
@@ -72,13 +57,8 @@ export const RecordFieldList = ({
setRecordFieldListHoverPosition(index);
};
- const { inlineFieldMetadataItems, boxedRelationFieldMetadataItems } =
- useFieldListFieldMetadataItems({
- objectNameSingular,
- excludeFieldMetadataIds,
- showRelationSections,
- excludeCreatedAtAndUpdatedAt,
- });
+ const fieldMetadataItems =
+ useRecordFieldListNonRelationFieldMetadataItems(objectNameSingular);
return (
<FieldDescriptionTooltipProvider>
@@ -88,7 +68,7 @@ export const RecordFieldList = ({
}}
>
<PropertyBox dataTestId="record-fields-list-container">
- {inlineFieldMetadataItems?.map((fieldMetadataItem, index) => {
+ {fieldMetadataItems.map((fieldMetadataItem, index) => {
const fieldDefinition = formatFieldMetadataItemAsColumnDefinition({
field: fieldMetadataItem,
position: index,
@@ -120,12 +100,6 @@ export const RecordFieldList = ({
fieldName: fieldMetadataItem.name,
prefix: instanceId,
})}`,
- isForbidden: isJunctionRelationForbidden({
- fieldMetadataItem,
- sourceObjectMetadataId: objectMetadataItem.id,
- objectMetadataItems,
- objectPermissionsByObjectMetadataId,
- }),
}}
>
<RecordFieldComponentInstanceContext.Provider
@@ -146,52 +120,6 @@ export const RecordFieldList = ({
);
})}
</PropertyBox>
- {showDuplicatesSection && (
- <RecordDetailDuplicatesSection
- objectRecordId={objectRecordId}
- objectNameSingular={objectNameSingular}
- />
- )}
- {boxedRelationFieldMetadataItems
- .filter(
- (fieldMetadataItem) =>
- fieldMetadataItem.type === FieldMetadataType.RELATION ||
- fieldMetadataItem.type === FieldMetadataType.MORPH_RELATION,
- )
- .map((fieldMetadataItem, index) => {
- const fieldDefinition = formatFieldMetadataItemAsColumnDefinition({
- field: fieldMetadataItem,
- position: index,
- objectMetadataItem,
- });
-
- return (
- <FieldContext.Provider
- key={objectRecordId + fieldMetadataItem.id}
- value={{
- recordId: objectRecordId,
- isLabelIdentifier: false,
- fieldDefinition,
- useUpdateRecord: useUpdateOneObjectRecordMutation,
- isDisplayModeFixHeight: true,
- isRecordFieldReadOnly: isRecordFieldReadOnly({
- isRecordReadOnly,
- objectMetadataId: objectMetadataItem.id,
- fieldMetadataItem,
- fieldDefinition,
- objectPermissionsByObjectMetadataId,
- }),
- }}
- >
- {fieldMetadataItem.type === FieldMetadataType.MORPH_RELATION ? (
- <RecordDetailMorphRelationSection loading={recordLoading} />
- ) : (
- <RecordDetailRelationSection loading={recordLoading} />
- )}
- </FieldContext.Provider>
- );
- })}
-
<RecordFieldListCellHoveredPortal
objectMetadataItem={objectMetadataItem}
recordId={objectRecordId}
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/hooks/useFieldListFieldMetadataFromPosition.ts b/packages/twenty-front/src/modules/object-record/record-field-list/hooks/useFieldListFieldMetadataFromPosition.ts
index e934c2a52aa..466d0b16200 100644
--- a/packages/twenty-front/src/modules/object-record/record-field-list/hooks/useFieldListFieldMetadataFromPosition.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field-list/hooks/useFieldListFieldMetadataFromPosition.ts
@@ -1,4 +1,4 @@
-import { useFieldListFieldMetadataItems } from '@/object-record/record-field-list/hooks/useFieldListFieldMetadataItems';
+import { useRecordFieldListNonRelationFieldMetadataItems } from '@/object-record/record-field-list/hooks/useRecordFieldListNonRelationFieldMetadataItems';
import { recordFieldListCellEditModePositionComponentState } from '@/object-record/record-field-list/states/recordFieldListCellEditModePositionComponentState';
import { recordFieldListHoverPositionComponentState } from '@/object-record/record-field-list/states/recordFieldListHoverPositionComponentState';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
@@ -19,15 +19,8 @@ export const useFieldListFieldMetadataFromPosition = ({
recordFieldListCellEditModePositionComponentState,
);
- const { inlineFieldMetadataItems, boxedRelationFieldMetadataItems } =
- useFieldListFieldMetadataItems({
- objectNameSingular,
- });
-
- const fieldMetadataItems = [
- ...inlineFieldMetadataItems,
- ...boxedRelationFieldMetadataItems,
- ];
+ const fieldMetadataItems =
+ useRecordFieldListNonRelationFieldMetadataItems(objectNameSingular);
const hoveredFieldMetadataItem = isDefined(recordFieldListHoverPosition)
? fieldMetadataItems.at(recordFieldListHoverPosition)
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/hooks/useFieldListFieldMetadataItems.ts b/packages/twenty-front/src/modules/object-record/record-field-list/hooks/useFieldListFieldMetadataItems.ts
index 97cd2aa1ca3..31ab6e0b650 100644
--- a/packages/twenty-front/src/modules/object-record/record-field-list/hooks/useFieldListFieldMetadataItems.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field-list/hooks/useFieldListFieldMetadataItems.ts
@@ -9,17 +9,11 @@ import { FieldMetadataType } from 'twenty-shared/types';
type UseFieldListFieldMetadataItemsProps = {
objectNameSingular: string;
- excludeFieldMetadataIds?: string[];
- excludeCreatedAtAndUpdatedAt?: boolean;
- showRelationSections?: boolean;
includeSystemObjectRelations?: boolean;
};
export const useFieldListFieldMetadataItems = ({
objectNameSingular,
- excludeFieldMetadataIds = [],
- showRelationSections = true,
- excludeCreatedAtAndUpdatedAt = true,
includeSystemObjectRelations = false,
}: UseFieldListFieldMetadataItemsProps) => {
const { labelIdentifierFieldMetadataItem } =
@@ -40,15 +34,7 @@ export const useFieldListFieldMetadataItems = ({
(fieldMetadataItem) =>
isFieldCellSupported(fieldMetadataItem, objectMetadataItems, {
includeSystemObjectRelations,
- }) &&
- fieldMetadataItem.id !== labelIdentifierFieldMetadataItem?.id &&
- !excludeFieldMetadataIds.includes(fieldMetadataItem.id) &&
- (!excludeCreatedAtAndUpdatedAt ||
- (fieldMetadataItem.name !== 'createdAt' &&
- fieldMetadataItem.name !== 'deletedAt')) &&
- (showRelationSections ||
- (fieldMetadataItem.type !== FieldMetadataType.RELATION &&
- fieldMetadataItem.type !== FieldMetadataType.MORPH_RELATION)),
+ }) && fieldMetadataItem.id !== labelIdentifierFieldMetadataItem?.id,
)
.sort((fieldMetadataItemA, fieldMetadataItemB) =>
fieldMetadataItemA.name.localeCompare(fieldMetadataItemB.name),
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/hooks/useRecordFieldListNonRelationFieldMetadataItems.ts b/packages/twenty-front/src/modules/object-record/record-field-list/hooks/useRecordFieldListNonRelationFieldMetadataItems.ts
new file mode 100644
index 00000000000..9068e181df4
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field-list/hooks/useRecordFieldListNonRelationFieldMetadataItems.ts
@@ -0,0 +1,16 @@
+import { useFieldListFieldMetadataItems } from '@/object-record/record-field-list/hooks/useFieldListFieldMetadataItems';
+import { FieldMetadataType } from 'twenty-shared/types';
+
+export const useRecordFieldListNonRelationFieldMetadataItems = (
+ objectNameSingular: string,
+) => {
+ const { inlineFieldMetadataItems } = useFieldListFieldMetadataItems({
+ objectNameSingular,
+ });
+
+ return inlineFieldMetadataItems.filter(
+ ({ type }) =>
+ type !== FieldMetadataType.RELATION &&
+ type !== FieldMetadataType.MORPH_RELATION,
+ );
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/components/RecordDetailSectionContainer.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/components/RecordDetailSectionContainer.tsx
deleted file mode 100644
index 3b7c0ed9cd7..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/components/RecordDetailSectionContainer.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-import { styled } from '@linaria/react';
-import { useState } from 'react';
-import { Link } from 'react-router-dom';
-import { Section } from 'twenty-ui/components/layout';
-import { themeCssVariables } from 'twenty-ui/theme';
-
-const StyledRecordDetailSectionWrapper = styled.div`
- border-top: 1px solid ${themeCssVariables.border.color.light};
- padding-bottom: ${themeCssVariables.spacing[3]};
- padding-top: ${themeCssVariables.spacing[3]};
- width: auto;
-`;
-
-const StyledHeader = styled.header<{
- isDropdownOpen?: boolean;
- areRecordsAvailable?: boolean;
- ariaLabel?: string;
-}>`
- align-items: center;
- display: flex;
- height: 24px;
- justify-content: space-between;
- margin-bottom: ${({ areRecordsAvailable }) =>
- areRecordsAvailable ? themeCssVariables.spacing[2] : '0'};
- padding-left: ${themeCssVariables.spacing[3]};
- padding-right: ${themeCssVariables.spacing[2]};
-`;
-
-const StyledTitle = styled.div`
- align-items: flex-end;
- display: flex;
- gap: ${themeCssVariables.spacing[1]};
-`;
-
-const StyledTitleLabel = styled.div`
- font-weight: ${themeCssVariables.font.weight.medium};
-`;
-
-const StyledLinkContainer = styled.span`
- & > a {
- color: ${themeCssVariables.font.color.light};
- font-size: ${themeCssVariables.font.size.sm};
- text-decoration: none;
-
- &:hover {
- color: ${themeCssVariables.font.color.secondary};
- }
- }
-`;
-
-type RecordDetailSectionContainerProps = {
- children: React.ReactNode;
- title: string;
- link?: { to: string; label: string };
- rightAdornment?: React.ReactNode;
- hideRightAdornmentOnMouseLeave?: boolean;
- areRecordsAvailable?: boolean;
- dataTestId?: string;
-};
-
-export const RecordDetailSectionContainer = ({
- children,
- title,
- link,
- rightAdornment,
- hideRightAdornmentOnMouseLeave = true,
- areRecordsAvailable = false,
- dataTestId,
-}: RecordDetailSectionContainerProps) => {
- const [isHovered, setIsHovered] = useState(false);
- return (
- <StyledRecordDetailSectionWrapper>
- <Section.Root>
- <StyledHeader
- areRecordsAvailable={areRecordsAvailable}
- onMouseEnter={() => setIsHovered(true)}
- onMouseLeave={() => setIsHovered(false)}
- data-testid={dataTestId}
- >
- <StyledTitle>
- <StyledTitleLabel>{title}</StyledTitleLabel>
- {link && (
- <StyledLinkContainer>
- <Link to={link.to}>{link.label}</Link>
- </StyledLinkContainer>
- )}
- </StyledTitle>
- {hideRightAdornmentOnMouseLeave && !isHovered && areRecordsAvailable
- ? null
- : rightAdornment}
- </StyledHeader>
- {children}
- </Section.Root>
- </StyledRecordDetailSectionWrapper>
- );
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/duplicate/components/RecordDetailDuplicatesSection.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/duplicate/components/RecordDetailDuplicatesSection.tsx
deleted file mode 100644
index 6ef51b5a63a..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/duplicate/components/RecordDetailDuplicatesSection.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-import { ToastOnQueryErrorEffect } from '@/apollo/components/ToastOnQueryErrorEffect';
-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { RecordChip } from '@/object-record/components/RecordChip';
-import { useFindDuplicateRecords } from '@/object-record/hooks/useFindDuplicateRecords';
-import { RecordDetailRecordsListContainer } from '@/object-record/record-field-list/record-detail-section/components/RecordDetailRecordsListContainer';
-import { RecordDetailRecordsListItemContainer } from '@/object-record/record-field-list/record-detail-section/components/RecordDetailRecordsListItemContainer';
-import { RecordDetailSectionContainer } from '@/object-record/record-field-list/record-detail-section/components/RecordDetailSectionContainer';
-import { useOpenMergeRecordsPageInSidePanel } from '@/side-panel/hooks/useOpenMergeRecordsPageInSidePanel';
-
-import { t } from '@lingui/core/macro';
-import { isNonEmptyArray } from '@sniptt/guards';
-import { isDefined } from 'twenty-shared/utils';
-import { LightIconButton } from 'twenty-ui/components/input';
-import { IconArrowMerge } from 'twenty-ui/icon';
-
-export const RecordDetailDuplicatesSection = ({
- objectRecordId,
- objectNameSingular,
-}: {
- objectRecordId: string;
- objectNameSingular: string;
-}) => {
- const { objectMetadataItem } = useObjectMetadataItem({
- objectNameSingular,
- });
-
- const { results: queryResults, error } = useFindDuplicateRecords({
- objectRecordIds: [objectRecordId],
- objectNameSingular,
- skip: !isDefined(objectMetadataItem.duplicateCriteria),
- });
-
- const duplicateRecords = queryResults?.[0] ?? [];
- const duplicateRecordIds = [
- ...duplicateRecords.map((record) => record.id),
- objectRecordId,
- ];
-
- const { openMergeRecordsPageInSidePanel } =
- useOpenMergeRecordsPageInSidePanel({
- objectNameSingular,
- objectRecordIds: duplicateRecordIds,
- });
-
- return (
- <>
- <ToastOnQueryErrorEffect error={error} />
- {isNonEmptyArray(duplicateRecords) && (
- <RecordDetailSectionContainer
- title={t`Duplicates`}
- rightAdornment={
- <LightIconButton
- className="displayOnHover"
- emphasis="subtle"
- onClick={openMergeRecordsPageInSidePanel}
- aria-label={t`Merge duplicates`}
- >
- <IconArrowMerge />
- </LightIconButton>
- }
- >
- <RecordDetailRecordsListContainer>
- {duplicateRecords.slice(0, 5).map((duplicateRecord) => (
- <RecordDetailRecordsListItemContainer key={duplicateRecord.id}>
- <RecordChip
- record={duplicateRecord}
- objectNameSingular={objectNameSingular}
- />
- </RecordDetailRecordsListItemContainer>
- ))}
- </RecordDetailRecordsListContainer>
- </RecordDetailSectionContainer>
- )}
- </>
- );
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/duplicate/components/__stories__/RecordDetailDuplicatesSection.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/duplicate/components/__stories__/RecordDetailDuplicatesSection.stories.tsx
deleted file mode 100644
index b486a0f773b..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/duplicate/components/__stories__/RecordDetailDuplicatesSection.stories.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import { type Meta, type StoryObj } from '@storybook/react-vite';
-
-import { RecordDetailDuplicatesSection } from '@/object-record/record-field-list/record-detail-section/duplicate/components/RecordDetailDuplicatesSection';
-import { LayoutRenderingProvider } from '@/ui/layout/contexts/LayoutRenderingContext';
-import { CoreObjectNameSingular } from 'twenty-shared/types';
-import { ComponentDecorator } from 'twenty-ui/testing';
-import { PageLayoutType } from '~/generated-metadata/graphql';
-import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
-import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';
-import { ToastDecorator } from '~/testing/decorators/ToastDecorator';
-import { graphqlMocks } from '~/testing/graphqlMocks';
-import { mockedCompanyRecords } from '~/testing/mock-data/generated/data/companies/mock-companies-data';
-
-const meta: Meta<typeof RecordDetailDuplicatesSection> = {
- title:
- 'Modules/ObjectRecord/RecordShow/RecordDetailSection/RecordDetailDuplicatesSection',
- component: RecordDetailDuplicatesSection,
- decorators: [
- (Story) => (
- <LayoutRenderingProvider
- value={{
- targetRecordIdentifier: {
- id: mockedCompanyRecords[0].id,
- targetObjectNameSingular: 'company',
- },
- layoutType: PageLayoutType.RECORD_PAGE,
- }}
- >
- <Story />
- </LayoutRenderingProvider>
- ),
- ComponentDecorator,
- ObjectMetadataItemsDecorator,
- ToastDecorator,
- MemoryRouterDecorator,
- ],
- args: {
- objectRecordId: mockedCompanyRecords[0].id,
- objectNameSingular: CoreObjectNameSingular.Company,
- },
- parameters: {
- msw: graphqlMocks,
- },
-};
-
-export default meta;
-type Story = StoryObj<typeof RecordDetailDuplicatesSection>;
-
-export const Default: Story = {};
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailMorphRelationSection.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailMorphRelationSection.tsx
deleted file mode 100644
index cb17b98f651..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailMorphRelationSection.tsx
+++ /dev/null
@@ -1,136 +0,0 @@
-import { useContext } from 'react';
-
-import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
-import { useRecordFieldsScopeContextOrThrow } from '@/object-record/record-field-list/contexts/RecordFieldsScopeContext';
-import { RecordDetailSectionContainer } from '@/object-record/record-field-list/record-detail-section/components/RecordDetailSectionContainer';
-import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
-import {
- FieldInputEventContext,
- type FieldInputEvent,
-} from '@/object-record/record-field/ui/contexts/FieldInputEventContext';
-import { type FieldMorphRelationMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';
-import { getRecordFieldCardRelationPickerDropdownId } from '@/object-record/record-show/utils/getRecordFieldCardRelationPickerDropdownId';
-import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState';
-import { useIsMobile } from 'twenty-ui/utilities';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-
-import { RecordDetailMorphRelationSectionDropdown } from '@/object-record/record-field-list/record-detail-section/relation/components/RecordDetailMorphRelationSectionDropdown';
-import { RecordDetailRelationRecordsList } from '@/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationRecordsList';
-import { useGetMorphRelationRelatedRecordsWithObjectNameSingular } from '@/object-record/record-field-list/record-detail-section/relation/components/hooks/useGetMorphRelationRelatedRecordsWithObjectNameSingular';
-import { useMorphPersistManyToOne } from '@/object-record/record-field/ui/meta-types/input/hooks/useMorphPersistManyToOne';
-import { CustomError, isDefined } from 'twenty-shared/utils';
-
-type RecordDetailMorphRelationSectionProps = {
- loading: boolean;
-};
-
-export const RecordDetailMorphRelationSection = ({
- loading,
-}: RecordDetailMorphRelationSectionProps) => {
- const { scopeInstanceId } = useRecordFieldsScopeContextOrThrow();
- const { recordId, fieldDefinition } = useContext(FieldContext);
-
- const metadata = fieldDefinition.metadata as FieldMorphRelationMetadata;
- const { objectMetadataNameSingular } = metadata;
-
- const isMobile = useIsMobile();
-
- const recordsWithObjectNameSingular =
- useGetMorphRelationRelatedRecordsWithObjectNameSingular({
- recordId,
- morphRelations: metadata.morphRelations,
- });
-
- const relationRecordsCount = recordsWithObjectNameSingular.length;
-
- const dropdownId = getRecordFieldCardRelationPickerDropdownId({
- fieldDefinition,
- recordId,
- instanceId: scopeInstanceId,
- });
-
- const isDropdownOpen = useAtomComponentStateValue(
- isDropdownOpenComponentState,
- dropdownId,
- );
-
- const { objectMetadataItems } = useObjectMetadataItems();
-
- const objectMetadataItem = objectMetadataItems.find(
- (objectMetadataItemToFind) =>
- objectMetadataItemToFind.nameSingular === objectMetadataNameSingular,
- );
-
- if (!objectMetadataItem) {
- throw new CustomError(
- 'Object metadata item not found',
- 'OBJECT_METADATA_ITEM_NOT_FOUND',
- );
- }
-
- const { persistMorphManyToOne } = useMorphPersistManyToOne({
- objectMetadataNameSingular: objectMetadataItem.nameSingular,
- });
-
- const handleSubmit: FieldInputEvent = ({ newValue }) => {
- if (!isDefined(newValue)) {
- persistMorphManyToOne({
- recordId,
- fieldDefinition,
- valueToPersist: null,
- });
- return;
- }
-
- const { id, objectMetadataId } = newValue as {
- id: string;
- objectMetadataId: string;
- };
-
- if (!isDefined(id)) {
- throw new CustomError('Id is required', 'ID_IS_REQUIRED');
- }
- const targetObjectMetadataNameSingular = objectMetadataItems.find(
- (objectMetadataItem) => objectMetadataItem.id === objectMetadataId,
- )?.nameSingular;
-
- if (!isDefined(targetObjectMetadataNameSingular)) {
- throw new CustomError(
- 'Target object metadata name singular is required',
- 'TARGET_OBJECT_METADATA_NAME_SINGULAR_IS_REQUIRED',
- );
- }
-
- persistMorphManyToOne({
- recordId,
- fieldDefinition,
- valueToPersist: id,
- targetObjectMetadataNameSingular,
- });
- };
-
- if (loading) return null;
-
- return (
- <FieldInputEventContext.Provider
- value={{
- onSubmit: handleSubmit,
- }}
- >
- <RecordDetailSectionContainer
- title={fieldDefinition.label}
- hideRightAdornmentOnMouseLeave={!isDropdownOpen && !isMobile}
- areRecordsAvailable={relationRecordsCount > 0}
- rightAdornment={
- <RecordDetailMorphRelationSectionDropdown loading={loading} />
- }
- >
- {relationRecordsCount > 0 && (
- <RecordDetailRelationRecordsList
- recordsWithObjectNameSingular={recordsWithObjectNameSingular}
- />
- )}
- </RecordDetailSectionContainer>
- </FieldInputEventContext.Provider>
- );
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationRecordsList.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationRecordsList.tsx
deleted file mode 100644
index ee350ce568a..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationRecordsList.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import { Fragment, useState } from 'react';
-
-import { RecordDetailRecordsListContainer } from '@/object-record/record-field-list/record-detail-section/components/RecordDetailRecordsListContainer';
-import { RecordDetailRelationRecordsListItem } from '@/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationRecordsListItem';
-import { RecordDetailRelationRecordsListItemEffect } from '@/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationRecordsListItemEffect';
-import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
-
-type RecordDetailRelationRecordsListProps = {
- objectNameSingular: string;
- value: ObjectRecord;
- fieldMetadataId: string;
-};
-
-export const RecordDetailRelationRecordsList = ({
- recordsWithObjectNameSingular,
-}: {
- recordsWithObjectNameSingular: RecordDetailRelationRecordsListProps[];
-}) => {
- const [expandedItem, setExpandedItem] = useState('');
-
- const handleItemClick = (recordId: string) =>
- setExpandedItem(recordId === expandedItem ? '' : recordId);
-
- return (
- <RecordDetailRecordsListContainer>
- {recordsWithObjectNameSingular
- .slice(0, 5)
- .map((recordWithObjectNameSingular) => (
- <Fragment
- key={`${recordWithObjectNameSingular.value.id}-${recordWithObjectNameSingular.fieldMetadataId}`}
- >
- <RecordDetailRelationRecordsListItemEffect
- key={`${recordWithObjectNameSingular.value.id}-effect`}
- relationRecordId={recordWithObjectNameSingular.value.id}
- relationObjectMetadataNameSingular={
- recordWithObjectNameSingular.objectNameSingular
- }
- />
- <RecordDetailRelationRecordsListItem
- key={recordWithObjectNameSingular.value.id}
- isExpanded={
- expandedItem === recordWithObjectNameSingular.value.id
- }
- onClick={handleItemClick}
- relationRecord={recordWithObjectNameSingular.value}
- relationObjectMetadataNameSingular={
- recordWithObjectNameSingular.objectNameSingular
- }
- relationFieldMetadataId={
- recordWithObjectNameSingular.fieldMetadataId
- }
- />
- </Fragment>
- ))}
- </RecordDetailRecordsListContainer>
- );
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationRecordsListItem.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationRecordsListItem.tsx
index 9f174b9e86a..93ba3239fda 100644
--- a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationRecordsListItem.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationRecordsListItem.tsx
@@ -266,10 +266,6 @@ export const RecordDetailRelationRecordsListItem = ({
instanceId={`${scopeInstanceId}-relation-${relationRecord.id}`}
objectNameSingular={relationObjectMetadataNameSingular}
objectRecordId={relationRecord.id}
- showDuplicatesSection={false}
- showRelationSections={false}
- excludeCreatedAtAndUpdatedAt={true}
- excludeFieldMetadataIds={[relationFieldMetadataId]}
/>
</Collapsible.Panel>
</Collapsible.Root>
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSection.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSection.tsx
deleted file mode 100644
index f00133facdd..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSection.tsx
+++ /dev/null
@@ -1,224 +0,0 @@
-import { useContext } from 'react';
-
-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
-import { useAggregateRecords } from '@/object-record/hooks/useAggregateRecords';
-import { useRecordFieldsScopeContextOrThrow } from '@/object-record/record-field-list/contexts/RecordFieldsScopeContext';
-import { RecordDetailSectionContainer } from '@/object-record/record-field-list/record-detail-section/components/RecordDetailSectionContainer';
-import { RecordDetailRelationRecordsList } from '@/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationRecordsList';
-import { RecordDetailRelationSectionDropdown } from '@/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSectionDropdown';
-import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
-import {
- FieldInputEventContext,
- type FieldInputEvent,
-} from '@/object-record/record-field/ui/contexts/FieldInputEventContext';
-import { usePersistField } from '@/object-record/record-field/ui/hooks/usePersistField';
-import { type FieldRelationMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';
-import { getRecordFieldCardRelationPickerDropdownId } from '@/object-record/record-show/utils/getRecordFieldCardRelationPickerDropdownId';
-import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
-import { AggregateOperations } from '@/object-record/record-table/constants/AggregateOperations';
-import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
-import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState';
-import { useIsMobile } from 'twenty-ui/utilities';
-import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
-import { indexViewIdFromObjectMetadataItemFamilySelector } from '@/views/states/selectors/indexViewIdFromObjectMetadataItemFamilySelector';
-import { useLingui } from '@lingui/react/macro';
-import {
- AppPath,
- FieldMetadataType,
- ViewFilterOperand,
- type RecordGqlOperationFilter,
-} from 'twenty-shared/types';
-import {
- computeMorphRelationGqlFieldName,
- CustomError,
- getAppPath,
- isDefined,
-} from 'twenty-shared/utils';
-import { RelationType } from '~/generated-metadata/graphql';
-
-type RecordDetailRelationSectionProps = {
- loading: boolean;
-};
-
-export const RecordDetailRelationSection = ({
- loading,
-}: RecordDetailRelationSectionProps) => {
- const { t } = useLingui();
-
- const { scopeInstanceId } = useRecordFieldsScopeContextOrThrow();
- const { recordId, fieldDefinition } = useContext(FieldContext);
-
- const {
- fieldName,
- relationFieldMetadataId,
- relationObjectMetadataNameSingular,
- relationType,
- objectMetadataNameSingular,
- } = fieldDefinition.metadata as FieldRelationMetadata;
-
- const isMobile = useIsMobile();
- const { objectMetadataItem: relationObjectMetadataItem } =
- useObjectMetadataItem({
- objectNameSingular: relationObjectMetadataNameSingular,
- });
-
- const relationFieldMetadataItem = relationObjectMetadataItem.fields.find(
- ({ id }) => id === relationFieldMetadataId,
- );
-
- const { objectMetadataItems } = useObjectMetadataItems();
- const objectMetadataItem = objectMetadataItems.find(
- (objectMetadataItemToFind) =>
- objectMetadataItemToFind.nameSingular === objectMetadataNameSingular,
- );
-
- if (!objectMetadataItem) {
- throw new CustomError(
- 'Object metadata item not found',
- 'OBJECT_METADATA_ITEM_NOT_FOUND',
- );
- }
-
- const fieldValue = useAtomFamilySelectorValue(recordStoreFamilySelector, {
- recordId,
- fieldName,
- }) as ({ id: string } & Record<string, unknown>) | ObjectRecord[] | null;
-
- // TODO: use new relation type
- const isToOneObject = relationType === RelationType.MANY_TO_ONE;
- const isToManyObjects = relationType === RelationType.ONE_TO_MANY;
-
- const relationRecords: ObjectRecord[] =
- fieldValue && isToOneObject
- ? [fieldValue as ObjectRecord]
- : ((fieldValue as ObjectRecord[]) ?? []);
-
- const dropdownId = getRecordFieldCardRelationPickerDropdownId({
- fieldDefinition,
- recordId,
- instanceId: scopeInstanceId,
- });
-
- const isDropdownOpen = useAtomComponentStateValue(
- isDropdownOpenComponentState,
- dropdownId,
- );
-
- const indexViewId = useAtomFamilySelectorValue(
- indexViewIdFromObjectMetadataItemFamilySelector,
- { objectMetadataItemId: relationObjectMetadataItem.id },
- );
-
- const filterQueryParams = {
- filter: {
- [relationFieldMetadataItem?.name || '']: {
- [ViewFilterOperand.IS]: {
- selectedRecordIds: [recordId],
- },
- },
- },
- viewId: indexViewId,
- };
-
- const filterLinkHref = getAppPath(
- AppPath.RecordIndexPage,
- {
- objectNamePlural: relationObjectMetadataItem.namePlural,
- },
- filterQueryParams,
- );
-
- const persistField = usePersistField({
- objectMetadataItemId: objectMetadataItem?.id ?? '',
- });
-
- const relationFieldMetadataIsMorphRelation =
- relationFieldMetadataItem?.type === FieldMetadataType.MORPH_RELATION;
-
- const computedName = isDefined(relationFieldMetadataItem)
- ? computeMorphRelationGqlFieldName({
- fieldName: relationFieldMetadataItem.name,
- relationType: relationFieldMetadataItem.settings.relationType,
- targetObjectMetadataNameSingular: objectMetadataItem.nameSingular,
- targetObjectMetadataNamePlural: objectMetadataItem.namePlural,
- })
- : undefined;
-
- const gqlFieldName = relationFieldMetadataIsMorphRelation
- ? computedName
- : relationFieldMetadataItem?.name;
-
- const filtersForAggregate = isToManyObjects
- ? ({
- [`${gqlFieldName}Id`]: {
- in: [recordId],
- },
- } satisfies RecordGqlOperationFilter)
- : {};
-
- const { data: relationAggregateResult } = useAggregateRecords<{
- id: { COUNT: number };
- }>({
- objectNameSingular: relationObjectMetadataItem.nameSingular,
- filter: filtersForAggregate,
- skip: !isToManyObjects,
- recordGqlFieldsAggregate: {
- id: [AggregateOperations.COUNT],
- },
- });
-
- const handleSubmit: FieldInputEvent = ({ newValue }) => {
- persistField({
- recordId: recordId,
- fieldDefinition,
- valueToPersist: newValue,
- });
- };
-
- if (loading) return null;
-
- const relationRecordsCount = relationAggregateResult?.id?.COUNT ?? 0;
-
- return (
- <FieldInputEventContext.Provider
- value={{
- onSubmit: handleSubmit,
- }}
- >
- <RecordDetailSectionContainer
- dataTestId={`${fieldDefinition.label.toLowerCase().replace(' ', '-')}-relation`}
- title={fieldDefinition.label}
- link={
- isToManyObjects
- ? {
- to: filterLinkHref,
- label:
- relationRecordsCount > 0
- ? t`All (${relationRecordsCount})`
- : '',
- }
- : undefined
- }
- hideRightAdornmentOnMouseLeave={!isDropdownOpen && !isMobile}
- areRecordsAvailable={relationRecords.length > 0}
- rightAdornment={
- <RecordDetailRelationSectionDropdown loading={loading} />
- }
- >
- {relationRecords.length > 0 && (
- <RecordDetailRelationRecordsList
- recordsWithObjectNameSingular={relationRecords.map(
- (relationRecord) => ({
- value: relationRecord,
- objectNameSingular: relationObjectMetadataNameSingular,
- fieldMetadataId: relationFieldMetadataId,
- }),
- )}
- />
- )}
- </RecordDetailSectionContainer>
- </FieldInputEventContext.Provider>
- );
-};
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/__stories__/RecordDetailRelationSection.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/__stories__/RecordDetailRelationSection.stories.tsx
deleted file mode 100644
index ddfe3865d32..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/__stories__/RecordDetailRelationSection.stories.tsx
+++ /dev/null
@@ -1,221 +0,0 @@
-import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { graphql, HttpResponse } from 'msw';
-import { expect, fn, userEvent, waitFor, within } from 'storybook/test';
-import { isDefined } from 'twenty-shared/utils';
-
-import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext';
-import { formatFieldMetadataItemAsFieldDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsFieldDefinition';
-import { getRecordFromRecordNode } from '@/object-record/cache/utils/getRecordFromRecordNode';
-import { RecordFieldsScopeContextProvider } from '@/object-record/record-field-list/contexts/RecordFieldsScopeContext';
-import { RecordDetailRelationSection } from '@/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSection';
-import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
-import { LayoutRenderingProvider } from '@/ui/layout/contexts/LayoutRenderingContext';
-import { ComponentDecorator } from 'twenty-ui/testing';
-import { PageLayoutType } from '~/generated-metadata/graphql';
-import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
-import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';
-import { RecordStoreDecorator } from '~/testing/decorators/RecordStoreDecorator';
-import { SidePanelDecorator } from '~/testing/decorators/SidePanelDecorator';
-import { ToastDecorator } from '~/testing/decorators/ToastDecorator';
-import { graphqlMocks } from '~/testing/graphqlMocks';
-import { mockedCompanyRecords } from '~/testing/mock-data/generated/data/companies/mock-companies-data';
-import { mockedPersonRecords } from '~/testing/mock-data/generated/data/people/mock-people-data';
-import { mockedWorkspaceMemberRecords } from '~/testing/mock-data/generated/data/workspaceMembers/mock-workspaceMembers-data';
-import { getTestEnrichedObjectMetadataItemsMock } from '~/testing/utils/getTestEnrichedObjectMetadataItemsMock';
-
-const mockedCompanyObjectMetadataItem =
- getTestEnrichedObjectMetadataItemsMock().find(
- (item) => item.nameSingular === 'company',
- );
-
-if (!mockedCompanyObjectMetadataItem) {
- throw new Error('Company object metadata item not found');
-}
-
-const meta: Meta<typeof RecordDetailRelationSection> = {
- title:
- 'Modules/ObjectRecord/RecordShow/RecordDetailSection/RecordDetailRelationSection',
- component: RecordDetailRelationSection,
- decorators: [
- (Story, { parameters }) => (
- <LayoutRenderingProvider
- value={{
- targetRecordIdentifier: {
- id: mockedCompanyRecords[0].id,
- targetObjectNameSingular: 'company',
- },
- layoutType: PageLayoutType.RECORD_PAGE,
- }}
- >
- <ContextStoreComponentInstanceContext.Provider
- value={{ instanceId: 'mock-instance-id' }}
- >
- <FieldContext.Provider
- value={{
- recordId: mockedCompanyRecords[0].id,
- isLabelIdentifier: false,
- fieldDefinition: formatFieldMetadataItemAsFieldDefinition({
- field: mockedCompanyObjectMetadataItem.fields.find(
- ({ name }) => name === 'people',
- )!,
- objectMetadataItem: mockedCompanyObjectMetadataItem,
- }),
- isRecordFieldReadOnly: parameters.readOnly ?? false,
- }}
- >
- <RecordFieldsScopeContextProvider
- value={{ scopeInstanceId: 'mock-instance-id' }}
- >
- <Story />
- </RecordFieldsScopeContextProvider>
- </FieldContext.Provider>
- </ContextStoreComponentInstanceContext.Provider>
- </LayoutRenderingProvider>
- ),
- SidePanelDecorator,
- ComponentDecorator,
- ObjectMetadataItemsDecorator,
- ToastDecorator,
- MemoryRouterDecorator,
- ],
- parameters: {
- msw: graphqlMocks,
- records: mockedCompanyRecords,
- },
-};
-
-export default meta;
-type Story = StoryObj<typeof RecordDetailRelationSection>;
-
-export const EmptyState: Story = {};
-
-const flatPersonRecords = mockedPersonRecords.map((record) =>
- getRecordFromRecordNode({ recordNode: record }),
-);
-
-const onDetach = fn();
-
-const withRecordsParameters = {
- msw: {
- handlers: [
- graphql.query('AggregatePeople', () =>
- HttpResponse.json({
- data: {
- people: {
- __typename: 'PersonConnection',
- totalCount: flatPersonRecords.length,
- },
- },
- }),
- ),
- graphql.query('FindOneWorkspaceMember', ({ variables }) =>
- HttpResponse.json({
- data: {
- workspaceMember:
- mockedWorkspaceMemberRecords.find(
- (record) => record.id === variables.objectRecordId,
- ) ?? null,
- },
- }),
- ),
- graphql.mutation('UpdateOnePerson', ({ variables }) => {
- onDetach(variables);
- return HttpResponse.json({
- data: {
- updatePerson: {
- ...mockedPersonRecords[0],
- companyId: null,
- company: null,
- },
- },
- });
- }),
- ...graphqlMocks.handlers,
- ],
- },
- records: [
- {
- ...mockedCompanyRecords[0],
- people: flatPersonRecords,
- },
- ...flatPersonRecords,
- ],
-};
-
-export const WithRecords: Story = {
- decorators: [RecordStoreDecorator],
- beforeEach: () => {
- onDetach.mockClear();
- },
- parameters: withRecordsParameters,
- play: async ({ canvasElement }) => {
- const canvas = within(canvasElement);
- const body = within(canvasElement.ownerDocument.body);
- const trigger = (
- await canvas.findAllByRole('button', { name: 'More options' })
- )[0];
- const row = trigger.parentElement;
- if (!isDefined(row)) {
- throw new Error('Relation row not found');
- }
- await userEvent.hover(row);
- trigger.focus();
- expect(trigger).toHaveStyle({ opacity: '1', pointerEvents: 'auto' });
- await userEvent.click(trigger);
- const menu = await body.findByRole('menu', { name: 'More options' });
- await userEvent.keyboard('{Escape}');
- await waitFor(() => expect(menu).not.toBeInTheDocument());
- await waitFor(() => expect(trigger).toHaveFocus());
- await userEvent.unhover(row);
- expect(trigger).toHaveStyle({ opacity: '1' });
- await userEvent.click(trigger);
- const deleteMenu = await body.findByRole('menu', { name: 'More options' });
- await userEvent.click(
- within(deleteMenu).getByRole('menuitem', { name: 'Delete' }),
- );
- await waitFor(() => expect(deleteMenu).not.toBeInTheDocument());
- const confirmation = await body.findByRole('dialog', {
- name: 'Delete Related Person',
- });
- expect(
- within(confirmation).getByRole('button', { name: 'Delete Person' }),
- ).toBeVisible();
- await waitFor(() =>
- expect(confirmation).toContainElement(
- canvasElement.ownerDocument.querySelector<HTMLElement>(':focus'),
- ),
- );
- await userEvent.click(
- within(confirmation).getByRole('button', { name: 'Cancel' }),
- );
- await userEvent.hover(row);
- await userEvent.click(trigger);
- const reopenedMenu = await body.findByRole('menu', {
- name: 'More options',
- });
- await userEvent.click(
- within(reopenedMenu).getByRole('menuitem', { name: 'Detach' }),
- );
- await waitFor(() => expect(reopenedMenu).not.toBeInTheDocument());
- await waitFor(() =>
- expect(onDetach).toHaveBeenCalledWith(
- expect.objectContaining({
- idToUpdate: flatPersonRecords[0].id,
- input: expect.objectContaining({ companyId: null }),
- }),
- ),
- );
- },
-};
-
-export const ReadOnly: Story = {
- decorators: [RecordStoreDecorator],
- parameters: { ...withRecordsParameters, readOnly: true },
- play: async ({ canvasElement }) => {
- const canvas = within(canvasElement);
- await canvas.findAllByRole('button', { name: 'Expand relation' });
- expect(
- canvas.queryByRole('button', { name: 'More options' }),
- ).not.toBeInTheDocument();
- },
-};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionFieldSeeAll.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionFieldSeeAll.tsx
index da69662a90e..41d1362e597 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionFieldSeeAll.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionFieldSeeAll.tsx
@@ -1,14 +1,11 @@
-import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
import { isFieldRelation } from '@/object-record/record-field/ui/types/guards/isFieldRelation';
import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';
import { useFieldWidgetFieldDefinition } from '@/page-layout/widgets/field/hooks/useFieldWidgetFieldDefinition';
+import { useFieldWidgetRelationSeeAllHref } from '@/page-layout/widgets/field/hooks/useFieldWidgetRelationSeeAllHref';
import { WidgetCardHeaderActionLink } from '@/page-layout/widgets/widget-card/components/WidgetCardHeaderActionLink';
import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';
-import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';
-import { indexViewIdFromObjectMetadataItemFamilySelector } from '@/views/states/selectors/indexViewIdFromObjectMetadataItemFamilySelector';
import { t } from '@lingui/core/macro';
-import { AppPath, ViewFilterOperand } from 'twenty-shared/types';
-import { getAppPath, isDefined } from 'twenty-shared/utils';
+import { isDefined } from 'twenty-shared/utils';
import { IconArrowUpRight } from 'twenty-ui/icon';
type WidgetActionFieldSeeAllProps = {
@@ -22,54 +19,19 @@ export const WidgetActionFieldSeeAll = ({
const { fieldDefinition } = useFieldWidgetFieldDefinition(widget);
- const relationMetadata =
- isDefined(fieldDefinition) && isFieldRelation(fieldDefinition)
- ? fieldDefinition.metadata
- : null;
+ const { seeAllHref, relationObjectMetadataItem } =
+ useFieldWidgetRelationSeeAllHref({
+ recordId: targetRecord.id,
+ relationMetadata:
+ isDefined(fieldDefinition) && isFieldRelation(fieldDefinition)
+ ? fieldDefinition.metadata
+ : null,
+ });
- const { objectMetadataItems } = useObjectMetadataItems();
-
- const relationObjectMetadataItem = objectMetadataItems.find(
- (item) =>
- item.nameSingular ===
- relationMetadata?.relationObjectMetadataNameSingular,
- );
-
- const relationFieldMetadataItem = relationObjectMetadataItem?.fields.find(
- ({ id }) => id === relationMetadata?.relationFieldMetadataId,
- );
-
- const indexViewId = useAtomFamilySelectorValue(
- indexViewIdFromObjectMetadataItemFamilySelector,
- { objectMetadataItemId: relationObjectMetadataItem?.id ?? '' },
- );
-
- if (
- !isDefined(relationObjectMetadataItem) ||
- !isDefined(relationFieldMetadataItem)
- ) {
+ if (!isDefined(seeAllHref) || !isDefined(relationObjectMetadataItem)) {
return null;
}
- const filterQueryParams = {
- filter: {
- [relationFieldMetadataItem.name]: {
- [ViewFilterOperand.IS]: {
- selectedRecordIds: [targetRecord.id],
- },
- },
- },
- viewId: indexViewId,
- };
-
- const filterLinkHref = getAppPath(
- AppPath.RecordIndexPage,
- {
- objectNamePlural: relationObjectMetadataItem.namePlural,
- },
- filterQueryParams,
- );
-
const relationLabelPlural =
relationObjectMetadataItem.labelPlural.toLowerCase();
const actionLabel = t`See all ${relationLabelPlural} linked to this record`;
@@ -78,7 +40,7 @@ export const WidgetActionFieldSeeAll = ({
<WidgetCardHeaderActionLink
Icon={IconArrowUpRight}
label={actionLabel}
- to={filterLinkHref}
+ to={seeAllHref}
/>
);
};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationCard.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationCard.tsx
index 0dafb567b11..fb60aa09a38 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationCard.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationCard.tsx
@@ -2,6 +2,9 @@ import { type FieldDefinition } from '@/object-record/record-field/ui/types/Fiel
import { type FieldRelationMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';
import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
import { FieldWidgetRelationRecordsCard } from '@/page-layout/widgets/field/components/FieldWidgetRelationRecordsCard';
+import { useFieldWidgetRelationRecordsTotalCount } from '@/page-layout/widgets/field/hooks/useFieldWidgetRelationRecordsTotalCount';
+import { useFieldWidgetRelationSeeAllHref } from '@/page-layout/widgets/field/hooks/useFieldWidgetRelationSeeAllHref';
+import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';
import { isDefined } from 'twenty-shared/utils';
type FieldWidgetRelationCardProps = {
@@ -18,6 +21,20 @@ export const FieldWidgetRelationCard = ({
const { relationObjectMetadataNameSingular, relationFieldMetadataId } =
fieldDefinition.metadata;
+ const targetRecord = useTargetRecord();
+
+ const { relationRecordsTotalCount } = useFieldWidgetRelationRecordsTotalCount(
+ {
+ recordId: targetRecord.id,
+ relationFieldMetadata: fieldDefinition.metadata,
+ },
+ );
+
+ const { seeAllHref } = useFieldWidgetRelationSeeAllHref({
+ recordId: targetRecord.id,
+ relationMetadata: fieldDefinition.metadata,
+ });
+
const records: ObjectRecord[] = Array.isArray(relationValue)
? relationValue
: isDefined(relationValue)
@@ -32,6 +49,8 @@ export const FieldWidgetRelationCard = ({
objectNameSingular: relationObjectMetadataNameSingular,
fieldMetadataId: relationFieldMetadataId,
}))}
+ relationRecordsTotalCount={relationRecordsTotalCount}
+ seeAllHref={seeAllHref}
isInSidePanel={isInSidePanel}
/>
);
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationRecordsCard.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationRecordsCard.tsx
index cff94c7be77..e0d62a4f892 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationRecordsCard.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationRecordsCard.tsx
@@ -1,5 +1,6 @@
import { styled } from '@linaria/react';
import { Fragment, useState } from 'react';
+import { useNavigate } from 'react-router-dom';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
@@ -28,6 +29,7 @@ import { useCurrentWidget } from '@/page-layout/widgets/hooks/useCurrentWidget';
import { StyledWidgetContentContainer } from '@/ui/layout/components/WidgetContentContainer';
import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';
import { SidePanelProvider } from '@/ui/layout/side-panel/contexts/SidePanelContext';
+import { isDefined } from 'twenty-shared/utils';
import { themeCssVariables } from 'twenty-ui/theme';
const StyledShowMoreButtonContainer = styled.div`
@@ -39,6 +41,8 @@ type FieldWidgetRelationRecordsCardProps = {
FieldRelationMetadata | FieldMorphRelationMetadata
>;
relationRecords: FieldWidgetRelationCardRecord[];
+ relationRecordsTotalCount?: number;
+ seeAllHref?: string;
isInSidePanel: boolean;
isReadOnly?: boolean;
};
@@ -46,10 +50,13 @@ type FieldWidgetRelationRecordsCardProps = {
export const FieldWidgetRelationRecordsCard = ({
fieldDefinition,
relationRecords,
+ relationRecordsTotalCount,
+ seeAllHref,
isInSidePanel,
isReadOnly = false,
}: FieldWidgetRelationRecordsCardProps) => {
const widget = useCurrentWidget();
+ const navigate = useNavigate();
const [expandedItem, setExpandedItem] = useState('');
const [visibleItemsCount, setVisibleItemsCount] = useState(
@@ -67,7 +74,14 @@ export const FieldWidgetRelationRecordsCard = ({
const handleItemClick = (recordId: string) =>
setExpandedItem(recordId === expandedItem ? '' : recordId);
+ const hasHiddenLoadedRecords = relationRecords.length > visibleItemsCount;
+
const handleShowMore = () => {
+ if (!hasHiddenLoadedRecords && isDefined(seeAllHref)) {
+ navigate(seeAllHref);
+ return;
+ }
+
setVisibleItemsCount(
(prevCount) => prevCount + FIELD_WIDGET_RELATION_CARD_LOAD_MORE_INCREMENT,
);
@@ -123,8 +137,14 @@ export const FieldWidgetRelationRecordsCard = ({
}
const visibleRelationRecords = relationRecords.slice(0, visibleItemsCount);
- const remainingCount = relationRecords.length - visibleItemsCount;
- const hasMoreRecords = remainingCount > 0;
+ // Nested relations are capped server-side, so the loaded records can undercount.
+ const totalRecordsCount = Math.max(
+ relationRecordsTotalCount ?? 0,
+ relationRecords.length,
+ );
+ const remainingCount = totalRecordsCount - visibleRelationRecords.length;
+ const hasMoreRecords =
+ hasHiddenLoadedRecords || (remainingCount > 0 && isDefined(seeAllHref));
return (
<SidePanelProvider value={{ isInSidePanel }}>
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetShowMoreButton.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetShowMoreButton.tsx
index 67ffb052634..0a4b5d00f69 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetShowMoreButton.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetShowMoreButton.tsx
@@ -2,7 +2,7 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { IconChevronDown } from 'twenty-ui/icon';
-import { themeCssVariables } from 'twenty-ui/theme';
+import { themeCssVariables, useTheme } from 'twenty-ui/theme';
type FieldWidgetShowMoreButtonProps = {
remainingCount: number;
@@ -30,21 +30,15 @@ const StyledButton = styled.button`
}
`;
-const StyledIconContainer = styled.span`
- display: flex;
- height: 16px;
- width: 16px;
-`;
-
export const FieldWidgetShowMoreButton = ({
remainingCount,
onClick,
}: FieldWidgetShowMoreButtonProps) => {
+ const theme = useTheme();
+
return (
<StyledButton data-testid="field-widget-show-more-button" onClick={onClick}>
- <StyledIconContainer>
- <IconChevronDown />
- </StyledIconContainer>
+ <IconChevronDown size={theme.icon.size.md} />
{t`More (${remainingCount})`}
</StyledButton>
);
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/__stories__/FieldWidget.stories.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/__stories__/FieldWidget.stories.tsx
index 6cc892f0008..fd0785dd591 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/__stories__/FieldWidget.stories.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/__stories__/FieldWidget.stories.tsx
@@ -21,6 +21,7 @@ import { FieldWidget } from '@/page-layout/widgets/field/components/FieldWidget'
import { WidgetComponentInstanceContext } from '@/page-layout/widgets/states/contexts/WidgetComponentInstanceContext';
import { LayoutRenderingProvider } from '@/ui/layout/contexts/LayoutRenderingContext';
import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
+import { generateAggregateQuery } from '@/object-record/utils/generateAggregateQuery';
import { CoreObjectNameSingular } from 'twenty-shared/types';
import { Button } from 'twenty-ui/primitives/input';
import { ComponentDecorator } from 'twenty-ui/testing';
@@ -264,6 +265,40 @@ const JestMetadataAndApolloMocksWrapper = getJestMetadataAndApolloMocksWrapper({
apolloMocks: [],
});
+const COMPANY_PEOPLE_TOTAL_COUNT = 836;
+
+const enrichedPersonObjectMetadataItem =
+ getTestEnrichedObjectMetadataItemsMock().find(
+ ({ nameSingular }) => nameSingular === CoreObjectNameSingular.Person,
+ );
+
+if (!enrichedPersonObjectMetadataItem) {
+ throw new Error('Person object metadata item not found');
+}
+
+const JestMetadataAndApolloMocksWithPeopleCountWrapper =
+ getJestMetadataAndApolloMocksWrapper({
+ apolloMocks: [
+ {
+ request: {
+ query: generateAggregateQuery({
+ objectMetadataItem: enrichedPersonObjectMetadataItem,
+ recordGqlFields: { totalCount: true },
+ }),
+ variables: { filter: { companyId: { in: [TEST_RECORD_ID] } } },
+ },
+ result: {
+ data: {
+ people: {
+ __typename: 'PersonConnection',
+ totalCount: COMPANY_PEOPLE_TOTAL_COUNT,
+ },
+ },
+ },
+ },
+ ],
+ });
+
const CoreClientProviderWrapper = ({
children,
}: {
@@ -363,6 +398,7 @@ type FieldWidgetStorySetup = {
objectMetadataId: string;
targetRecord: { id: string; nameSingular: string };
records: Array<{ id: string; record: ObjectRecord }>;
+ MetadataAndApolloMocksWrapper?: typeof JestMetadataAndApolloMocksWrapper;
};
const renderFieldWidgetStory = ({
@@ -370,6 +406,7 @@ const renderFieldWidgetStory = ({
objectMetadataId,
targetRecord,
records,
+ MetadataAndApolloMocksWrapper = JestMetadataAndApolloMocksWrapper,
}: FieldWidgetStorySetup) => {
setTestObjectMetadataItemsInMetadataStore(
jotaiStore,
@@ -393,7 +430,7 @@ const renderFieldWidgetStory = ({
return (
<div style={{ width: '400px', padding: '20px' }}>
- <JestMetadataAndApolloMocksWrapper>
+ <MetadataAndApolloMocksWrapper>
<CoreClientProviderWrapper>
<PageLayoutTestWrapper store={jotaiStore}>
<LayoutRenderingProvider
@@ -421,7 +458,7 @@ const renderFieldWidgetStory = ({
</LayoutRenderingProvider>
</PageLayoutTestWrapper>
</CoreClientProviderWrapper>
- </JestMetadataAndApolloMocksWrapper>
+ </MetadataAndApolloMocksWrapper>
</div>
);
};
@@ -1016,6 +1053,57 @@ export const OneToManyRelationCardWidgetWithProgressiveLoading: Story = {
},
};
+export const OneToManyRelationCardWidgetCountsUnloadedRecords: Story = {
+ render: () => {
+ const mockPeople = generateMockPersonRecords(12);
+ const companyWithManyPeople = {
+ ...mockCompanyRecord,
+ people: mockPeople.map(({ id, __typename, name }) => ({
+ __typename,
+ id,
+ name,
+ })),
+ };
+
+ return renderFieldWidgetStory({
+ widget: buildFieldWidget({
+ id: 'widget-one-to-many-relation-card-unloaded-records',
+ title: 'People',
+ objectMetadataId: companyObjectMetadataItem.id,
+ fieldMetadataId: companyPeopleField.id,
+ fieldDisplayMode: FieldDisplayMode.CARD,
+ }),
+ objectMetadataId: companyObjectMetadataItem.id,
+ targetRecord: companyTargetRecord,
+ records: [
+ { id: TEST_RECORD_ID, record: companyWithManyPeople },
+ ...mockPeople.map((person) => ({ id: person.id, record: person })),
+ ],
+ MetadataAndApolloMocksWrapper:
+ JestMetadataAndApolloMocksWithPeopleCountWrapper,
+ });
+ },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+
+ await canvas.findByText('Jane Smith 1');
+
+ await waitFor(() => {
+ expect(
+ canvas.getByTestId('field-widget-show-more-button'),
+ ).toHaveTextContent('More (831)');
+ });
+
+ await userEvent.click(canvas.getByTestId('field-widget-show-more-button'));
+ await userEvent.click(canvas.getByTestId('field-widget-show-more-button'));
+
+ expect(await canvas.findByText('Jack White 12')).toBeVisible();
+ expect(
+ canvas.getByTestId('field-widget-show-more-button'),
+ ).toHaveTextContent('More (824)');
+ },
+};
+
export const NestedCurrencyPickerKeepsFieldOpen: Story = {
render: () => (
<>
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/hooks/useFieldWidgetRelationRecordsTotalCount.ts b/packages/twenty-front/src/modules/page-layout/widgets/field/hooks/useFieldWidgetRelationRecordsTotalCount.ts
new file mode 100644
index 00000000000..334f2124ade
--- /dev/null
+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/hooks/useFieldWidgetRelationRecordsTotalCount.ts
@@ -0,0 +1,92 @@
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
+import { useAggregateRecords } from '@/object-record/hooks/useAggregateRecords';
+import { type FieldRelationMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';
+import { AggregateOperations } from '@/object-record/record-table/constants/AggregateOperations';
+import {
+ FieldMetadataType,
+ type RecordGqlOperationFilter,
+} from 'twenty-shared/types';
+import {
+ computeMorphRelationGqlFieldName,
+ isDefined,
+} from 'twenty-shared/utils';
+import { RelationType } from '~/generated-metadata/graphql';
+
+type UseFieldWidgetRelationRecordsTotalCountParams = {
+ recordId: string;
+ relationFieldMetadata: FieldRelationMetadata;
+};
+
+export const useFieldWidgetRelationRecordsTotalCount = ({
+ recordId,
+ relationFieldMetadata,
+}: UseFieldWidgetRelationRecordsTotalCountParams) => {
+ const {
+ relationFieldMetadataId,
+ relationObjectMetadataNameSingular,
+ relationType,
+ objectMetadataNameSingular,
+ } = relationFieldMetadata;
+
+ const { objectMetadataItems } = useObjectMetadataItems();
+
+ const objectMetadataItem = objectMetadataItems.find(
+ ({ nameSingular }) => nameSingular === objectMetadataNameSingular,
+ );
+
+ const { objectMetadataItem: relationObjectMetadataItem } =
+ useObjectMetadataItem({
+ objectNameSingular: relationObjectMetadataNameSingular,
+ });
+
+ const relationFieldMetadataItem = relationObjectMetadataItem.fields.find(
+ ({ id }) => id === relationFieldMetadataId,
+ );
+
+ const isToManyObjects = relationType === RelationType.ONE_TO_MANY;
+
+ const getRelationGqlFieldName = () => {
+ if (!isDefined(relationFieldMetadataItem)) {
+ return undefined;
+ }
+
+ if (relationFieldMetadataItem.type !== FieldMetadataType.MORPH_RELATION) {
+ return relationFieldMetadataItem.name;
+ }
+
+ if (!isDefined(objectMetadataItem)) {
+ return undefined;
+ }
+
+ return computeMorphRelationGqlFieldName({
+ fieldName: relationFieldMetadataItem.name,
+ relationType: relationFieldMetadataItem.settings.relationType,
+ targetObjectMetadataNameSingular: objectMetadataItem.nameSingular,
+ targetObjectMetadataNamePlural: objectMetadataItem.namePlural,
+ });
+ };
+
+ const gqlFieldName = getRelationGqlFieldName();
+
+ const filter = isToManyObjects
+ ? ({
+ [`${gqlFieldName}Id`]: {
+ in: [recordId],
+ },
+ } satisfies RecordGqlOperationFilter)
+ : {};
+
+ const { data } = useAggregateRecords<{
+ id: { COUNT: number };
+ }>({
+ objectNameSingular: relationObjectMetadataNameSingular,
+ filter,
+ skip: !isToManyObjects || !isDefined(gqlFieldName),
+ recordGqlFieldsAggregate: {
+ id: [AggregateOperations.COUNT],
+ },
+ });
+
+ return { relationRecordsTotalCount: data?.id?.COUNT };
+};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/hooks/useFieldWidgetRelationSeeAllHref.ts b/packages/twenty-front/src/modules/page-layout/widgets/field/hooks/useFieldWidgetRelationSeeAllHref.ts
new file mode 100644
index 00000000000..0f9a65eaddf
--- /dev/null
+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/hooks/useFieldWidgetRelationSeeAllHref.ts
@@ -0,0 +1,59 @@
+import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
+import { type FieldRelationMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';
+import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';
+import { indexViewIdFromObjectMetadataItemFamilySelector } from '@/views/states/selectors/indexViewIdFromObjectMetadataItemFamilySelector';
+import { AppPath, ViewFilterOperand } from 'twenty-shared/types';
+import { getAppPath, isDefined } from 'twenty-shared/utils';
+
+type UseFieldWidgetRelationSeeAllHrefParams = {
+ recordId: string;
+ relationMetadata: FieldRelationMetadata | null;
+};
+
+export const useFieldWidgetRelationSeeAllHref = ({
+ recordId,
+ relationMetadata,
+}: UseFieldWidgetRelationSeeAllHrefParams) => {
+ const { objectMetadataItems } = useObjectMetadataItems();
+
+ const relationObjectMetadataItem = objectMetadataItems.find(
+ (item) =>
+ item.nameSingular ===
+ relationMetadata?.relationObjectMetadataNameSingular,
+ );
+
+ const relationFieldMetadataItem = relationObjectMetadataItem?.fields.find(
+ ({ id }) => id === relationMetadata?.relationFieldMetadataId,
+ );
+
+ const indexViewId = useAtomFamilySelectorValue(
+ indexViewIdFromObjectMetadataItemFamilySelector,
+ { objectMetadataItemId: relationObjectMetadataItem?.id ?? '' },
+ );
+
+ if (
+ !isDefined(relationObjectMetadataItem) ||
+ !isDefined(relationFieldMetadataItem)
+ ) {
+ return { seeAllHref: undefined, relationObjectMetadataItem: undefined };
+ }
+
+ const seeAllHref = getAppPath(
+ AppPath.RecordIndexPage,
+ {
+ objectNamePlural: relationObjectMetadataItem.namePlural,
+ },
+ {
+ filter: {
+ [relationFieldMetadataItem.name]: {
+ [ViewFilterOperand.IS]: {
+ selectedRecordIds: [recordId],
+ },
+ },
+ },
+ viewId: indexViewId,
+ },
+ );
+
+ return { seeAllHref, relationObjectMetadataItem };
+};
diff --git a/packages/twenty-front/src/testing/decorators/RecordStoreDecorator.tsx b/packages/twenty-front/src/testing/decorators/RecordStoreDecorator.tsx
deleted file mode 100644
index 726cb0b7ae7..00000000000
--- a/packages/twenty-front/src/testing/decorators/RecordStoreDecorator.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { type Decorator } from '@storybook/react-vite';
-import { useEffect } from 'react';
-
-import { useUpsertRecordsInStore } from '@/object-record/record-store/hooks/useUpsertRecordsInStore';
-
-export const RecordStoreDecorator: Decorator = (Story, context) => {
- const { records } = context.parameters;
-
- const { upsertRecordsInStore } = useUpsertRecordsInStore();
-
- useEffect(() => {
- upsertRecordsInStore({ partialRecords: records });
- });
-
- return <Story />;
-};