Skip to content

The open alternative to Salesforce, designed for AI.

Make relation table widgets follow junction relations (#25475)

Félix Malfaitee6a5c37cd9d
diff --git a/packages/twenty-front/src/modules/browser-event/hooks/useListenToObjectRecordOperationBrowserEvent.ts b/packages/twenty-front/src/modules/browser-event/hooks/useListenToObjectRecordOperationBrowserEvent.ts
index 799b0dcf5c1..68156541d20 100644
--- a/packages/twenty-front/src/modules/browser-event/hooks/useListenToObjectRecordOperationBrowserEvent.ts
+++ b/packages/twenty-front/src/modules/browser-event/hooks/useListenToObjectRecordOperationBrowserEvent.ts
@@ -8,14 +8,20 @@ export const useListenToObjectRecordOperationBrowserEvent = ({
onObjectRecordOperationBrowserEvent,
objectMetadataItemId,
operationTypes,
+ enabled = true,
}: {
onObjectRecordOperationBrowserEvent: (
detail: ObjectRecordOperationBrowserEventDetail,
) => void;
objectMetadataItemId?: string;
operationTypes?: ObjectRecordOperation['type'][];
+ enabled?: boolean;
}) => {
useEffect(() => {
+ if (!enabled) {
+ return;
+ }
+
const handleObjectRecordOperationEvent = (event: Event) => {
const detail = (
event as CustomEvent<ObjectRecordOperationBrowserEventDetail>
@@ -50,6 +56,7 @@ export const useListenToObjectRecordOperationBrowserEvent = ({
);
};
}, [
+ enabled,
objectMetadataItemId,
onObjectRecordOperationBrowserEvent,
operationTypes,
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeader.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeader.tsx
index 9b2e0339b25..e0549e5bbdf 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeader.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnHeader.tsx
@@ -150,17 +150,18 @@ export const RecordBoardColumnHeader = () => {
const recordTableWidgetContext = useContext(RecordTableWidgetContext);
- // Creating in a nested relation widget requires picking the related record
- // to create through, which only the table layout offers today.
- const nestedRelationCreateThrough =
- recordTableWidgetContext?.nestedRelationCreateThrough;
+ // Creating in a nested relation or junction widget requires picking the
+ // related record, which only the table layout offers today.
+ const isCreateThroughRelationWidget =
+ isDefined(recordTableWidgetContext?.nestedRelationCreateThrough) ||
+ isDefined(recordTableWidgetContext?.junctionCreateThrough);
const isRecordBoardCellsNonEditable = useAtomComponentStateValue(
isRecordBoardCellsNonEditableComponentState,
);
const canCreateRecords =
- !isDefined(nestedRelationCreateThrough) &&
+ !isCreateThroughRelationWidget &&
!isRecordBoardCellsNonEditable &&
canCreateRecordsForObjectMetadataItem({
objectPermissions,
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnNewRecordButton.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnNewRecordButton.tsx
index 91aeb06a52c..dbb41bc01c4 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnNewRecordButton.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-column/components/RecordBoardColumnNewRecordButton.tsx
@@ -56,13 +56,14 @@ export const RecordBoardColumnNewRecordButton = () => {
objectMetadataItem: objectMetadataItem,
});
- // Creating in a nested relation widget requires picking the related record
- // to create through, which only the table layout offers today.
- const nestedRelationCreateThrough = useContext(
- RecordTableWidgetContext,
- )?.nestedRelationCreateThrough;
+ // Creating in a nested relation or junction widget requires picking the
+ // related record, which only the table layout offers today.
+ const recordTableWidgetContext = useContext(RecordTableWidgetContext);
- if (isDefined(nestedRelationCreateThrough)) {
+ if (
+ isDefined(recordTableWidgetContext?.nestedRelationCreateThrough) ||
+ isDefined(recordTableWidgetContext?.junctionCreateThrough)
+ ) {
return null;
}
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarAddNew.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarAddNew.tsx
index 4b652a2dfaf..eac996e7370 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarAddNew.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarAddNew.tsx
@@ -68,14 +68,13 @@ export const RecordCalendarAddNew = ({
})
: false;
- // Creating in a nested relation widget requires picking the related record
- // to create through, which only the table layout offers today.
- const nestedRelationCreateThrough = useContext(
- RecordTableWidgetContext,
- )?.nestedRelationCreateThrough;
+ // Creating in a nested relation or junction widget requires picking the
+ // related record, which only the table layout offers today.
+ const recordTableWidgetContext = useContext(RecordTableWidgetContext);
if (
- isDefined(nestedRelationCreateThrough) ||
+ isDefined(recordTableWidgetContext?.nestedRelationCreateThrough) ||
+ isDefined(recordTableWidgetContext?.junctionCreateThrough) ||
isRecordCalendarReadOnly ||
hasAnySoftDeleteFilterOnView === true ||
!canCreateRecordsForObjectMetadataItem({
diff --git a/packages/twenty-front/src/modules/object-record/record-filter/utils/__tests__/isRecordMatchingFilter.test.ts b/packages/twenty-front/src/modules/object-record/record-filter/utils/__tests__/isRecordMatchingFilter.test.ts
index ced20b6b588..206172964f9 100644
--- a/packages/twenty-front/src/modules/object-record/record-filter/utils/__tests__/isRecordMatchingFilter.test.ts
+++ b/packages/twenty-front/src/modules/object-record/record-filter/utils/__tests__/isRecordMatchingFilter.test.ts
@@ -735,6 +735,47 @@ describe('isRecordMatchingFilter', () => {
).toBe(false);
});
+ it('matches a to-many relation when any loaded related record satisfies the nested filter', () => {
+ const personMockObjectMetadataItem = objectMetadataItems.find(
+ (item) => item.nameSingular === 'person',
+ )!;
+
+ const filter = {
+ pointOfContactForOpportunities: {
+ id: { eq: opportunityWithPointOfContact.id },
+ },
+ } as RecordGqlOperationFilter;
+
+ const personWithOpportunities = {
+ id: personId,
+ pointOfContactForOpportunities: [
+ { id: '20202020-0000-4000-8000-000000000001' },
+ { id: opportunityWithPointOfContact.id },
+ ],
+ };
+
+ expect(
+ isRecordMatchingFilter({
+ record: personWithOpportunities,
+ filter,
+ objectMetadataItem: personMockObjectMetadataItem,
+ objectMetadataItems,
+ }),
+ ).toBe(true);
+
+ expect(
+ isRecordMatchingFilter({
+ record: {
+ ...personWithOpportunities,
+ pointOfContactForOpportunities: [],
+ },
+ filter,
+ objectMetadataItem: personMockObjectMetadataItem,
+ objectMetadataItems,
+ }),
+ ).toBe(false);
+ });
+
it('evaluates composite conditions against the related record', () => {
const filter = {
pointOfContact: {
@@ -824,7 +865,7 @@ describe('isRecordMatchingFilter', () => {
).toBe(true);
});
- it('does not match a nested filter on a list of related records', () => {
+ it('matches a nested filter on a list of related records when one of them satisfies it', () => {
const filter = {
people: { id: { eq: personId } },
} as RecordGqlOperationFilter;
@@ -839,6 +880,18 @@ describe('isRecordMatchingFilter', () => {
objectMetadataItem: companyMockObjectMetadataItem,
objectMetadataItems,
}),
+ ).toBe(true);
+
+ expect(
+ isRecordMatchingFilter({
+ record: {
+ ...companiesMock[0],
+ people: [{ id: '20202020-0000-4000-8000-000000000001' }],
+ },
+ filter,
+ objectMetadataItem: companyMockObjectMetadataItem,
+ objectMetadataItems,
+ }),
).toBe(false);
});
});
diff --git a/packages/twenty-front/src/modules/object-record/record-filter/utils/isRecordMatchingFilter.ts b/packages/twenty-front/src/modules/object-record/record-filter/utils/isRecordMatchingFilter.ts
index 67e4195fd77..30b0b5a0f59 100644
--- a/packages/twenty-front/src/modules/object-record/record-filter/utils/isRecordMatchingFilter.ts
+++ b/packages/twenty-front/src/modules/object-record/record-filter/utils/isRecordMatchingFilter.ts
@@ -136,7 +136,7 @@ const isRecordMatchingNestedRelationFilter = ({
return false;
}
- if (!isObject(relationRecord) || Array.isArray(relationRecord)) {
+ if (!isObject(relationRecord)) {
return isWithinNegatedFilter;
}
@@ -150,13 +150,25 @@ const isRecordMatchingNestedRelationFilter = ({
return isWithinNegatedFilter;
}
- return isRecordMatchingFilter({
- record: relationRecord,
- filter: nestedFilter,
- objectMetadataItem: relationTargetObjectMetadataItem,
- objectMetadataItems,
- isWithinNegatedFilter,
- });
+ const isRecordMatchingNestedFilter = (record: unknown) =>
+ isRecordMatchingFilter({
+ record,
+ filter: nestedFilter,
+ objectMetadataItem: relationTargetObjectMetadataItem,
+ objectMetadataItems,
+ isWithinNegatedFilter,
+ });
+
+ // A to-many relation matches when any of its loaded records does, the way
+ // the backend EXISTS does.
+ if (Array.isArray(relationRecord)) {
+ return relationRecord.some(
+ (relatedRecord) =>
+ isObject(relatedRecord) && isRecordMatchingNestedFilter(relatedRecord),
+ );
+ }
+
+ return isRecordMatchingNestedFilter(relationRecord);
};
export const isRecordMatchingFilter = ({
diff --git a/packages/twenty-front/src/modules/object-record/record-index/hooks/useRecordIndexTableQuery.ts b/packages/twenty-front/src/modules/object-record/record-index/hooks/useRecordIndexTableQuery.ts
index 60427ea0205..145f38515c3 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/hooks/useRecordIndexTableQuery.ts
+++ b/packages/twenty-front/src/modules/object-record/record-index/hooks/useRecordIndexTableQuery.ts
@@ -22,6 +22,7 @@ export const useRecordIndexTableQuery = (objectNameSingular: string) => {
error,
totalCount,
fetchMoreRecords,
+ refetch,
} = useFindManyRecords({
...params,
recordGqlFields,
@@ -35,5 +36,6 @@ export const useRecordIndexTableQuery = (objectNameSingular: string) => {
queryIdentifier,
totalCount,
fetchMoreRecords,
+ refetch,
};
};
diff --git a/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetJunctionAddNewRow.tsx b/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetJunctionAddNewRow.tsx
new file mode 100644
index 00000000000..4d5a3656fdb
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetJunctionAddNewRow.tsx
@@ -0,0 +1,81 @@
+import { useObjectMetadataItemById } from '@/object-metadata/hooks/useObjectMetadataItemById';
+import { useObjectPermissionsForObject } from '@/object-record/hooks/useObjectPermissionsForObject';
+import { isObjectMetadataReadOnly } from '@/object-record/read-only/utils/isObjectMetadataReadOnly';
+import { RecordTableActionRow } from '@/object-record/record-table/record-table-row/components/RecordTableActionRow';
+import { RecordTableWidgetRelationPickerDropdownContent } from '@/object-record/record-table-widget/components/RecordTableWidgetRelationPickerDropdownContent';
+import { type RecordTableWidgetJunctionCreateThrough } from '@/object-record/record-table-widget/contexts/RecordTableWidgetContext';
+import { useCreateJunctionRecordFromTableWidget } from '@/object-record/record-table-widget/hooks/useCreateJunctionRecordFromTableWidget';
+import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
+import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
+import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
+import { t } from '@lingui/core/macro';
+import { type RecordGqlOperationFilter } from 'twenty-shared/types';
+import { IconPlus } from 'twenty-ui/icon';
+import { logError } from '~/utils/logError';
+
+type RecordTableWidgetJunctionAddNewRowProps = {
+ dropdownId: string;
+ junctionCreateThrough: RecordTableWidgetJunctionCreateThrough;
+ targetRecordsFilter?: RecordGqlOperationFilter;
+};
+
+export const RecordTableWidgetJunctionAddNewRow = ({
+ dropdownId,
+ junctionCreateThrough,
+ targetRecordsFilter = junctionCreateThrough.targetRecordsFilter,
+}: RecordTableWidgetJunctionAddNewRowProps) => {
+ const { closeDropdown } = useCloseDropdown();
+ const { enqueueErrorSnackBar } = useSnackBar();
+
+ const { objectMetadataItem: junctionObjectMetadataItem } =
+ useObjectMetadataItemById({
+ objectId: junctionCreateThrough.junctionObjectMetadataId,
+ });
+
+ const junctionObjectPermissions = useObjectPermissionsForObject(
+ junctionCreateThrough.junctionObjectMetadataId,
+ );
+
+ const { createJunctionRecord } = useCreateJunctionRecordFromTableWidget({
+ junctionCreateThrough,
+ });
+
+ // Linking an existing record only writes the junction object, so the
+ // junction's own permissions gate the row rather than the target object's.
+ if (
+ isObjectMetadataReadOnly({
+ objectPermissions: junctionObjectPermissions,
+ objectMetadataItem: junctionObjectMetadataItem,
+ })
+ ) {
+ return null;
+ }
+
+ const handleTargetRecordSelected = (targetRecordId: string) => {
+ closeDropdown(dropdownId);
+ createJunctionRecord(targetRecordId).catch((error) => {
+ logError(error);
+ enqueueErrorSnackBar({ message: t`Failed to add record` });
+ });
+ };
+
+ return (
+ <Dropdown
+ dropdownId={dropdownId}
+ dropdownPlacement="bottom-start"
+ clickableComponentWidth="100%"
+ clickableComponent={
+ <RecordTableActionRow LeftIcon={IconPlus} text={t`Add New`} />
+ }
+ dropdownComponents={
+ <RecordTableWidgetRelationPickerDropdownContent
+ objectNameSingular={
+ junctionCreateThrough.targetObjectMetadataNameSingular
+ }
+ recordsFilter={targetRecordsFilter}
+ onRelationRecordSelected={handleTargetRecordSelected}
+ />
+ }
+ />
+ );
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetNestedRelationAddNewRow.tsx b/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetNestedRelationAddNewRow.tsx
index c2f65c5d4e7..e8ffc8da578 100644
--- a/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetNestedRelationAddNewRow.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetNestedRelationAddNewRow.tsx
@@ -1,5 +1,5 @@
import { RecordTableActionRow } from '@/object-record/record-table/record-table-row/components/RecordTableActionRow';
-import { RecordTableWidgetNestedRelationPickerDropdownContent } from '@/object-record/record-table-widget/components/RecordTableWidgetNestedRelationPickerDropdownContent';
+import { RecordTableWidgetRelationPickerDropdownContent } from '@/object-record/record-table-widget/components/RecordTableWidgetRelationPickerDropdownContent';
import { type RecordTableWidgetNestedRelationCreateThrough } from '@/object-record/record-table-widget/contexts/RecordTableWidgetContext';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
@@ -33,8 +33,11 @@ export const RecordTableWidgetNestedRelationAddNewRow = ({
<RecordTableActionRow LeftIcon={IconPlus} text={t`Add New`} />
}
dropdownComponents={
- <RecordTableWidgetNestedRelationPickerDropdownContent
- nestedRelationCreateThrough={nestedRelationCreateThrough}
+ <RecordTableWidgetRelationPickerDropdownContent
+ objectNameSingular={
+ nestedRelationCreateThrough.relationObjectMetadataNameSingular
+ }
+ recordsFilter={nestedRelationCreateThrough.relationRecordsFilter}
onRelationRecordSelected={handleRelationRecordSelected}
/>
}
diff --git a/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetProvider.tsx b/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetProvider.tsx
index 115cbd16380..9198bb85dde 100644
--- a/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetProvider.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetProvider.tsx
@@ -11,6 +11,7 @@ import { RecordTableWidgetViewLoadEffect } from '@/object-record/record-table-wi
import { MISSING_RECORD_TABLE_WIDGET_PAGE_LAYOUT_ID } from '@/object-record/record-table-widget/constants/MissingRecordTableWidgetPageLayoutId';
import {
RecordTableWidgetContext,
+ type RecordTableWidgetJunctionCreateThrough,
type RecordTableWidgetNestedRelationCreateThrough,
} from '@/object-record/record-table-widget/contexts/RecordTableWidgetContext';
import { useIsPageLayoutInEditMode } from '@/page-layout/hooks/useIsPageLayoutInEditMode';
@@ -33,6 +34,7 @@ type RecordTableWidgetProviderProps = PropsWithChildren<{
instanceIdSuffix?: string;
contextStoreViewType?: ContextStoreViewType;
nestedRelationCreateThrough?: RecordTableWidgetNestedRelationCreateThrough;
+ junctionCreateThrough?: RecordTableWidgetJunctionCreateThrough;
}>;
export const RecordTableWidgetProvider = ({
@@ -43,6 +45,7 @@ export const RecordTableWidgetProvider = ({
instanceIdSuffix,
contextStoreViewType,
nestedRelationCreateThrough,
+ junctionCreateThrough,
children,
}: RecordTableWidgetProviderProps) => {
const { objectMetadataItem } = useObjectMetadataItem({
@@ -113,6 +116,7 @@ export const RecordTableWidgetProvider = ({
pageLayoutId,
widgetId,
nestedRelationCreateThrough,
+ junctionCreateThrough,
updateViewDraftField,
updateViewDraft,
}),
@@ -121,6 +125,7 @@ export const RecordTableWidgetProvider = ({
pageLayoutId,
widgetId,
nestedRelationCreateThrough,
+ junctionCreateThrough,
updateViewDraftField,
updateViewDraft,
],
diff --git a/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetNestedRelationPickerDropdownContent.tsx b/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetRelationPickerDropdownContent.tsx
similarity index 76%
rename from packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetNestedRelationPickerDropdownContent.tsx
rename to packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetRelationPickerDropdownContent.tsx
index 4accf506a8f..bb67b5e285a 100644
--- a/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetNestedRelationPickerDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetRelationPickerDropdownContent.tsx
@@ -1,7 +1,6 @@
import { RecordPickerLoadingSkeletonList } from '@/object-record/record-picker/components/RecordPickerLoadingSkeletonList';
import { RecordPickerNoRecordFoundMenuItem } from '@/object-record/record-picker/components/RecordPickerNoRecordFoundMenuItem';
-import { RecordTableWidgetNestedRelationPickerMenuItem } from '@/object-record/record-table-widget/components/RecordTableWidgetNestedRelationPickerMenuItem';
-import { type RecordTableWidgetNestedRelationCreateThrough } from '@/object-record/record-table-widget/contexts/RecordTableWidgetContext';
+import { RecordTableWidgetRelationPickerMenuItem } from '@/object-record/record-table-widget/components/RecordTableWidgetRelationPickerMenuItem';
import { useRecordsForSelect } from '@/object-record/select/hooks/useRecordsForSelect';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
@@ -12,16 +11,19 @@ import { SelectableList } from '@/ui/layout/selectable-list/components/Selectabl
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
import { t } from '@lingui/core/macro';
import { useState } from 'react';
+import { type RecordGqlOperationFilter } from 'twenty-shared/types';
-type RecordTableWidgetNestedRelationPickerDropdownContentProps = {
- nestedRelationCreateThrough: RecordTableWidgetNestedRelationCreateThrough;
+type RecordTableWidgetRelationPickerDropdownContentProps = {
+ objectNameSingular: string;
+ recordsFilter: RecordGqlOperationFilter;
onRelationRecordSelected: (relationRecordId: string) => void;
};
-export const RecordTableWidgetNestedRelationPickerDropdownContent = ({
- nestedRelationCreateThrough,
+export const RecordTableWidgetRelationPickerDropdownContent = ({
+ objectNameSingular,
+ recordsFilter,
onRelationRecordSelected,
-}: RecordTableWidgetNestedRelationPickerDropdownContentProps) => {
+}: RecordTableWidgetRelationPickerDropdownContentProps) => {
const [searchFilter, setSearchFilter] = useState('');
const dropdownId = useAvailableComponentInstanceIdOrThrow(
@@ -31,10 +33,9 @@ export const RecordTableWidgetNestedRelationPickerDropdownContent = ({
const { recordsToSelect, loading } = useRecordsForSelect({
searchFilterText: searchFilter,
selectedIds: [],
- objectNameSingular:
- nestedRelationCreateThrough.relationObjectMetadataNameSingular,
+ objectNameSingular,
allowRequestsToTwentyIcons: true,
- filter: nestedRelationCreateThrough.relationRecordsFilter,
+ filter: recordsFilter,
});
return (
@@ -60,7 +61,7 @@ export const RecordTableWidgetNestedRelationPickerDropdownContent = ({
) : (
<>
{recordsToSelect.map((relationRecord) => (
- <RecordTableWidgetNestedRelationPickerMenuItem
+ <RecordTableWidgetRelationPickerMenuItem
key={relationRecord.id}
relationRecord={relationRecord}
onSelect={onRelationRecordSelected}
diff --git a/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetNestedRelationPickerMenuItem.tsx b/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetRelationPickerMenuItem.tsx
similarity index 91%
rename from packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetNestedRelationPickerMenuItem.tsx
rename to packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetRelationPickerMenuItem.tsx
index 9ba3a81e6de..385cadcc9cb 100644
--- a/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetNestedRelationPickerMenuItem.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetRelationPickerMenuItem.tsx
@@ -9,15 +9,15 @@ import { Avatar } from 'twenty-ui/data-display';
import { MenuItemSelectAvatar } from 'twenty-ui/navigation';
import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';
-type RecordTableWidgetNestedRelationPickerMenuItemProps = {
+type RecordTableWidgetRelationPickerMenuItemProps = {
relationRecord: SelectableItem;
onSelect: (relationRecordId: string) => void;
};
-export const RecordTableWidgetNestedRelationPickerMenuItem = ({
+export const RecordTableWidgetRelationPickerMenuItem = ({
relationRecord,
onSelect,
-}: RecordTableWidgetNestedRelationPickerMenuItemProps) => {
+}: RecordTableWidgetRelationPickerMenuItemProps) => {
const dropdownId = useAvailableComponentInstanceIdOrThrow(
DropdownComponentInstanceContext,
);
diff --git a/packages/twenty-front/src/modules/object-record/record-table-widget/contexts/RecordTableWidgetContext.ts b/packages/twenty-front/src/modules/object-record/record-table-widget/contexts/RecordTableWidgetContext.ts
index 234602d8c33..7c0dad0b08d 100644
--- a/packages/twenty-front/src/modules/object-record/record-table-widget/contexts/RecordTableWidgetContext.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table-widget/contexts/RecordTableWidgetContext.ts
@@ -13,11 +13,25 @@ export type RecordTableWidgetNestedRelationCreateThrough = {
nestedRelationJoinColumnName: string;
};
+// A junction relation widget lists the records behind the junction, so adding
+// one means picking an existing target record and creating the junction
+// record linking it to the current record, not creating a target record.
+export type RecordTableWidgetJunctionCreateThrough = {
+ junctionObjectMetadataId: string;
+ junctionObjectMetadataNameSingular: string;
+ sourceJoinColumnName: string;
+ sourceRecordId: string;
+ targetJoinColumnName: string;
+ targetObjectMetadataNameSingular: string;
+ targetRecordsFilter: RecordGqlOperationFilter;
+};
+
export type RecordTableWidgetContextValue = {
isPageLayoutInEditMode: boolean;
pageLayoutId?: string;
widgetId: string;
nestedRelationCreateThrough?: RecordTableWidgetNestedRelationCreateThrough;
+ junctionCreateThrough?: RecordTableWidgetJunctionCreateThrough;
updateViewDraftField: (
viewFieldId: string,
update: {
diff --git a/packages/twenty-front/src/modules/object-record/record-table-widget/hooks/useCreateJunctionRecordFromTableWidget.ts b/packages/twenty-front/src/modules/object-record/record-table-widget/hooks/useCreateJunctionRecordFromTableWidget.ts
new file mode 100644
index 00000000000..35f9cd7bae6
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table-widget/hooks/useCreateJunctionRecordFromTableWidget.ts
@@ -0,0 +1,34 @@
+import { useCreateManyRecords } from '@/object-record/hooks/useCreateManyRecords';
+import { type RecordTableWidgetJunctionCreateThrough } from '@/object-record/record-table-widget/contexts/RecordTableWidgetContext';
+import { useCallback } from 'react';
+
+export const useCreateJunctionRecordFromTableWidget = ({
+ junctionCreateThrough,
+}: {
+ junctionCreateThrough: RecordTableWidgetJunctionCreateThrough;
+}) => {
+ const { createManyRecords } = useCreateManyRecords({
+ objectNameSingular:
+ junctionCreateThrough.junctionObjectMetadataNameSingular,
+ });
+
+ // Upserting keeps a pick idempotent when the picker excluded a record that
+ // was linked meanwhile, the way the junction field input links records.
+ const createJunctionRecord = useCallback(
+ async (targetRecordId: string) => {
+ await createManyRecords({
+ recordsToCreate: [
+ {
+ [junctionCreateThrough.sourceJoinColumnName]:
+ junctionCreateThrough.sourceRecordId,
+ [junctionCreateThrough.targetJoinColumnName]: targetRecordId,
+ },
+ ],
+ upsert: true,
+ });
+ },
+ [createManyRecords, junctionCreateThrough],
+ );
+
+ return { createJunctionRecord };
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-table-widget/hooks/useListenToJunctionRecordOperation.ts b/packages/twenty-front/src/modules/object-record/record-table-widget/hooks/useListenToJunctionRecordOperation.ts
new file mode 100644
index 00000000000..d16b7eef9fd
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table-widget/hooks/useListenToJunctionRecordOperation.ts
@@ -0,0 +1,50 @@
+import { useListenToObjectRecordOperationBrowserEvent } from '@/browser-event/hooks/useListenToObjectRecordOperationBrowserEvent';
+import { type ObjectRecordOperationBrowserEventDetail } from '@/browser-event/types/ObjectRecordOperationBrowserEventDetail';
+import { RecordTableWidgetContext } from '@/object-record/record-table-widget/contexts/RecordTableWidgetContext';
+import { useContext } from 'react';
+import { isDefined } from 'twenty-shared/utils';
+
+// A junction widget's rows come and go with junction records, which are
+// written on another object than the one the table lists.
+export const useListenToJunctionRecordOperation = ({
+ onJunctionRecordOperation,
+}: {
+ onJunctionRecordOperation: () => void;
+}) => {
+ const junctionCreateThrough = useContext(
+ RecordTableWidgetContext,
+ )?.junctionCreateThrough;
+
+ const handleJunctionRecordOperation = ({
+ operation,
+ }: ObjectRecordOperationBrowserEventDetail) => {
+ if (!isDefined(junctionCreateThrough)) {
+ return;
+ }
+
+ // Only operations carrying the written record can be scoped to the
+ // widget's source record; the others may concern it, so they refresh.
+ const writtenRecord =
+ operation.type === 'create-one'
+ ? operation.createdRecord
+ : operation.type === 'restore-one'
+ ? operation.restoredRecord
+ : undefined;
+
+ if (
+ isDefined(writtenRecord) &&
+ writtenRecord[junctionCreateThrough.sourceJoinColumnName] !==
+ junctionCreateThrough.sourceRecordId
+ ) {
+ return;
+ }
+
+ onJunctionRecordOperation();
+ };
+
+ useListenToObjectRecordOperationBrowserEvent({
+ onObjectRecordOperationBrowserEvent: handleJunctionRecordOperation,
+ objectMetadataItemId: junctionCreateThrough?.junctionObjectMetadataId,
+ enabled: isDefined(junctionCreateThrough),
+ });
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableEmpty.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableEmpty.tsx
index e075ba249f2..c93b8be45ba 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableEmpty.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableEmpty.tsx
@@ -19,6 +19,7 @@ import { resizeFieldOffsetComponentState } from '@/object-record/record-table/st
import { useRecordTableFirstColumnWidthOverride } from '@/object-record/record-table/hooks/useRecordTableFirstColumnWidthOverride';
import { computeVisibleRecordFieldsWidthOnTable } from '@/object-record/record-table/utils/computeVisibleRecordFieldsWidthOnTable';
import { RecordTableVirtualizedDataChangedEffect } from '@/object-record/record-table/virtualization/components/RecordTableVirtualizedDataChangedEffect';
+import { RecordTableVirtualizedJunctionDataChangedEffect } from '@/object-record/record-table/virtualization/components/RecordTableVirtualizedJunctionDataChangedEffect';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { styled } from '@linaria/react';
import { useMemo } from 'react';
@@ -132,6 +133,7 @@ export const RecordTableEmpty = ({ tableBodyRef }: RecordTableEmptyProps) => {
<RecordTableColumnWidthEffect />
<RecordTableWidthEffect />
<RecordTableVirtualizedDataChangedEffect />
+ <RecordTableVirtualizedJunctionDataChangedEffect />
</StyledEmptyStateContainer>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupAddNew.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupAddNew.tsx
index f10dc42a325..a36d92a5a3b 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupAddNew.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableNoRecordGroupAddNew.tsx
@@ -5,6 +5,7 @@ import { useRecordTableContextOrThrow } from '@/object-record/record-table/conte
import { useCreateNewIndexRecord } from '@/object-record/record-table/hooks/useCreateNewIndexRecord';
import { isRecordTableCellsNonEditableComponentState } from '@/object-record/record-table/states/isRecordTableCellsNonEditableComponentState';
import { RecordTableActionRow } from '@/object-record/record-table/record-table-row/components/RecordTableActionRow';
+import { RecordTableWidgetJunctionAddNewRow } from '@/object-record/record-table-widget/components/RecordTableWidgetJunctionAddNewRow';
import { RecordTableWidgetNestedRelationAddNewRow } from '@/object-record/record-table-widget/components/RecordTableWidgetNestedRelationAddNewRow';
import { RecordTableWidgetContext } from '@/object-record/record-table-widget/contexts/RecordTableWidgetContext';
import { canCreateRecordsForObjectMetadataItem } from '@/object-record/utils/canCreateRecordsForObjectMetadataItem';
@@ -21,9 +22,10 @@ import { IconPlus } from 'twenty-ui/icon';
export const RecordTableNoRecordGroupAddNew = () => {
const { objectMetadataItem, recordTableId } = useRecordTableContextOrThrow();
- const nestedRelationCreateThrough = useContext(
- RecordTableWidgetContext,
- )?.nestedRelationCreateThrough;
+ const recordTableWidgetContext = useContext(RecordTableWidgetContext);
+ const nestedRelationCreateThrough =
+ recordTableWidgetContext?.nestedRelationCreateThrough;
+ const junctionCreateThrough = recordTableWidgetContext?.junctionCreateThrough;
const isRecordTableCellsNonEditable = useAtomComponentStateValue(
isRecordTableCellsNonEditableComponentState,
@@ -80,6 +82,17 @@ export const RecordTableNoRecordGroupAddNew = () => {
return null;
}
+ // Linking through a junction never creates a record of the table's object,
+ // so the target object's creatability does not apply.
+ if (isDefined(junctionCreateThrough)) {
+ return (
+ <RecordTableWidgetJunctionAddNewRow
+ dropdownId={`${recordTableId}-junction-add-new`}
+ junctionCreateThrough={junctionCreateThrough}
+ />
+ );
+ }
+
if (
!canCreateRecordsForObjectMetadataItem({
objectPermissions,
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableNoRecordGroupBody.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableNoRecordGroupBody.tsx
index 870a5731131..835d27699ed 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableNoRecordGroupBody.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableNoRecordGroupBody.tsx
@@ -9,6 +9,7 @@ import { RecordTableCellPortals } from '@/object-record/record-table/record-tabl
import { RecordTableAggregateFooter } from '@/object-record/record-table/record-table-footer/components/RecordTableAggregateFooter';
import { isRecordTableInitialLoadingComponentState } from '@/object-record/record-table/states/isRecordTableInitialLoadingComponentState';
import { RecordTableVirtualizedDataChangedEffect } from '@/object-record/record-table/virtualization/components/RecordTableVirtualizedDataChangedEffect';
+import { RecordTableVirtualizedJunctionDataChangedEffect } from '@/object-record/record-table/virtualization/components/RecordTableVirtualizedJunctionDataChangedEffect';
import { RecordTableVirtualizedSSESubscribeEffect } from '@/object-record/record-table/virtualization/components/RecordTableVirtualizedSSESubscribeEffect';
import { RecordTableVirtualizedRowTreadmillEffect } from '@/object-record/record-table/virtualization/components/RecordTableVirtualizedRowTreadmillEffect';
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
@@ -39,6 +40,7 @@ export const RecordTableNoRecordGroupBody = () => {
)}
<RecordTableVirtualizedRowTreadmillEffect />
<RecordTableVirtualizedDataChangedEffect />
+ <RecordTableVirtualizedJunctionDataChangedEffect />
<RecordTableVirtualizedSSESubscribeEffect />
</RecordTableBodyNoRecordGroupDragDropContextProvider>
</RecordTableNoRecordGroupBodyContextProvider>
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableRecordGroupBodyEffects.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableRecordGroupBodyEffects.tsx
index ff0455f019f..ca09728b9fa 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableRecordGroupBodyEffects.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableRecordGroupBodyEffects.tsx
@@ -1,16 +1,25 @@
import { RecordGroupContext } from '@/object-record/record-group/states/context/RecordGroupContext';
import { recordGroupIdsComponentState } from '@/object-record/record-group/states/recordGroupIdsComponentState';
+import { RecordTableWidgetContext } from '@/object-record/record-table-widget/contexts/RecordTableWidgetContext';
import { RecordTableRecordGroupBodyEffect } from '@/object-record/record-table/record-table-body/components/RecordTableRecordGroupBodyEffect';
+import { RecordTableRecordGroupJunctionDataChangedEffect } from '@/object-record/record-table/record-table-body/components/RecordTableRecordGroupJunctionDataChangedEffect';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
+import { useContext } from 'react';
+import { isDefined } from 'twenty-shared/utils';
export const RecordTableRecordGroupBodyEffects = () => {
const recordGroupIds = useAtomComponentStateValue(
recordGroupIdsComponentState,
);
+ const isJunctionTable = isDefined(
+ useContext(RecordTableWidgetContext)?.junctionCreateThrough,
+ );
+
return recordGroupIds.map((recordGroupId) => (
<RecordGroupContext.Provider key={recordGroupId} value={{ recordGroupId }}>
<RecordTableRecordGroupBodyEffect />
+ {isJunctionTable && <RecordTableRecordGroupJunctionDataChangedEffect />}
</RecordGroupContext.Provider>
));
};
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableRecordGroupJunctionDataChangedEffect.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableRecordGroupJunctionDataChangedEffect.tsx
new file mode 100644
index 00000000000..359ff357f73
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableRecordGroupJunctionDataChangedEffect.tsx
@@ -0,0 +1,29 @@
+import { useRecordIndexTableQuery } from '@/object-record/record-index/hooks/useRecordIndexTableQuery';
+import { useListenToJunctionRecordOperation } from '@/object-record/record-table-widget/hooks/useListenToJunctionRecordOperation';
+import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';
+import { SSE_TABLE_DEBOUNCE_TIME_IN_MS_TO_AVOID_SSE_OWN_EVENTS_RACE_CONDITION } from '@/object-record/record-table/virtualization/constants/SseTableDebounceTimeInMsToAvoidSseOwnEventsRaceCondition';
+import { useDebouncedCallback } from 'use-debounce';
+
+// Grouped tables are not virtualized: their rows come from the group query,
+// which the junction write does not touch, so the query is refetched.
+export const RecordTableRecordGroupJunctionDataChangedEffect = () => {
+ const { objectNameSingular } = useRecordTableContextOrThrow();
+
+ const { refetch } = useRecordIndexTableQuery(objectNameSingular);
+
+ const debouncedRefetch = useDebouncedCallback(
+ () => {
+ refetch();
+ },
+ SSE_TABLE_DEBOUNCE_TIME_IN_MS_TO_AVOID_SSE_OWN_EVENTS_RACE_CONDITION,
+ {
+ leading: false,
+ },
+ );
+
+ useListenToJunctionRecordOperation({
+ onJunctionRecordOperation: debouncedRefetch,
+ });
+
+ return <></>;
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionAddNew.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionAddNew.tsx
index 16543fbf188..fe7bdf38642 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionAddNew.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionAddNew.tsx
@@ -1,15 +1,18 @@
import { useObjectPermissionsForObject } from '@/object-record/hooks/useObjectPermissionsForObject';
import { useCurrentRecordGroupId } from '@/object-record/record-group/hooks/useCurrentRecordGroupId';
+import { useRecordGroupFilter } from '@/object-record/record-group/hooks/useRecordGroupFilter';
import { recordGroupDefinitionFamilyState } from '@/object-record/record-group/states/recordGroupDefinitionFamilyState';
import { getFieldMetadataItemGqlFieldName } from '@/object-metadata/utils/getFieldMetadataItemGqlFieldName';
import { recordIndexGroupFieldMetadataItemComponentState } from '@/object-record/record-index/states/recordIndexGroupFieldMetadataComponentState';
import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';
import { useCreateNewIndexRecord } from '@/object-record/record-table/hooks/useCreateNewIndexRecord';
import { RecordTableActionRow } from '@/object-record/record-table/record-table-row/components/RecordTableActionRow';
+import { RecordTableWidgetJunctionAddNewRow } from '@/object-record/record-table-widget/components/RecordTableWidgetJunctionAddNewRow';
import { RecordTableWidgetNestedRelationAddNewRow } from '@/object-record/record-table-widget/components/RecordTableWidgetNestedRelationAddNewRow';
import { RecordTableWidgetContext } from '@/object-record/record-table-widget/contexts/RecordTableWidgetContext';
import { isRecordTableCellsNonEditableComponentState } from '@/object-record/record-table/states/isRecordTableCellsNonEditableComponentState';
import { canCreateRecordsForObjectMetadataItem } from '@/object-record/utils/canCreateRecordsForObjectMetadataItem';
+import { makeAndFilterVariables } from '@/object-record/utils/makeAndFilterVariables';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';
import { t } from '@lingui/core/macro';
@@ -21,9 +24,10 @@ import { IconPlus } from 'twenty-ui/icon';
export const RecordTableRecordGroupSectionAddNew = () => {
const { objectMetadataItem, recordTableId } = useRecordTableContextOrThrow();
- const nestedRelationCreateThrough = useContext(
- RecordTableWidgetContext,
- )?.nestedRelationCreateThrough;
+ const recordTableWidgetContext = useContext(RecordTableWidgetContext);
+ const nestedRelationCreateThrough =
+ recordTableWidgetContext?.nestedRelationCreateThrough;
+ const junctionCreateThrough = recordTableWidgetContext?.junctionCreateThrough;
const isRecordTableCellsNonEditable = useAtomComponentStateValue(
isRecordTableCellsNonEditableComponentState,
@@ -48,10 +52,34 @@ export const RecordTableRecordGroupSectionAddNew = () => {
(field) => field.id === recordIndexGroupFieldMetadataItem?.id,
);
+ const { recordGroupFilter } = useRecordGroupFilter(objectMetadataItem.fields);
+
const objectPermissions = useObjectPermissionsForObject(
objectMetadataItem.id,
);
+ if (isRecordTableCellsNonEditable) {
+ return null;
+ }
+
+ // Linking through a junction never creates a record of the table's object,
+ // so the target object's creatability does not apply. The picker only
+ // offers records of this group, so the linked row lands where it was added.
+ if (isDefined(junctionCreateThrough)) {
+ return (
+ <RecordTableWidgetJunctionAddNewRow
+ dropdownId={`${recordTableId}-${currentRecordGroupId}-junction-add-new`}
+ junctionCreateThrough={junctionCreateThrough}
+ targetRecordsFilter={
+ makeAndFilterVariables([
+ junctionCreateThrough.targetRecordsFilter,
+ recordGroupFilter,
+ ]) ?? junctionCreateThrough.targetRecordsFilter
+ }
+ />
+ );
+ }
+
if (
!canCreateRecordsForObjectMetadataItem({
objectPermissions,
@@ -61,10 +89,6 @@ export const RecordTableRecordGroupSectionAddNew = () => {
return null;
}
- if (isRecordTableCellsNonEditable) {
- return null;
- }
-
const handleCreateRecord = (recordInput?: Partial<ObjectRecord>) => {
if (!fieldMetadataItem) {
return;
diff --git a/packages/twenty-front/src/modules/object-record/record-table/virtualization/components/RecordTableVirtualizedJunctionDataChangedEffect.tsx b/packages/twenty-front/src/modules/object-record/record-table/virtualization/components/RecordTableVirtualizedJunctionDataChangedEffect.tsx
new file mode 100644
index 00000000000..0448704d448
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-table/virtualization/components/RecordTableVirtualizedJunctionDataChangedEffect.tsx
@@ -0,0 +1,26 @@
+import { useListenToJunctionRecordOperation } from '@/object-record/record-table-widget/hooks/useListenToJunctionRecordOperation';
+import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';
+import { SSE_TABLE_DEBOUNCE_TIME_IN_MS_TO_AVOID_SSE_OWN_EVENTS_RACE_CONDITION } from '@/object-record/record-table/virtualization/constants/SseTableDebounceTimeInMsToAvoidSseOwnEventsRaceCondition';
+import { useResetVirtualizationBecauseDataChanged } from '@/object-record/record-table/virtualization/hooks/useResetVirtualizationBecauseDataChanged';
+import { useDebouncedCallback } from 'use-debounce';
+
+export const RecordTableVirtualizedJunctionDataChangedEffect = () => {
+ const { objectNameSingular } = useRecordTableContextOrThrow();
+
+ const { resetVirtualizationBecauseDataChanged } =
+ useResetVirtualizationBecauseDataChanged(objectNameSingular);
+
+ const debouncedResetVirtualizationBecauseDataChanged = useDebouncedCallback(
+ resetVirtualizationBecauseDataChanged,
+ SSE_TABLE_DEBOUNCE_TIME_IN_MS_TO_AVOID_SSE_OWN_EVENTS_RACE_CONDITION,
+ {
+ leading: false,
+ },
+ );
+
+ useListenToJunctionRecordOperation({
+ onJunctionRecordOperation: debouncedResetVirtualizationBecauseDataChanged,
+ });
+
+ return <></>;
+};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidget.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidget.tsx
index 6592b29ea0b..c032101c02b 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidget.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidget.tsx
@@ -157,6 +157,7 @@ export const FieldWidget = ({ widget }: FieldWidgetProps) => {
<FieldWidgetRelationTable
fieldDefinition={fieldDefinition}
recordId={targetRecord.id}
+ junctionConfig={junctionConfig}
/>
);
}
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationTable.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationTable.tsx
index 284a9df72c4..8329d26ab77 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationTable.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationTable.tsx
@@ -2,17 +2,20 @@ import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadat
import { RecordFilterValueDependenciesContext } from '@/object-record/record-filter/contexts/RecordFilterValueDependenciesContext';
import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
import { type FieldRelationMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';
+import { type ValidResolvedJunctionConfig } from '@/object-record/record-field/ui/utils/junction/types/ValidResolvedJunctionConfig';
import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
import { RECORD_TABLE_ROW_HEIGHT } from '@/object-record/record-table/constants/RecordTableRowHeight';
import { useIsPageLayoutInEditMode } from '@/page-layout/hooks/useIsPageLayoutInEditMode';
import { StyledWidgetTableOutline } from '@/page-layout/widgets/components/WidgetContentFrame';
import { RecordTableWidgetRendererContent } from '@/page-layout/widgets/record-table/components/RecordTableWidgetRendererContent';
+import { getFieldWidgetJunctionCreateThrough } from '@/page-layout/widgets/field/utils/getFieldWidgetJunctionCreateThrough';
import { getFieldWidgetNestedRelationCreateThrough } from '@/page-layout/widgets/field/utils/getFieldWidgetNestedRelationCreateThrough';
import { isFieldWidget } from '@/page-layout/widgets/field/utils/isFieldWidget';
import { resolveFieldWidgetNestedRelation } from '@/page-layout/widgets/field/utils/resolveFieldWidgetNestedRelation';
import { useCurrentWidget } from '@/page-layout/widgets/hooks/useCurrentWidget';
import { useWorkspaceSurface } from '@/ui/layout/hooks/useWorkspaceSurface';
import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';
+import { useViewById } from '@/views/hooks/useViewById';
import { styled } from '@linaria/react';
import { isNonEmptyString } from '@sniptt/guards';
import { useMemo } from 'react';
@@ -35,11 +38,13 @@ const StyledContainer = styled(StyledWidgetTableOutline)`
type FieldWidgetRelationTableProps = {
fieldDefinition: FieldDefinition<FieldRelationMetadata>;
recordId: string;
+ junctionConfig?: ValidResolvedJunctionConfig;
};
export const FieldWidgetRelationTable = ({
fieldDefinition,
recordId,
+ junctionConfig,
}: FieldWidgetRelationTableProps) => {
const widget = useCurrentWidget();
@@ -65,6 +70,8 @@ export const FieldWidgetRelationTable = ({
const recordPageObjectMetadataNameSingular =
fieldDefinition.metadata.objectMetadataNameSingular;
+ const { view: persistedView } = useViewById(viewId ?? null);
+
// Memoized so the derived picker parameters below keep a stable identity
// and do not churn the widget provider's context value on every render.
const resolvedNestedRelation = useMemo(
@@ -81,13 +88,52 @@ export const FieldWidgetRelationTable = ({
],
);
+ // A junction widget lists the records behind the junction, like the card
+ // and field display modes. A morph junction has no single object to list,
+ // and a view saved on the junction object predates junction traversal, so
+ // both keep listing the junction records their view was built for.
+ const junctionTargetObjectMetadataId =
+ isDefined(junctionConfig) && !junctionConfig.isMorphRelation
+ ? junctionConfig.targetFields[0]?.relation?.targetObjectMetadata.id
+ : undefined;
+
+ const isPersistedViewOnJunctionObject =
+ persistedView?.objectMetadataId === relationObjectMetadataId;
+
+ const junctionTableObjectMetadataId = isPersistedViewOnJunctionObject
+ ? relationObjectMetadataId
+ : junctionTargetObjectMetadataId;
+
+ const isJunctionTable =
+ isDefined(junctionTableObjectMetadataId) &&
+ junctionTableObjectMetadataId === junctionTargetObjectMetadataId;
+
// A widget with a broken nested relation (deleted or deactivated second hop)
// resolves to no object and so renders nothing, rather than falling back to
// the first hop's records and silently showing a different object than the
- // widget title claims.
- const tableObjectMetadataId = isDefined(nestedRelationFieldMetadataId)
- ? resolvedNestedRelation?.nestedRelationTargetObjectMetadataItem.id
- : relationObjectMetadataId;
+ // widget title claims. Likewise a persisted view listing yet another object
+ // belongs to a previous relation chain and must not be rendered under this
+ // one.
+ const directTableObjectMetadataId =
+ junctionTableObjectMetadataId ?? relationObjectMetadataId;
+
+ const isPersistedViewOnAnotherObject =
+ isDefined(persistedView) &&
+ persistedView.objectMetadataId !== directTableObjectMetadataId;
+
+ const getTableObjectMetadataId = () => {
+ if (isDefined(nestedRelationFieldMetadataId)) {
+ return resolvedNestedRelation?.nestedRelationTargetObjectMetadataItem.id;
+ }
+
+ if (isPersistedViewOnAnotherObject) {
+ return undefined;
+ }
+
+ return directTableObjectMetadataId;
+ };
+
+ const tableObjectMetadataId = getTableObjectMetadataId();
const {
targetFieldMetadataName,
@@ -119,6 +165,31 @@ export const FieldWidgetRelationTable = ({
],
);
+ const junctionCreateThrough = useMemo(() => {
+ const sourceObjectMetadataItem = objectMetadataItems.find(
+ (objectMetadataItem) =>
+ objectMetadataItem.nameSingular ===
+ recordPageObjectMetadataNameSingular,
+ );
+
+ return isDefined(junctionConfig) &&
+ isJunctionTable &&
+ isDefined(sourceObjectMetadataItem)
+ ? getFieldWidgetJunctionCreateThrough({
+ junctionConfig,
+ sourceObjectMetadataItem,
+ objectMetadataItems,
+ recordId,
+ })
+ : undefined;
+ }, [
+ junctionConfig,
+ isJunctionTable,
+ objectMetadataItems,
+ recordPageObjectMetadataNameSingular,
+ recordId,
+ ]);
+
// A many-to-one first hop points at a single intermediate record, so the
// terminal view is scoped directly by it: the intermediate becomes the
// filter's current record, read from the current record's join column.
@@ -182,6 +253,7 @@ export const FieldWidgetRelationTable = ({
isEmptyStateHidden
instanceIdSuffix={`${recordId}${isInSidePanel ? '-side-panel' : ''}`}
nestedRelationCreateThrough={nestedRelationCreateThrough}
+ junctionCreateThrough={junctionCreateThrough}
/>
</StyledContainer>
</RecordFilterValueDependenciesContext.Provider>
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/utils/__tests__/getFieldWidgetJunctionCreateThrough.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/field/utils/__tests__/getFieldWidgetJunctionCreateThrough.test.ts
new file mode 100644
index 00000000000..cbf3271f35e
--- /dev/null
+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/utils/__tests__/getFieldWidgetJunctionCreateThrough.test.ts
@@ -0,0 +1,70 @@
+import { resolveJunctionConfig } from '@/object-record/record-field/ui/utils/junction/resolveJunctionConfig';
+import { getFieldWidgetJunctionCreateThrough } from '@/page-layout/widgets/field/utils/getFieldWidgetJunctionCreateThrough';
+import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';
+import { getTestEnrichedObjectMetadataItemsMock } from '~/testing/utils/getTestEnrichedObjectMetadataItemsMock';
+
+const objectMetadataItems = getTestEnrichedObjectMetadataItemsMock();
+
+const personObjectMetadataItem = getMockObjectMetadataItemOrThrow('person');
+const employmentHistoryObjectMetadataItem =
+ getMockObjectMetadataItemOrThrow('employmentHistory');
+
+const personPreviousCompaniesField = personObjectMetadataItem.fields.find(
+ (field) => field.name === 'previousCompanies',
+);
+
+const resolvePreviousCompaniesJunctionConfig = () => {
+ const junctionConfig = resolveJunctionConfig({
+ settings: personPreviousCompaniesField?.settings,
+ relationObjectMetadataId:
+ personPreviousCompaniesField?.relation?.targetObjectMetadata.id ?? '',
+ relationTargetFieldMetadataId:
+ personPreviousCompaniesField?.relation?.targetFieldMetadata.id,
+ sourceObjectMetadataId: personObjectMetadataItem.id,
+ objectMetadataItems,
+ });
+
+ if (!junctionConfig?.isValid) {
+ throw new Error('Expected a valid junction config');
+ }
+
+ return junctionConfig;
+};
+
+describe('getFieldWidgetJunctionCreateThrough', () => {
+ it('should link a picked target record to the current record through the junction', () => {
+ const createThrough = getFieldWidgetJunctionCreateThrough({
+ junctionConfig: resolvePreviousCompaniesJunctionConfig(),
+ sourceObjectMetadataItem: personObjectMetadataItem,
+ objectMetadataItems,
+ recordId: 'current-person-id',
+ });
+
+ expect(createThrough).toEqual({
+ junctionObjectMetadataId: employmentHistoryObjectMetadataItem.id,
+ junctionObjectMetadataNameSingular: 'employmentHistory',
+ sourceJoinColumnName: 'personId',
+ sourceRecordId: 'current-person-id',
+ targetJoinColumnName: 'companyId',
+ targetObjectMetadataNameSingular: 'company',
+ // Companies already linked to the current person are not pickable again.
+ targetRecordsFilter: {
+ not: { previousEmployees: { personId: { eq: 'current-person-id' } } },
+ },
+ });
+ });
+
+ it('should return undefined for a morph junction', () => {
+ expect(
+ getFieldWidgetJunctionCreateThrough({
+ junctionConfig: {
+ ...resolvePreviousCompaniesJunctionConfig(),
+ isMorphRelation: true,
+ },
+ sourceObjectMetadataItem: personObjectMetadataItem,
+ objectMetadataItems,
+ recordId: 'current-person-id',
+ }),
+ ).toBeUndefined();
+ });
+});
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/utils/__tests__/getFieldWidgetRelationTraversal.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/field/utils/__tests__/getFieldWidgetRelationTraversal.test.ts
index e0dba893092..b35f177aae2 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/field/utils/__tests__/getFieldWidgetRelationTraversal.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/utils/__tests__/getFieldWidgetRelationTraversal.test.ts
@@ -1,5 +1,8 @@
import { getFieldWidgetRelationTraversal } from '@/page-layout/widgets/field/utils/getFieldWidgetRelationTraversal';
import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';
+import { getTestEnrichedObjectMetadataItemsMock } from '~/testing/utils/getTestEnrichedObjectMetadataItemsMock';
+
+const objectMetadataItems = getTestEnrichedObjectMetadataItemsMock();
const companyObjectMetadataItem = getMockObjectMetadataItemOrThrow('company');
const personObjectMetadataItem = getMockObjectMetadataItemOrThrow('person');
@@ -22,10 +25,27 @@ const companyOpportunitiesField = companyObjectMetadataItem.fields.find(
(field) => field.name === 'opportunities',
);
+const personPreviousCompaniesField = personObjectMetadataItem.fields.find(
+ (field) => field.name === 'previousCompanies',
+);
+
+const companyPreviousEmployeesField = companyObjectMetadataItem.fields.find(
+ (field) => field.name === 'previousEmployees',
+);
+
+const employmentHistoryObjectMetadataItem =
+ getMockObjectMetadataItemOrThrow('employmentHistory');
+
+const employmentHistoryPersonField =
+ employmentHistoryObjectMetadataItem.fields.find(
+ (field) => field.name === 'person',
+ );
+
describe('getFieldWidgetRelationTraversal', () => {
it('should scope a direct widget through the relation own inverse', () => {
const traversal = getFieldWidgetRelationTraversal({
sourceFieldMetadataItem: companyPeopleField,
+ objectMetadataItems,
});
expect(traversal.targetObjectMetadataId).toBe(personObjectMetadataItem.id);
@@ -39,6 +59,7 @@ describe('getFieldWidgetRelationTraversal', () => {
const traversal = getFieldWidgetRelationTraversal({
sourceFieldMetadataItem: companyPeopleField,
nestedRelationFieldMetadataItem: personOpportunitiesField,
+ objectMetadataItems,
});
// The embedded view lists the terminal object...
@@ -60,6 +81,7 @@ describe('getFieldWidgetRelationTraversal', () => {
const traversal = getFieldWidgetRelationTraversal({
sourceFieldMetadataItem: companyPeopleField,
nestedRelationFieldMetadataItem: personOpportunitiesField,
+ objectMetadataItems,
});
expect(traversal.inverseFieldMetadataId).not.toBe(
@@ -74,6 +96,7 @@ describe('getFieldWidgetRelationTraversal', () => {
const traversal = getFieldWidgetRelationTraversal({
sourceFieldMetadataItem: personCompanyField,
nestedRelationFieldMetadataItem: companyOpportunitiesField,
+ objectMetadataItems,
});
expect(traversal.targetObjectMetadataId).toBe(
@@ -87,9 +110,33 @@ describe('getFieldWidgetRelationTraversal', () => {
expect(traversal.relationTargetFieldMetadataId).toBeNull();
});
+ it('should scope a junction widget on the junction target, traversing the junction', () => {
+ const traversal = getFieldWidgetRelationTraversal({
+ sourceFieldMetadataItem: personPreviousCompaniesField,
+ objectMetadataItems,
+ });
+
+ // The embedded view lists the records behind the junction (companies),
+ // not the junction records (employment histories)...
+ expect(traversal.targetObjectMetadataId).toBe(companyObjectMetadataItem.id);
+ // ...scoped by the target's own junction relation (company -> employment
+ // histories)...
+ expect(traversal.inverseFieldMetadataId).toBe(
+ companyPreviousEmployeesField?.id,
+ );
+ // ...traversed to the junction field pointing at the current record
+ // (employment history -> person).
+ expect(traversal.relationTargetFieldMetadataId).toBe(
+ employmentHistoryPersonField?.id,
+ );
+ });
+
it('should return an empty traversal without a source field', () => {
expect(
- getFieldWidgetRelationTraversal({ sourceFieldMetadataItem: undefined }),
+ getFieldWidgetRelationTraversal({
+ sourceFieldMetadataItem: undefined,
+ objectMetadataItems,
+ }),
).toEqual({
targetObjectMetadataId: undefined,
inverseFieldMetadataId: undefined,
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/utils/getFieldWidgetJunctionCreateThrough.ts b/packages/twenty-front/src/modules/page-layout/widgets/field/utils/getFieldWidgetJunctionCreateThrough.ts
new file mode 100644
index 00000000000..3e6e7af1d18
--- /dev/null
+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/utils/getFieldWidgetJunctionCreateThrough.ts
@@ -0,0 +1,77 @@
+import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
+import { getSourceJoinColumnName } from '@/object-record/record-field/ui/utils/junction/getSourceJoinColumnName';
+import { type ValidResolvedJunctionConfig } from '@/object-record/record-field/ui/utils/junction/types/ValidResolvedJunctionConfig';
+import { type RecordTableWidgetJunctionCreateThrough } from '@/object-record/record-table-widget/contexts/RecordTableWidgetContext';
+import {
+ computeRelationGqlFieldJoinColumnName,
+ isDefined,
+} from 'twenty-shared/utils';
+
+type GetFieldWidgetJunctionCreateThroughArgs = {
+ junctionConfig: ValidResolvedJunctionConfig;
+ sourceObjectMetadataItem: Pick<
+ EnrichedObjectMetadataItem,
+ 'id' | 'nameSingular' | 'namePlural'
+ >;
+ objectMetadataItems: Pick<
+ EnrichedObjectMetadataItem,
+ 'id' | 'nameSingular'
+ >[];
+ recordId: string;
+};
+
+export const getFieldWidgetJunctionCreateThrough = ({
+ junctionConfig,
+ sourceObjectMetadataItem,
+ objectMetadataItems,
+ recordId,
+}: GetFieldWidgetJunctionCreateThroughArgs):
+ | RecordTableWidgetJunctionCreateThrough
+ | undefined => {
+ const { sourceField, junctionObjectMetadata } = junctionConfig;
+ const [junctionTargetField] = junctionConfig.targetFields;
+ const junctionTargetRelation = junctionTargetField?.relation;
+
+ if (
+ junctionConfig.isMorphRelation ||
+ !isDefined(sourceField) ||
+ !isDefined(junctionTargetRelation)
+ ) {
+ return undefined;
+ }
+
+ const targetObjectMetadataItem = objectMetadataItems.find(
+ (objectMetadataItem) =>
+ objectMetadataItem.id === junctionTargetRelation.targetObjectMetadata.id,
+ );
+
+ const sourceJoinColumnName = getSourceJoinColumnName({
+ sourceField,
+ sourceObjectMetadata: sourceObjectMetadataItem,
+ });
+
+ if (
+ !isDefined(targetObjectMetadataItem) ||
+ !isDefined(sourceJoinColumnName)
+ ) {
+ return undefined;
+ }
+
+ return {
+ junctionObjectMetadataId: junctionObjectMetadata.id,
+ junctionObjectMetadataNameSingular: junctionObjectMetadata.nameSingular,
+ sourceJoinColumnName,
+ sourceRecordId: recordId,
+ targetJoinColumnName: computeRelationGqlFieldJoinColumnName({
+ name: junctionTargetField.name,
+ }),
+ targetObjectMetadataNameSingular: targetObjectMetadataItem.nameSingular,
+ targetRecordsFilter: {
+ not: {
+ [junctionTargetRelation.targetFieldMetadata.name]: {
+ [sourceJoinColumnName]: { eq: recordId },
+ },
+ },
+ },
+ };
+};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/utils/getFieldWidgetRelationTraversal.ts b/packages/twenty-front/src/modules/page-layout/widgets/field/utils/getFieldWidgetRelationTraversal.ts
index 168a46b574b..237a98f350d 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/field/utils/getFieldWidgetRelationTraversal.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/utils/getFieldWidgetRelationTraversal.ts
@@ -1,10 +1,17 @@
import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
import { isOneToManyRelationField } from '@/object-metadata/utils/isOneToManyRelationField';
+import { isUsableJunctionConfig } from '@/object-record/record-field/ui/utils/junction/isUsableJunctionConfig';
+import { type JunctionObjectMetadataItem } from '@/object-record/record-field/ui/utils/junction/types/JunctionObjectMetadataItem';
+import {
+ type FieldWidgetJunctionConfig,
+ resolveFieldWidgetJunctionConfig,
+} from '@/page-layout/widgets/field/utils/resolveFieldWidgetJunctionConfig';
import { isDefined } from 'twenty-shared/utils';
type GetFieldWidgetRelationTraversalArgs = {
sourceFieldMetadataItem: FieldMetadataItem | undefined;
nestedRelationFieldMetadataItem?: FieldMetadataItem;
+ objectMetadataItems: JunctionObjectMetadataItem[];
};
type FieldWidgetRelationTraversal = {
@@ -13,6 +20,42 @@ type FieldWidgetRelationTraversal = {
relationTargetFieldMetadataId: string | null;
};
+const EMPTY_TRAVERSAL: FieldWidgetRelationTraversal = {
+ targetObjectMetadataId: undefined,
+ inverseFieldMetadataId: undefined,
+ relationTargetFieldMetadataId: null,
+};
+
+// A junction relation lists the records behind the junction, like the card
+// and field display modes do, so the embedded view targets the junction
+// target object and scopes it back through the junction: the target's inverse
+// field, traversed to the junction field pointing at the current record. A
+// morph junction has no single object to list, so it gets no embedded view.
+const getFieldWidgetJunctionTraversal = (
+ junctionConfig: FieldWidgetJunctionConfig,
+): FieldWidgetRelationTraversal => {
+ if (
+ !isUsableJunctionConfig(junctionConfig) ||
+ junctionConfig.isMorphRelation ||
+ !isDefined(junctionConfig.sourceField)
+ ) {
+ return EMPTY_TRAVERSAL;
+ }
+
+ const [junctionTargetField] = junctionConfig.targetFields;
+
+ if (!isDefined(junctionTargetField?.relation)) {
+ return EMPTY_TRAVERSAL;
+ }
+
+ return {
+ targetObjectMetadataId:
+ junctionTargetField.relation.targetObjectMetadata.id,
+ inverseFieldMetadataId: junctionTargetField.relation.targetFieldMetadata.id,
+ relationTargetFieldMetadataId: junctionConfig.sourceField.id,
+ };
+};
+
// The widget's embedded view lists records of the last hop's target object,
// scoped back to the current record through that hop's inverse relation. A
// nested widget scopes one relation further out, which the seeded view filter
@@ -20,7 +63,21 @@ type FieldWidgetRelationTraversal = {
export const getFieldWidgetRelationTraversal = ({
sourceFieldMetadataItem,
nestedRelationFieldMetadataItem,
+ objectMetadataItems,
}: GetFieldWidgetRelationTraversalArgs): FieldWidgetRelationTraversal => {
+ const junctionConfig =
+ isDefined(sourceFieldMetadataItem) &&
+ !isDefined(nestedRelationFieldMetadataItem)
+ ? resolveFieldWidgetJunctionConfig({
+ fieldMetadataItem: sourceFieldMetadataItem,
+ objectMetadataItems,
+ })
+ : null;
+
+ if (isDefined(junctionConfig)) {
+ return getFieldWidgetJunctionTraversal(junctionConfig);
+ }
+
const lastHopFieldMetadataItem =
nestedRelationFieldMetadataItem ?? sourceFieldMetadataItem;
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/utils/resolveFieldWidgetJunctionConfig.ts b/packages/twenty-front/src/modules/page-layout/widgets/field/utils/resolveFieldWidgetJunctionConfig.ts
new file mode 100644
index 00000000000..7e30cc8f2f1
--- /dev/null
+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/utils/resolveFieldWidgetJunctionConfig.ts
@@ -0,0 +1,36 @@
+import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
+import { resolveJunctionConfig } from '@/object-record/record-field/ui/utils/junction/resolveJunctionConfig';
+import { type JunctionObjectMetadataItem } from '@/object-record/record-field/ui/utils/junction/types/JunctionObjectMetadataItem';
+import { FieldMetadataType } from 'twenty-shared/types';
+import { isDefined } from 'twenty-shared/utils';
+
+type ResolveFieldWidgetJunctionConfigArgs = {
+ fieldMetadataItem: FieldMetadataItem;
+ objectMetadataItems: JunctionObjectMetadataItem[];
+};
+
+export type FieldWidgetJunctionConfig = NonNullable<
+ ReturnType<typeof resolveJunctionConfig>
+>;
+
+export const resolveFieldWidgetJunctionConfig = ({
+ fieldMetadataItem,
+ objectMetadataItems,
+}: ResolveFieldWidgetJunctionConfigArgs): FieldWidgetJunctionConfig | null => {
+ if (
+ fieldMetadataItem.type !== FieldMetadataType.RELATION ||
+ !isDefined(fieldMetadataItem.relation)
+ ) {
+ return null;
+ }
+
+ return resolveJunctionConfig({
+ settings: fieldMetadataItem.settings,
+ relationObjectMetadataId:
+ fieldMetadataItem.relation.targetObjectMetadata.id,
+ relationTargetFieldMetadataId:
+ fieldMetadataItem.relation.targetFieldMetadata.id,
+ sourceObjectMetadataId: fieldMetadataItem.relation.sourceObjectMetadata.id,
+ objectMetadataItems,
+ });
+};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/record-table/components/RecordTableWidgetRendererContent.tsx b/packages/twenty-front/src/modules/page-layout/widgets/record-table/components/RecordTableWidgetRendererContent.tsx
index e5e3755e29d..4f5ed9f614e 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/record-table/components/RecordTableWidgetRendererContent.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/record-table/components/RecordTableWidgetRendererContent.tsx
@@ -5,7 +5,10 @@ import { RecordCalendarWidget } from '@/object-record/record-calendar-widget/com
import { RecordListWidget } from '@/object-record/record-list-widget/components/RecordListWidget';
import { RecordTableWidget } from '@/object-record/record-table-widget/components/RecordTableWidget';
import { RecordTableWidgetProvider } from '@/object-record/record-table-widget/components/RecordTableWidgetProvider';
-import { type RecordTableWidgetNestedRelationCreateThrough } from '@/object-record/record-table-widget/contexts/RecordTableWidgetContext';
+import {
+ type RecordTableWidgetJunctionCreateThrough,
+ type RecordTableWidgetNestedRelationCreateThrough,
+} from '@/object-record/record-table-widget/contexts/RecordTableWidgetContext';
import { useIsPageLayoutInEditMode } from '@/page-layout/hooks/useIsPageLayoutInEditMode';
import { recordTableWidgetViewDraftByWidgetIdComponentFamilySelector } from '@/page-layout/states/selectors/recordTableWidgetViewDraftByWidgetIdComponentFamilySelector';
import {
@@ -28,6 +31,7 @@ type RecordTableWidgetRendererContentProps = {
recordLimit?: number;
instanceIdSuffix?: string;
nestedRelationCreateThrough?: RecordTableWidgetNestedRelationCreateThrough;
+ junctionCreateThrough?: RecordTableWidgetJunctionCreateThrough;
};
export const RecordTableWidgetRendererContent = ({
@@ -39,6 +43,7 @@ export const RecordTableWidgetRendererContent = ({
recordLimit,
instanceIdSuffix,
nestedRelationCreateThrough,
+ junctionCreateThrough,
}: RecordTableWidgetRendererContentProps) => {
const { objectMetadataItem } = useObjectMetadataItemById({
objectId: objectMetadataId,
@@ -98,6 +103,7 @@ export const RecordTableWidgetRendererContent = ({
recordLimit={recordLimit}
instanceIdSuffix={instanceIdSuffix}
nestedRelationCreateThrough={nestedRelationCreateThrough}
+ junctionCreateThrough={junctionCreateThrough}
contextStoreViewType={getContextStoreViewType(widgetViewLayout)}
>
{renderWidgetForLayout[widgetViewLayout]()}
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/record-table/hooks/__tests__/useResolveFieldWidgetRelationTableViewIdChange.test.tsx b/packages/twenty-front/src/modules/page-layout/widgets/record-table/hooks/__tests__/useResolveFieldWidgetRelationTableViewIdChange.test.tsx
index 4ccdefb3bd5..70004b1aaab 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/record-table/hooks/__tests__/useResolveFieldWidgetRelationTableViewIdChange.test.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/record-table/hooks/__tests__/useResolveFieldWidgetRelationTableViewIdChange.test.tsx
@@ -32,6 +32,18 @@ const companyOpportunitiesField = companyObjectMetadataItem.fields.find(
(field) => field.name === 'opportunities',
);
+const personPreviousCompaniesField = personObjectMetadataItem.fields.find(
+ (field) => field.name === 'previousCompanies',
+);
+
+const companyPreviousEmployeesField = companyObjectMetadataItem.fields.find(
+ (field) => field.name === 'previousEmployees',
+);
+
+const employmentHistoryPersonField = getMockObjectMetadataItemOrThrow(
+ 'employmentHistory',
+).fields.find((field) => field.name === 'person');
+
const getWrapper =
(store: ReturnType<typeof createStore>) =>
({ children }: { children: ReactNode }) => (
@@ -122,6 +134,42 @@ describe('useResolveFieldWidgetRelationTableViewIdChange', () => {
]);
});
+ it('should regenerate a view on the junction target for a junction relation', () => {
+ const { result, store } = renderResolveHook();
+
+ let change: { viewId?: string | null } | undefined;
+
+ act(() => {
+ change = result.current.resolveFieldWidgetRelationTableViewIdChange({
+ selectedField: personPreviousCompaniesField,
+ nextDisplayMode: FieldDisplayMode.TABLE,
+ isSelectingDifferentChain: true,
+ widgetId: WIDGET_ID,
+ currentViewId: undefined,
+ });
+ });
+
+ expect(change?.viewId).toBeDefined();
+
+ const draft = store.get(
+ recordTableWidgetViewDraftComponentState.atomFamily({
+ instanceId: PAGE_LAYOUT_ID,
+ }),
+ );
+
+ // The view lists companies, not employment histories, scoped back to the
+ // current person through the junction.
+ expect(draft[WIDGET_ID].view.objectMetadataId).toBe(
+ companyObjectMetadataItem.id,
+ );
+ expect(draft[WIDGET_ID].viewFilters).toEqual([
+ expect.objectContaining({
+ fieldMetadataId: companyPreviousEmployeesField?.id,
+ relationTargetFieldMetadataId: employmentHistoryPersonField?.id,
+ }),
+ ]);
+ });
+
it('should regenerate a missing view even when the chain is unchanged', () => {
const { result } = renderResolveHook();
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/record-table/hooks/useResolveFieldWidgetRelationTableViewIdChange.ts b/packages/twenty-front/src/modules/page-layout/widgets/record-table/hooks/useResolveFieldWidgetRelationTableViewIdChange.ts
index 7235bbdb78d..69c2a6b2804 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/record-table/hooks/useResolveFieldWidgetRelationTableViewIdChange.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/record-table/hooks/useResolveFieldWidgetRelationTableViewIdChange.ts
@@ -1,8 +1,10 @@
+import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';
import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
import { isOneToManyRelationField } from '@/object-metadata/utils/isOneToManyRelationField';
import { getFieldWidgetRelationTraversal } from '@/page-layout/widgets/field/utils/getFieldWidgetRelationTraversal';
import { isFieldWidgetEligibleNestedParentField } from '@/page-layout/widgets/field/utils/isFieldWidgetEligibleNestedParentField';
import { useAddDraftViewForFieldRelationTableWidget } from '@/page-layout/widgets/record-table/hooks/useAddDraftViewForFieldRelationTableWidget';
+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { isDefined } from 'twenty-shared/utils';
import {
FieldDisplayMode,
@@ -24,6 +26,8 @@ export const useResolveFieldWidgetRelationTableViewIdChange = (
const { addDraftViewForFieldRelationTableWidget } =
useAddDraftViewForFieldRelationTableWidget(pageLayoutId);
+ const objectMetadataItems = useAtomStateValue(objectMetadataItemsSelector);
+
// The embedded view must always list the selected chain's terminal object.
// Whenever the selection results in a table widget, a fresh draft view is
// generated on a chain change or a missing view id; otherwise a view id
@@ -46,6 +50,7 @@ export const useResolveFieldWidgetRelationTableViewIdChange = (
} = getFieldWidgetRelationTraversal({
sourceFieldMetadataItem: selectedField,
nestedRelationFieldMetadataItem: selectedNestedField,
+ objectMetadataItems,
});
const isValidRelationChain =
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetLayoutDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetLayoutDropdownContent.tsx
index 907bd94ca44..10f788e167d 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetLayoutDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/FieldWidgetLayoutDropdownContent.tsx
@@ -119,6 +119,7 @@ export const FieldWidgetLayoutDropdownContent = () => {
sourceFieldMetadataItem: fieldMetadataItem,
nestedRelationFieldMetadataItem:
resolvedNestedRelation?.nestedRelationFieldMetadataItem,
+ objectMetadataItems,
});
const targetObjectMetadataId = relationTraversal?.targetObjectMetadataId;
@@ -203,8 +204,16 @@ export const FieldWidgetLayoutDropdownContent = () => {
return;
}
+ // A view listing another object than the traversal's target predates
+ // junction traversal and would embed the wrong object, and a view id that
+ // resolves to nothing was deleted, so both are replaced.
+ const isCurrentViewOnTargetObject =
+ isDefined(currentViewId) &&
+ isDefined(embeddedWidgetView) &&
+ embeddedWidgetView.objectMetadataId === targetObjectMetadataId;
+
const viewId =
- currentViewId ??
+ (isCurrentViewOnTargetObject ? currentViewId : undefined) ??
(isDefined(targetObjectMetadataId) && isDefined(inverseFieldMetadataId)
? addDraftViewForFieldRelationTableWidget({
widgetId: widgetInEditMode.id,
diff --git a/packages/twenty-server/src/engine/api/common/common-args-processors/filter-arg-processor/filter-arg-processor.service.ts b/packages/twenty-server/src/engine/api/common/common-args-processors/filter-arg-processor/filter-arg-processor.service.ts
index a694b8b8903..6678e4211ea 100644
--- a/packages/twenty-server/src/engine/api/common/common-args-processors/filter-arg-processor/filter-arg-processor.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-args-processors/filter-arg-processor/filter-arg-processor.service.ts
@@ -200,7 +200,12 @@ export class FilterArgProcessorService {
flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>,
depth: number,
): ObjectRecordFilter {
- if (fieldMetadata.settings?.relationType !== RelationType.MANY_TO_ONE) {
+ const isFilterableRelation =
+ fieldMetadata.settings?.relationType === RelationType.MANY_TO_ONE ||
+ (isFlatFieldMetadataOfType(fieldMetadata, FieldMetadataType.RELATION) &&
+ fieldMetadata.settings?.relationType === RelationType.ONE_TO_MANY);
+
+ if (!isFilterableRelation) {
throw new CommonQueryRunnerException(
`Cannot filter by relation field "${key}"`,
CommonQueryRunnerExceptionCode.INVALID_ARGS_FILTER,
diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-filter/graphql-query-filter-field.parser.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-filter/graphql-query-filter-field.parser.ts
index 5d82e615ebb..d350c567240 100644
--- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-filter/graphql-query-filter-field.parser.ts
+++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-filter/graphql-query-filter-field.parser.ts
@@ -100,16 +100,19 @@ export class GraphqlQueryFilterFieldParser {
if (
isReferencedByFieldName &&
isMorphOrRelationFlatFieldMetadata(fieldMetadata) &&
- fieldMetadata.settings?.relationType === RelationType.MANY_TO_ONE
+ (fieldMetadata.settings?.relationType === RelationType.MANY_TO_ONE ||
+ fieldMetadata.settings?.relationType === RelationType.ONE_TO_MANY)
) {
- return this.parseRelationSubFilter(
+ return this.parseRelationSubFilter({
queryBuilder,
outerQueryBuilder,
- objectNameSingular,
+ parentAlias: objectNameSingular,
fieldMetadata,
filterValue,
isFirst,
- );
+ isToManyRelation:
+ fieldMetadata.settings.relationType === RelationType.ONE_TO_MANY,
+ });
}
if (isCompositeFieldMetadataType(fieldMetadata.type)) {
@@ -142,14 +145,23 @@ export class GraphqlQueryFilterFieldParser {
}
}
- private parseRelationSubFilter(
- queryBuilder: WhereExpressionBuilder,
- outerQueryBuilder: WorkspaceSelectQueryBuilder,
- parentAlias: string,
- fieldMetadata: OrmFlatFieldMetadata,
- filterValue: Partial<ObjectRecordFilter>,
- isFirst: boolean,
- ): void {
+ private parseRelationSubFilter({
+ queryBuilder,
+ outerQueryBuilder,
+ parentAlias,
+ fieldMetadata,
+ filterValue,
+ isFirst,
+ isToManyRelation,
+ }: {
+ queryBuilder: WhereExpressionBuilder;
+ outerQueryBuilder: WorkspaceSelectQueryBuilder;
+ parentAlias: string;
+ fieldMetadata: OrmFlatFieldMetadata;
+ filterValue: Partial<ObjectRecordFilter>;
+ isFirst: boolean;
+ isToManyRelation: boolean;
+ }): void {
if (this.depth >= MAX_RELATION_FILTER_DEPTH) {
throw new GraphqlQueryRunnerException(
`Relation filter nesting deeper than ${MAX_RELATION_FILTER_DEPTH} hop is not supported`,
@@ -190,6 +202,54 @@ export class GraphqlQueryFilterFieldParser {
);
}
+ const childConditionParser = new GraphqlQueryFilterConditionParser(
+ targetObjectMetadata,
+ this.flatFieldMetadataMaps,
+ this.flatObjectMetadataMaps,
+ this.depth + 1,
+ );
+
+ // A join on a to-many relation would duplicate root rows, which the
+ // find-many runner rejects, so the related rows are matched through a
+ // correlated EXISTS instead.
+ if (isToManyRelation) {
+ // The EXISTS is correlated with the root alias, so a to-many filter
+ // reached through a joined to-one relation would match the wrong rows.
+ if (parentAlias !== outerQueryBuilder.alias) {
+ throw new GraphqlQueryRunnerException(
+ `To-many relation filter on "${fieldMetadata.name}" must apply to the root object`,
+ GraphqlQueryRunnerExceptionCode.INVALID_QUERY_INPUT,
+ {
+ userFriendlyMessage: msg`Relation filters can only traverse one relation deep`,
+ },
+ );
+ }
+
+ const existsToken = outerQueryBuilder.addRelationExistsFilter({
+ relationFieldName: fieldMetadata.name,
+ applyWhere: (nestedQueryBuilder) => {
+ nestedQueryBuilder.where(
+ new Brackets((subQb) => {
+ childConditionParser.applyFilterEntriesToWhereBrackets(
+ subQb,
+ nestedQueryBuilder,
+ nestedQueryBuilder.alias,
+ filterValue,
+ );
+ }),
+ );
+ },
+ });
+
+ if (isFirst) {
+ queryBuilder.where(existsToken);
+ } else {
+ queryBuilder.andWhere(existsToken);
+ }
+
+ return;
+ }
+
const joinAlias = fieldMetadata.name;
addRelationJoinAliasToQueryBuilder({
@@ -198,13 +258,6 @@ export class GraphqlQueryFilterFieldParser {
relationName: joinAlias,
});
- const childConditionParser = new GraphqlQueryFilterConditionParser(
- targetObjectMetadata,
- this.flatFieldMetadataMaps,
- this.flatObjectMetadataMaps,
- this.depth + 1,
- );
-
const subBrackets = new Brackets((subQb) => {
childConditionParser.applyFilterEntriesToWhereBrackets(
subQb,
diff --git a/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-relation-where.spec.ts b/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-relation-where.spec.ts
index 5a81521528d..9f678252840 100644
--- a/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-relation-where.spec.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/query-builder/__tests__/workspace-select-query-builder-relation-where.spec.ts
@@ -23,6 +23,41 @@ describe('WorkspaceSelectQueryBuilder relation-keyed where', () => {
expect(values).toEqual(['Twenty']);
});
+ it('should register a caller-written to-many condition as a correlated EXISTS', () => {
+ const { queryBuilder } = buildQueryBuilder();
+
+ const token = queryBuilder.addRelationExistsFilter({
+ relationFieldName: 'people',
+ applyWhere: (nestedBuilder) => {
+ nestedBuilder.where(`"${nestedBuilder.alias}"."name" = :name`, {
+ name: 'Twenty',
+ });
+ },
+ });
+
+ queryBuilder.setFindOptions({ select: { id: true } }).where(token);
+
+ const [text, values] = queryBuilder.getQueryAndParameters();
+
+ expect(text).toContain(
+ 'EXISTS (SELECT 1 FROM "workspace_1wgvd1injqtife6y4rvfbu3h5"."company" AS "person_people_filter" WHERE "person_people_filter"."personId" = "person"."id" AND ("person_people_filter"."name" = $1) AND "person_people_filter"."deletedAt" IS NULL)',
+ );
+ expect(text).not.toContain('JOIN');
+ expect(text).not.toContain('__ormExistsFilter');
+ expect(values).toEqual(['Twenty']);
+ });
+
+ it('should reject an EXISTS filter on an unknown relation', () => {
+ const { queryBuilder } = buildQueryBuilder();
+
+ expect(() =>
+ queryBuilder.addRelationExistsFilter({
+ relationFieldName: 'unknown',
+ applyWhere: () => {},
+ }),
+ ).toThrow(TwentyOrmException);
+ });
+
it('should correlate a to-one relation on the parent join column', () => {
const { queryBuilder } = buildQueryBuilder();
diff --git a/packages/twenty-server/src/engine/twenty-orm/query-builder/workspace-select-query-builder.ts b/packages/twenty-server/src/engine/twenty-orm/query-builder/workspace-select-query-builder.ts
index b8b97b493bd..e3c365301e1 100644
--- a/packages/twenty-server/src/engine/twenty-orm/query-builder/workspace-select-query-builder.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/query-builder/workspace-select-query-builder.ts
@@ -858,7 +858,7 @@ export class WorkspaceSelectQueryBuilder implements WhereExpressionLike {
this.buildRelationExistsCondition({
relationFieldName: columnName,
relationShape,
- where: value,
+ applyWhere: (nestedBuilder) => nestedBuilder.where(value),
parameters,
}),
);
@@ -915,15 +915,50 @@ export class WorkspaceSelectQueryBuilder implements WhereExpressionLike {
return { sql: conditions.join(' AND '), parameters };
}
+ // Registers a correlated EXISTS on a relation and returns the token to place
+ // in a where clause; the caller writes the related table's condition on the
+ // nested builder, whose alias names that table. Unlike a join, an EXISTS never
+ // duplicates root rows, so this is how a to-many relation gets filtered.
+ addRelationExistsFilter({
+ relationFieldName,
+ applyWhere,
+ }: {
+ relationFieldName: string;
+ applyWhere: (nestedBuilder: WorkspaceSelectQueryBuilder) => void;
+ }): string {
+ const relationShape =
+ this.tableShape.relationShapeByFieldName[relationFieldName];
+
+ if (!isDefined(relationShape)) {
+ throw new TwentyOrmException(
+ `Unknown relation "${relationFieldName}" on "${this.tableShape.nameSingular}"`,
+ TwentyOrmExceptionCode.UNKNOWN_RELATION,
+ );
+ }
+
+ const parameters: Record<string, unknown> = {};
+
+ const token = this.buildRelationExistsCondition({
+ relationFieldName,
+ relationShape,
+ applyWhere,
+ parameters,
+ });
+
+ this.setParameters(parameters);
+
+ return token;
+ }
+
private buildRelationExistsCondition({
relationFieldName,
relationShape,
- where,
+ applyWhere,
parameters,
}: {
relationFieldName: string;
relationShape: WorkspaceTableShape['relationShapeByFieldName'][string];
- where: ObjectWhereLike;
+ applyWhere: (nestedBuilder: WorkspaceSelectQueryBuilder) => void;
parameters: Record<string, unknown>;
}): string {
const targetTableShape = this.context.tableShapeByObjectMetadataId(
@@ -953,7 +988,7 @@ export class WorkspaceSelectQueryBuilder implements WhereExpressionLike {
tableShape: targetTableShape,
});
- nestedBuilder.where(where);
+ applyWhere(nestedBuilder);
Object.assign(parameters, nestedBuilder.parameters);
diff --git a/packages/twenty-server/test/integration/graphql/suites/inputs-validation/filter-validation/__snapshots__/relation-field-filter-input-validation.integration-spec.ts.snap b/packages/twenty-server/test/integration/graphql/suites/inputs-validation/filter-validation/__snapshots__/relation-field-filter-input-validation.integration-spec.ts.snap
index c38ebd030c7..45e9266b371 100644
--- a/packages/twenty-server/test/integration/graphql/suites/inputs-validation/filter-validation/__snapshots__/relation-field-filter-input-validation.integration-spec.ts.snap
+++ b/packages/twenty-server/test/integration/graphql/suites/inputs-validation/filter-validation/__snapshots__/relation-field-filter-input-validation.integration-spec.ts.snap
@@ -4,7 +4,7 @@ exports[`Filter input validation - RELATION Gql filter input - failure RELATION
exports[`Filter input validation - RELATION Gql filter input - failure RELATION field type - should fail with filter : {"manyToOneRelationFieldId":{"eq":"invalid-uuid"}} 1`] = `"Invalid UUID value 'invalid-uuid' for field "manyToOneRelationFieldId""`;
-exports[`Filter input validation - RELATION Gql filter input - failure RELATION field type - should fail with filter : {"oneToManyRelationField":{"eq":"6dd71a46-68fe-4420-82b3-0d5b00ad2642"}} 1`] = `"Cannot filter by relation field "oneToManyRelationField""`;
+exports[`Filter input validation - RELATION Gql filter input - failure RELATION field type - should fail with filter : {"oneToManyRelationField":{"eq":"6dd71a46-68fe-4420-82b3-0d5b00ad2642"}} 1`] = `"Object apiInputValidationTargetTestObject1 doesn't have any "eq" field."`;
exports[`Filter input validation - RELATION Gql filter input - failure RELATION field type - should fail with filter : {"oneToManyRelationFieldId":{"eq":"invalid-uuid"}} 1`] = `"Object apiInputValidationTestObject doesn't have any "oneToManyRelationFieldId" field."`;