Skip to content

The open alternative to Salesforce, designed for AI.

Only offer junction targets the role can update in relation pickers (#28947)

Charles Bochet62c9c99746ab
diff --git a/packages/twenty-front/src/modules/activities/calendar/hooks/useCalendarEventTargetObjectMetadataItems.ts b/packages/twenty-front/src/modules/activities/calendar/hooks/useCalendarEventTargetObjectMetadataItems.ts
index 4f8183e14c2..1575d583226 100644
--- a/packages/twenty-front/src/modules/activities/calendar/hooks/useCalendarEventTargetObjectMetadataItems.ts
+++ b/packages/twenty-front/src/modules/activities/calendar/hooks/useCalendarEventTargetObjectMetadataItems.ts
@@ -2,6 +2,7 @@ import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadat
import { useObjectMorphJunctionConfig } from '@/object-record/record-field/ui/hooks/useObjectMorphJunctionConfig';
import { getSearchableObjectMetadataItems } from '@/object-record/record-field/ui/utils/junction/getSearchableObjectMetadataItems';
import { CoreObjectNameSingular } from 'twenty-shared/types';
+import { isDefined } from 'twenty-shared/utils';
export const useCalendarEventTargetObjectMetadataItems = () => {
const { objectMetadataItems } = useObjectMetadataItems();
@@ -9,8 +10,12 @@ export const useCalendarEventTargetObjectMetadataItems = () => {
objectNameSingular: CoreObjectNameSingular.CalendarEvent,
});
- return getSearchableObjectMetadataItems(
- junctionConfig?.targetFields ?? [],
+ if (!isDefined(junctionConfig)) {
+ return [];
+ }
+
+ return getSearchableObjectMetadataItems({
+ junctionConfig,
objectMetadataItems,
- );
+ });
};
diff --git a/packages/twenty-front/src/modules/ai/hooks/useAiChatThreadRecordTargets.ts b/packages/twenty-front/src/modules/ai/hooks/useAiChatThreadRecordTargets.ts
index 926a5a72b8c..115242c65b4 100644
--- a/packages/twenty-front/src/modules/ai/hooks/useAiChatThreadRecordTargets.ts
+++ b/packages/twenty-front/src/modules/ai/hooks/useAiChatThreadRecordTargets.ts
@@ -125,7 +125,7 @@ export const useAiChatThreadRecordTargets = ({
openJunctionRelationPicker({
recordPickerInstanceId,
junctionRecords,
- targetFields: junctionConfig.targetFields,
+ junctionConfig,
});
};
diff --git a/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/types/GenerateDepthRecordGqlFieldsFromFields.ts b/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/types/GenerateDepthRecordGqlFieldsFromFields.ts
index 3cb64f03001..d57febea71e 100644
--- a/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/types/GenerateDepthRecordGqlFieldsFromFields.ts
+++ b/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/types/GenerateDepthRecordGqlFieldsFromFields.ts
@@ -7,6 +7,7 @@ export type GenerateDepthRecordGqlFieldsFromFields = {
| 'id'
| 'fields'
| 'readableFields'
+ | 'updatableFields'
| 'labelIdentifierFieldMetadataId'
| 'imageIdentifierFieldMetadataId'
| 'nameSingular'
diff --git a/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/__tests__/generateDepthRecordGqlFieldsFromFields.test.ts b/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/__tests__/generateDepthRecordGqlFieldsFromFields.test.ts
index 7e1d91e584d..16ef2ce24a4 100644
--- a/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/__tests__/generateDepthRecordGqlFieldsFromFields.test.ts
+++ b/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/__tests__/generateDepthRecordGqlFieldsFromFields.test.ts
@@ -41,13 +41,22 @@ describe('generateDepthRecordGqlFieldsFromFields', () => {
fieldName: 'taskTargets',
});
const taskTargetMetadata = getMockObjectMetadataItemOrThrow('taskTarget');
- const companyTargetSourceFieldMetadataId = getMockFieldMetadataItemOrThrow({
- objectMetadataItem: taskTargetMetadata,
- fieldName: 'target',
- }).morphRelations?.find(
- (morphRelation) =>
- morphRelation.targetObjectMetadata.nameSingular === 'company',
- )?.sourceFieldMetadata.id;
+ const companyTargetRestrictedFields = Object.fromEntries(
+ (
+ getMockFieldMetadataItemOrThrow({
+ objectMetadataItem: taskTargetMetadata,
+ fieldName: 'target',
+ }).morphRelations ?? []
+ )
+ .filter(
+ ({ targetObjectMetadata }) =>
+ targetObjectMetadata.nameSingular === 'company',
+ )
+ .map(({ sourceFieldMetadata }) => [
+ sourceFieldMetadata.id,
+ { canRead: false, canUpdate: false },
+ ]),
+ );
const objectMetadataItems = getTestEnrichedObjectMetadataItemsMock().map(
(objectMetadataItem) =>
@@ -57,12 +66,7 @@ describe('generateDepthRecordGqlFieldsFromFields', () => {
...getPermittedFields({
fields: objectMetadataItem.fields,
objectPermissions: {
- restrictedFields: {
- [companyTargetSourceFieldMetadataId as string]: {
- canRead: false,
- canUpdate: false,
- },
- },
+ restrictedFields: companyTargetRestrictedFields,
},
}),
}
diff --git a/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/generateJunctionRelationGqlFields.ts b/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/generateJunctionRelationGqlFields.ts
index 4244dab69a4..d37edecc654 100644
--- a/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/generateJunctionRelationGqlFields.ts
+++ b/packages/twenty-front/src/modules/object-record/graphql/record-gql-fields/utils/generateJunctionRelationGqlFields.ts
@@ -1,6 +1,7 @@
import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
import { type RecordGqlFields, FieldMetadataType } from 'twenty-shared/types';
import { buildIdentifierGqlFields } from '@/object-record/graphql/record-gql-fields/utils/buildIdentifierGqlFields';
+import { getPermittedJunctionTargetFields } from '@/object-record/record-field/ui/utils/junction/getPermittedJunctionTargetFields';
import { type JunctionObjectMetadataItem } from '@/object-record/record-field/ui/utils/junction/types/JunctionObjectMetadataItem';
import { type ValidJunctionConfig } from '@/object-record/record-field/ui/utils/junction/types/ValidJunctionConfig';
import {
@@ -85,12 +86,9 @@ export const generateJunctionRelationGqlFields = ({
}: GenerateJunctionRelationGqlFieldsArgs): RecordGqlFields => {
const { junctionObjectMetadata, targetFields } = junctionConfig;
- const readableTargetFields = targetFields.flatMap((targetField) => {
- const readableTargetField = junctionObjectMetadata.readableFields.find(
- (readableField) => readableField.id === targetField.id,
- );
-
- return isDefined(readableTargetField) ? [readableTargetField] : [];
+ const readableTargetFields = getPermittedJunctionTargetFields({
+ targetFields,
+ permittedFields: junctionObjectMetadata.readableFields,
});
const junctionTargetFields = readableTargetFields.reduce<RecordGqlFields>(
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSectionDropdownToMany.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSectionDropdownToMany.tsx
index 3c814b22d58..c1e6c113f53 100644
--- a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSectionDropdownToMany.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSectionDropdownToMany.tsx
@@ -95,23 +95,22 @@ export const RecordDetailRelationSectionDropdownToMany = ({
const relationRecords: ObjectRecord[] = (fieldValue as ObjectRecord[]) ?? [];
- const { pickableMorphItems, searchableObjectMetadataItems } = isDefined(
- junctionConfig,
- )
- ? getJunctionRelationPickerData({
- junctionRecords: relationRecords,
- targetFields: junctionConfig.targetFields,
- objectMetadataItems,
- })
- : {
- pickableMorphItems: relationRecords.map(({ id: recordId }) => ({
- recordId,
- objectMetadataId: relationObjectMetadataItem.id,
- isSelected: true,
- isMatchingSearchFilter: true,
- })),
- searchableObjectMetadataItems: [relationObjectMetadataItem],
- };
+ const { pickableMorphItems, searchableObjectMetadataItems } =
+ isJunctionRelation
+ ? getJunctionRelationPickerData({
+ junctionRecords: relationRecords,
+ junctionConfig,
+ objectMetadataItems,
+ })
+ : {
+ pickableMorphItems: relationRecords.map(({ id: recordId }) => ({
+ recordId,
+ objectMetadataId: relationObjectMetadataItem.id,
+ isSelected: true,
+ isMatchingSearchFilter: true,
+ })),
+ searchableObjectMetadataItems: [relationObjectMetadataItem],
+ };
const dropdownId = getRecordFieldCardRelationPickerDropdownId({
fieldDefinition,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useOpenJunctionRelationFieldInput.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useOpenJunctionRelationFieldInput.ts
index 48b317108a3..6529165ddbf 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useOpenJunctionRelationFieldInput.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useOpenJunctionRelationFieldInput.ts
@@ -72,7 +72,7 @@ export const useOpenJunctionRelationFieldInput = () => {
openJunctionRelationPicker({
recordPickerInstanceId: resolvedRecordPickerInstanceId,
junctionRecords,
- targetFields: junctionConfig.targetFields,
+ junctionConfig,
});
pushFocusItemToFocusStack({
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useOpenJunctionRelationPicker.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useOpenJunctionRelationPicker.ts
index 53b944f6fcc..0362d26afd9 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useOpenJunctionRelationPicker.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useOpenJunctionRelationPicker.ts
@@ -1,9 +1,9 @@
import { useStore } from 'jotai';
import { useCallback } from 'react';
-import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';
import { getJunctionRelationPickerData } from '@/object-record/record-field/ui/utils/junction/getJunctionRelationPickerData';
+import { type ValidJunctionConfig } from '@/object-record/record-field/ui/utils/junction/types/ValidJunctionConfig';
import { useMultipleRecordPickerOpen } from '@/object-record/record-picker/multiple-record-picker/hooks/useMultipleRecordPickerOpen';
import { useMultipleRecordPickerPerformSearch } from '@/object-record/record-picker/multiple-record-picker/hooks/useMultipleRecordPickerPerformSearch';
import { multipleRecordPickerPickableMorphItemsComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerPickableMorphItemsComponentState';
@@ -19,16 +19,19 @@ export const useOpenJunctionRelationPicker = () => {
({
recordPickerInstanceId,
junctionRecords,
- targetFields,
+ junctionConfig,
}: {
recordPickerInstanceId: string;
junctionRecords: ObjectRecord[] | undefined | null;
- targetFields: FieldMetadataItem[];
+ junctionConfig: Pick<
+ ValidJunctionConfig,
+ 'junctionObjectMetadata' | 'targetFields'
+ >;
}) => {
const { pickableMorphItems, searchableObjectMetadataItems } =
getJunctionRelationPickerData({
junctionRecords,
- targetFields,
+ junctionConfig,
objectMetadataItems: store.get(objectMetadataItemsSelector.atom),
});
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/__tests__/getJunctionRelationPickerData.test.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/__tests__/getJunctionRelationPickerData.test.ts
index 4bc01fab52b..fbf7e81727b 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/__tests__/getJunctionRelationPickerData.test.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/__tests__/getJunctionRelationPickerData.test.ts
@@ -1,7 +1,10 @@
+import { getPermittedFields } from '@/object-metadata/utils/getPermittedFields';
import { getJunctionRelationPickerData } from '@/object-record/record-field/ui/utils/junction/getJunctionRelationPickerData';
import { getJunctionConfig } from '@/object-record/record-field/ui/utils/junction/getJunctionConfig';
import { getObjectMorphJunctionConfig } from '@/object-record/record-field/ui/utils/junction/getObjectMorphJunctionConfig';
+import { isUsableJunctionConfig } from '@/object-record/record-field/ui/utils/junction/isUsableJunctionConfig';
import { resolveJunctionConfig } from '@/object-record/record-field/ui/utils/junction/resolveJunctionConfig';
+import { isDefined } from 'twenty-shared/utils';
import { getMockFieldMetadataItemOrThrow } from '~/testing/utils/getMockFieldMetadataItemOrThrow';
import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';
import { getTestEnrichedObjectMetadataItemsMock } from '~/testing/utils/getTestEnrichedObjectMetadataItemsMock';
@@ -22,7 +25,7 @@ describe('getJunctionRelationPickerData', () => {
expect(junctionConfig).not.toBeNull();
- if (junctionConfig === null) {
+ if (!isDefined(junctionConfig)) {
throw new Error('Task morph junction config not found');
}
@@ -40,7 +43,7 @@ describe('getJunctionRelationPickerData', () => {
targetPerson: { id: 'person-id' },
},
],
- targetFields: junctionConfig.targetFields,
+ junctionConfig,
objectMetadataItems,
});
@@ -111,7 +114,7 @@ describe('getJunctionRelationPickerData', () => {
company: { id: 'company-id' },
},
],
- targetFields: junctionConfig.targetFields,
+ junctionConfig,
objectMetadataItems,
});
@@ -151,7 +154,7 @@ describe('getJunctionRelationPickerData', () => {
expect(junctionConfig?.direction).toBe('reverse');
- if (junctionConfig === null) {
+ if (!isUsableJunctionConfig(junctionConfig)) {
throw new Error('Reverse task junction config not found');
}
@@ -164,7 +167,7 @@ describe('getJunctionRelationPickerData', () => {
task: { id: 'task-id' },
},
],
- targetFields: junctionConfig.targetFields,
+ junctionConfig,
objectMetadataItems,
});
@@ -183,4 +186,72 @@ describe('getJunctionRelationPickerData', () => {
taskTargetObjectMetadata.id,
);
});
+
+ it('only offers morph targets the role can update', () => {
+ const taskObjectMetadata = getMockObjectMetadataItemOrThrow('task');
+ const taskTargetObjectMetadata =
+ getMockObjectMetadataItemOrThrow('taskTarget');
+ const companyObjectMetadata = getMockObjectMetadataItemOrThrow('company');
+ const companyTargetRestrictedFields = Object.fromEntries(
+ (
+ getMockFieldMetadataItemOrThrow({
+ objectMetadataItem: taskTargetObjectMetadata,
+ fieldName: 'target',
+ }).morphRelations ?? []
+ )
+ .filter(
+ ({ targetObjectMetadata }) =>
+ targetObjectMetadata.id === companyObjectMetadata.id,
+ )
+ .map(({ sourceFieldMetadata }) => [
+ sourceFieldMetadata.id,
+ { canRead: true, canUpdate: false },
+ ]),
+ );
+
+ const objectMetadataItems = getTestEnrichedObjectMetadataItemsMock().map(
+ (objectMetadataItem) =>
+ objectMetadataItem.id === taskTargetObjectMetadata.id
+ ? {
+ ...objectMetadataItem,
+ ...getPermittedFields({
+ fields: objectMetadataItem.fields,
+ objectPermissions: {
+ restrictedFields: companyTargetRestrictedFields,
+ },
+ }),
+ }
+ : objectMetadataItem,
+ );
+
+ const junctionConfig = getObjectMorphJunctionConfig({
+ objectMetadata: taskObjectMetadata,
+ objectMetadataItems,
+ });
+
+ if (!isDefined(junctionConfig)) {
+ throw new Error('Task morph junction config not found');
+ }
+
+ const { pickableMorphItems, searchableObjectMetadataItems } =
+ getJunctionRelationPickerData({
+ junctionRecords: [
+ {
+ id: 'task-target-company-id',
+ __typename: 'TaskTarget',
+ targetCompany: { id: 'company-id' },
+ },
+ ],
+ junctionConfig,
+ objectMetadataItems,
+ });
+
+ expect(pickableMorphItems.map(({ recordId }) => recordId)).toEqual([
+ 'company-id',
+ ]);
+ expect(searchableObjectMetadataItems.map(({ id }) => id)).not.toContain(
+ companyObjectMetadata.id,
+ );
+ expect(searchableObjectMetadataItems.length).toBeGreaterThan(0);
+ });
});
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/getJunctionRelationPickerData.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/getJunctionRelationPickerData.ts
index 8c3924dfe21..a688c369044 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/getJunctionRelationPickerData.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/getJunctionRelationPickerData.ts
@@ -1,17 +1,21 @@
-import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { extractTargetRecordsFromJunction } from '@/object-record/record-field/ui/utils/junction/extractTargetRecordsFromJunction';
+import { getPermittedJunctionTargetFields } from '@/object-record/record-field/ui/utils/junction/getPermittedJunctionTargetFields';
import { getSearchableObjectMetadataItems } from '@/object-record/record-field/ui/utils/junction/getSearchableObjectMetadataItems';
+import { type ValidJunctionConfig } from '@/object-record/record-field/ui/utils/junction/types/ValidJunctionConfig';
import { type RecordPickerPickableMorphItem } from '@/object-record/record-picker/types/RecordPickerPickableMorphItem';
import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
export const getJunctionRelationPickerData = ({
junctionRecords,
- targetFields,
+ junctionConfig: { junctionObjectMetadata, targetFields },
objectMetadataItems,
}: {
junctionRecords: ObjectRecord[] | undefined | null;
- targetFields: FieldMetadataItem[];
+ junctionConfig: Pick<
+ ValidJunctionConfig,
+ 'junctionObjectMetadata' | 'targetFields'
+ >;
objectMetadataItems: EnrichedObjectMetadataItem[];
}): {
pickableMorphItems: RecordPickerPickableMorphItem[];
@@ -19,7 +23,10 @@ export const getJunctionRelationPickerData = ({
} => ({
pickableMorphItems: extractTargetRecordsFromJunction({
junctionRecords,
- targetFields,
+ targetFields: getPermittedJunctionTargetFields({
+ targetFields,
+ permittedFields: junctionObjectMetadata.readableFields,
+ }),
objectMetadataItems,
}).map(({ recordId, objectMetadataId }) => ({
recordId,
@@ -27,8 +34,8 @@ export const getJunctionRelationPickerData = ({
isSelected: true,
isMatchingSearchFilter: true,
})),
- searchableObjectMetadataItems: getSearchableObjectMetadataItems(
- targetFields,
+ searchableObjectMetadataItems: getSearchableObjectMetadataItems({
+ junctionConfig: { junctionObjectMetadata, targetFields },
objectMetadataItems,
- ),
+ }),
});
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/getPermittedJunctionTargetFields.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/getPermittedJunctionTargetFields.ts
new file mode 100644
index 00000000000..81f225da217
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/getPermittedJunctionTargetFields.ts
@@ -0,0 +1,19 @@
+import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
+import { isDefined } from 'twenty-shared/utils';
+
+export const getPermittedJunctionTargetFields = <
+ TPermittedField extends Pick<FieldMetadataItem, 'id'>,
+>({
+ targetFields,
+ permittedFields,
+}: {
+ targetFields: Pick<FieldMetadataItem, 'id'>[];
+ permittedFields: TPermittedField[];
+}): TPermittedField[] =>
+ targetFields
+ .map((targetField) =>
+ permittedFields.find(
+ (permittedField) => permittedField.id === targetField.id,
+ ),
+ )
+ .filter(isDefined);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/getSearchableObjectMetadataItems.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/getSearchableObjectMetadataItems.ts
index d5639c39ffc..bda60177fc9 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/getSearchableObjectMetadataItems.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/getSearchableObjectMetadataItems.ts
@@ -1,15 +1,23 @@
-import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
-import { getTargetObjectMetadataIdsFromField } from './getTargetObjectMetadataIdsFromField';
+import { getPermittedJunctionTargetFields } from '@/object-record/record-field/ui/utils/junction/getPermittedJunctionTargetFields';
+import { getTargetObjectMetadataIdsFromField } from '@/object-record/record-field/ui/utils/junction/getTargetObjectMetadataIdsFromField';
+import { type ValidJunctionConfig } from '@/object-record/record-field/ui/utils/junction/types/ValidJunctionConfig';
import { isDefined } from 'twenty-shared/utils';
-export const getSearchableObjectMetadataItems = (
- targetFields: FieldMetadataItem[],
- objectMetadataItems: EnrichedObjectMetadataItem[],
-): EnrichedObjectMetadataItem[] => {
- const targetObjectIds = targetFields.flatMap(
- getTargetObjectMetadataIdsFromField,
- );
+export const getSearchableObjectMetadataItems = ({
+ junctionConfig: { junctionObjectMetadata, targetFields },
+ objectMetadataItems,
+}: {
+ junctionConfig: Pick<
+ ValidJunctionConfig,
+ 'junctionObjectMetadata' | 'targetFields'
+ >;
+ objectMetadataItems: EnrichedObjectMetadataItem[];
+}): EnrichedObjectMetadataItem[] => {
+ const targetObjectIds = getPermittedJunctionTargetFields({
+ targetFields,
+ permittedFields: junctionObjectMetadata.updatableFields,
+ }).flatMap(getTargetObjectMetadataIdsFromField);
const uniqueTargetObjectIds = [...new Set(targetObjectIds)];
return uniqueTargetObjectIds
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/types/JunctionObjectMetadataItem.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/types/JunctionObjectMetadataItem.ts
index 2cd13e115e3..f9295a6bfc4 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/types/JunctionObjectMetadataItem.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/junction/types/JunctionObjectMetadataItem.ts
@@ -5,6 +5,7 @@ export type JunctionObjectMetadataItem = Pick<
| 'id'
| 'fields'
| 'readableFields'
+ | 'updatableFields'
| 'labelIdentifierFieldMetadataId'
| 'imageIdentifierFieldMetadataId'
| 'nameSingular'
diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/hooks/useMultipleRecordPickerPerformSearch.ts b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/hooks/useMultipleRecordPickerPerformSearch.ts
index 93542cc41d0..019334d7181 100644
--- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/hooks/useMultipleRecordPickerPerformSearch.ts
+++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/hooks/useMultipleRecordPickerPerformSearch.ts
@@ -1,5 +1,6 @@
import { SEARCH_QUERY } from '@/command-menu/graphql/queries/search';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
+import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
import { usePerformCombinedFindManyRecords } from '@/object-record/multiple-objects/hooks/usePerformCombinedFindManyRecords';
@@ -9,6 +10,7 @@ import { multipleRecordPickerPickableMorphItemsComponentState } from '@/object-r
import { multipleRecordPickerSearchFilterComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerSearchFilterComponentState';
import { multipleRecordPickerSearchableObjectMetadataItemsComponentState } from '@/object-record/record-picker/multiple-record-picker/states/multipleRecordPickerSearchableObjectMetadataItemsComponentState';
import { searchRecordStoreFamilyState } from '@/object-record/record-picker/multiple-record-picker/states/searchRecordStoreComponentFamilyState';
+import { getPickedRecordsObjectMetadataItems } from '@/object-record/record-picker/multiple-record-picker/utils/getPickedRecordsObjectMetadataItems';
import { sortMorphItems } from '@/object-record/record-picker/multiple-record-picker/utils/sortMorphItems';
import { type RecordPickerPickableMorphItem } from '@/object-record/record-picker/types/RecordPickerPickableMorphItem';
import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';
@@ -30,6 +32,8 @@ export const useMultipleRecordPickerPerformSearch = () => {
const { objectPermissionsByObjectMetadataId } = useObjectPermissions();
+ const { objectMetadataItems } = useObjectMetadataItems();
+
const performSearch = useCallback(
async ({
multipleRecordPickerInstanceId,
@@ -94,14 +98,21 @@ export const useMultipleRecordPickerPerformSearch = () => {
({ isSelected }) => isSelected,
);
+ const isReadable = (objectMetadataItem: EnrichedObjectMetadataItem) =>
+ getObjectPermissionsForObject(
+ objectPermissionsByObjectMetadataId,
+ objectMetadataItem.id,
+ ).canReadObjectRecords;
+
const filteredSearchableObjectMetadataItems =
- searchableObjectMetadataItems.filter(
- (objectMetadataItem) =>
- getObjectPermissionsForObject(
- objectPermissionsByObjectMetadataId,
- objectMetadataItem.id,
- ).canReadObjectRecords === true,
- );
+ searchableObjectMetadataItems.filter(isReadable);
+
+ const pickedRecordsObjectMetadataItems =
+ getPickedRecordsObjectMetadataItems({
+ searchableObjectMetadataItems,
+ pickedMorphItems: selectedPickableMorphItems,
+ objectMetadataItems,
+ }).filter(isReadable);
const [
searchRecordsFilteredOnPickedRecords,
@@ -111,6 +122,7 @@ export const useMultipleRecordPickerPerformSearch = () => {
client: apolloCoreClient,
searchFilter,
searchableObjectMetadataItems: filteredSearchableObjectMetadataItems,
+ pickedRecordsObjectMetadataItems,
pickedRecordIds: selectedPickableMorphItems.map(
({ recordId }) => recordId,
),
@@ -217,7 +229,7 @@ export const useMultipleRecordPickerPerformSearch = () => {
isMatchingSearchFilter: true,
isSelected: true,
objectMetadataId:
- searchableObjectMetadataItems.find(
+ pickedRecordsObjectMetadataItems.find(
(objectMetadata) =>
objectMetadata.nameSingular === objectNameSingular,
)?.id ?? '',
@@ -229,7 +241,7 @@ export const useMultipleRecordPickerPerformSearch = () => {
isMatchingSearchFilter: true,
isSelected: false,
objectMetadataId:
- searchableObjectMetadataItems.find(
+ pickedRecordsObjectMetadataItems.find(
(objectMetadata) =>
objectMetadata.nameSingular === objectNameSingular,
)?.id ?? '',
@@ -278,7 +290,7 @@ export const useMultipleRecordPickerPerformSearch = () => {
if (searchRecords.length > 0) {
const filterPerMetadataItemFilteredOnRecordId = Object.fromEntries(
- searchableObjectMetadataItems
+ pickedRecordsObjectMetadataItems
.map(({ nameSingular }) => {
const recordIdsForMetadataItem = searchRecords
.filter(
@@ -303,7 +315,7 @@ export const useMultipleRecordPickerPerformSearch = () => {
.filter(isDefined),
);
- const operationSignatures = searchableObjectMetadataItems
+ const operationSignatures = pickedRecordsObjectMetadataItems
.filter(({ nameSingular }) =>
isDefined(
filterPerMetadataItemFilteredOnRecordId[
@@ -364,6 +376,7 @@ export const useMultipleRecordPickerPerformSearch = () => {
apolloCoreClient,
performCombinedFindManyRecords,
objectPermissionsByObjectMetadataId,
+ objectMetadataItems,
store,
],
);
@@ -375,6 +388,7 @@ const performSearchQueries = async ({
client,
searchFilter,
searchableObjectMetadataItems,
+ pickedRecordsObjectMetadataItems,
pickedRecordIds,
limit = MULTIPLE_RECORD_PICKER_PAGE_SIZE,
after = null,
@@ -382,6 +396,7 @@ const performSearchQueries = async ({
client: ApolloClient;
searchFilter: string;
searchableObjectMetadataItems: EnrichedObjectMetadataItem[];
+ pickedRecordsObjectMetadataItems: EnrichedObjectMetadataItem[];
pickedRecordIds: string[];
limit?: number;
after?: string | null;
@@ -392,16 +407,22 @@ const performSearchQueries = async ({
{ hasNextPage: boolean; endCursor: string | null },
]
> => {
- if (searchableObjectMetadataItems.length === 0) {
- return [[], [], { hasNextPage: false, endCursor: null }];
- }
+ const searchRecords = async ({
+ filter,
+ includedObjectMetadataItems,
+ }: {
+ filter: any;
+ includedObjectMetadataItems: EnrichedObjectMetadataItem[];
+ }) => {
+ if (includedObjectMetadataItems.length === 0) {
+ return { records: [], pageInfo: { hasNextPage: false, endCursor: null } };
+ }
- const searchRecords = async (filter: any) => {
const { data } = await client.query({
query: SEARCH_QUERY,
variables: {
searchInput: searchFilter,
- includedObjectNameSingulars: searchableObjectMetadataItems.map(
+ includedObjectNameSingulars: includedObjectMetadataItems.map(
({ nameSingular }) => nameSingular,
),
filter,
@@ -423,24 +444,29 @@ const performSearchQueries = async ({
};
};
- const searchRecordsExcludingPickedRecordsResult = await searchRecords(
- pickedRecordIds.length > 0
- ? {
- not: {
- id: {
- in: pickedRecordIds,
+ const searchRecordsExcludingPickedRecordsResult = await searchRecords({
+ filter:
+ pickedRecordIds.length > 0
+ ? {
+ not: {
+ id: {
+ in: pickedRecordIds,
+ },
},
- },
- }
- : undefined,
- );
+ }
+ : undefined,
+ includedObjectMetadataItems: searchableObjectMetadataItems,
+ });
const searchRecordsIncludingPickedRecordsResult =
pickedRecordIds.length > 0
? await searchRecords({
- id: {
- in: pickedRecordIds,
+ filter: {
+ id: {
+ in: pickedRecordIds,
+ },
},
+ includedObjectMetadataItems: pickedRecordsObjectMetadataItems,
})
: { records: [], pageInfo: { hasNextPage: false, endCursor: null } };
diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/utils/__tests__/getPickedRecordsObjectMetadataItems.test.ts b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/utils/__tests__/getPickedRecordsObjectMetadataItems.test.ts
new file mode 100644
index 00000000000..8cfed4dd199
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/utils/__tests__/getPickedRecordsObjectMetadataItems.test.ts
@@ -0,0 +1,33 @@
+import { getPickedRecordsObjectMetadataItems } from '@/object-record/record-picker/multiple-record-picker/utils/getPickedRecordsObjectMetadataItems';
+import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';
+import { getTestEnrichedObjectMetadataItemsMock } from '~/testing/utils/getTestEnrichedObjectMetadataItemsMock';
+
+describe('getPickedRecordsObjectMetadataItems', () => {
+ const objectMetadataItems = getTestEnrichedObjectMetadataItemsMock();
+ const personObjectMetadata = getMockObjectMetadataItemOrThrow('person');
+ const companyObjectMetadata = getMockObjectMetadataItemOrThrow('company');
+
+ it('adds the objects of picked records that are not searchable', () => {
+ expect(
+ getPickedRecordsObjectMetadataItems({
+ searchableObjectMetadataItems: [personObjectMetadata],
+ pickedMorphItems: [
+ { objectMetadataId: companyObjectMetadata.id },
+ { objectMetadataId: companyObjectMetadata.id },
+ { objectMetadataId: personObjectMetadata.id },
+ ],
+ objectMetadataItems,
+ }).map(({ nameSingular }) => nameSingular),
+ ).toEqual(['person', 'company']);
+ });
+
+ it('keeps the searchable objects when nothing is picked', () => {
+ expect(
+ getPickedRecordsObjectMetadataItems({
+ searchableObjectMetadataItems: [personObjectMetadata],
+ pickedMorphItems: [],
+ objectMetadataItems,
+ }).map(({ nameSingular }) => nameSingular),
+ ).toEqual(['person']);
+ });
+});
diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/utils/getPickedRecordsObjectMetadataItems.ts b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/utils/getPickedRecordsObjectMetadataItems.ts
new file mode 100644
index 00000000000..14d194095aa
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/utils/getPickedRecordsObjectMetadataItems.ts
@@ -0,0 +1,31 @@
+import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
+import { type RecordPickerPickableMorphItem } from '@/object-record/record-picker/types/RecordPickerPickableMorphItem';
+import { isDefined } from 'twenty-shared/utils';
+
+export const getPickedRecordsObjectMetadataItems = ({
+ searchableObjectMetadataItems,
+ pickedMorphItems,
+ objectMetadataItems,
+}: {
+ searchableObjectMetadataItems: EnrichedObjectMetadataItem[];
+ pickedMorphItems: Pick<RecordPickerPickableMorphItem, 'objectMetadataId'>[];
+ objectMetadataItems: EnrichedObjectMetadataItem[];
+}): EnrichedObjectMetadataItem[] => {
+ const pickedObjectMetadataItems = [
+ ...new Set(
+ pickedMorphItems.map(({ objectMetadataId }) => objectMetadataId),
+ ),
+ ]
+ .filter(
+ (objectMetadataId) =>
+ !searchableObjectMetadataItems.some(
+ ({ id }) => id === objectMetadataId,
+ ),
+ )
+ .map((objectMetadataId) =>
+ objectMetadataItems.find(({ id }) => id === objectMetadataId),
+ )
+ .filter(isDefined);
+
+ return [...searchableObjectMetadataItems, ...pickedObjectMetadataItems];
+};