Skip to content

The open alternative to Salesforce, designed for AI.

Skip morph relation targets the role cannot read (#28922)

neo773a6372e288ade
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/__tests__/getPermittedFields.test.ts b/packages/twenty-front/src/modules/object-metadata/utils/__tests__/getPermittedFields.test.ts
index 77190d78c20..6e35d9f0dbd 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/__tests__/getPermittedFields.test.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/__tests__/getPermittedFields.test.ts
@@ -34,4 +34,71 @@ describe('getPermittedFields', () => {
updatableFields: [nameField, addressField],
});
});
+
+ describe('morph relation fields', () => {
+ const targetField = getMockFieldMetadataItemOrThrow({
+ objectMetadataItem: getMockObjectMetadataItemOrThrow('taskTarget'),
+ fieldName: 'target',
+ });
+ const headField: FieldMetadataItem = {
+ ...targetField,
+ id: '6f1c0e0a-5d3b-4c6e-9a51-3b8f6e2d7c40',
+ };
+ const morphRelations = headField.morphRelations ?? [];
+ const [firstMorphRelation] = morphRelations;
+
+ const getTargetNames = (field: FieldMetadataItem | undefined) =>
+ field?.morphRelations?.map(
+ (morphRelation) => morphRelation.targetObjectMetadata.nameSingular,
+ );
+
+ it('should drop only the targets the role cannot read or update', () => {
+ const { readableFields, updatableFields } = getPermittedFields({
+ fields: [headField],
+ objectPermissions: {
+ restrictedFields: {
+ [firstMorphRelation.sourceFieldMetadata.id]: {
+ canRead: false,
+ canUpdate: false,
+ },
+ },
+ },
+ });
+
+ const expectedTargetNames = getTargetNames(headField)?.slice(1);
+
+ expect(getTargetNames(readableFields[0])).toEqual(expectedTargetNames);
+ expect(getTargetNames(updatableFields[0])).toEqual(expectedTargetNames);
+ });
+
+ it('should drop the field when its head is restricted', () => {
+ expect(
+ getPermittedFields({
+ fields: [headField],
+ objectPermissions: {
+ restrictedFields: {
+ [headField.id]: { canRead: false, canUpdate: true },
+ },
+ },
+ }),
+ ).toEqual({ readableFields: [], updatableFields: [headField] });
+ });
+
+ it('should keep the field without targets when no target is readable', () => {
+ const { readableFields, updatableFields } = getPermittedFields({
+ fields: [headField],
+ objectPermissions: {
+ restrictedFields: Object.fromEntries(
+ morphRelations.map((morphRelation) => [
+ morphRelation.sourceFieldMetadata.id,
+ { canRead: false, canUpdate: true },
+ ]),
+ ),
+ },
+ });
+
+ expect(getTargetNames(readableFields[0])).toEqual([]);
+ expect(updatableFields).toEqual([headField]);
+ });
+ });
});
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/getPermittedFields.ts b/packages/twenty-front/src/modules/object-metadata/utils/getPermittedFields.ts
index 640bab6ba9e..9c71dea8888 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/getPermittedFields.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/getPermittedFields.ts
@@ -1,12 +1,39 @@
import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
import { getFieldPermissions } from '@/object-metadata/utils/getFieldPermissions';
import { type ObjectPermissions } from 'twenty-shared/types';
+import { isDefined } from 'twenty-shared/utils';
type GetPermittedFieldsArgs = {
fields: FieldMetadataItem[];
objectPermissions: Pick<ObjectPermissions, 'restrictedFields'>;
};
+const getFieldWithPermittedMorphTargets = ({
+ field,
+ objectPermissions,
+ permission,
+}: {
+ field: FieldMetadataItem;
+ objectPermissions: GetPermittedFieldsArgs['objectPermissions'];
+ permission: 'canReadField' | 'canUpdateField';
+}): FieldMetadataItem => {
+ if (!isDefined(field.morphRelations)) {
+ return field;
+ }
+
+ const permittedMorphRelations = field.morphRelations.filter(
+ (morphRelation) =>
+ getFieldPermissions({
+ objectPermissions,
+ fieldMetadataId: morphRelation.sourceFieldMetadata.id,
+ })[permission],
+ );
+
+ return permittedMorphRelations.length === field.morphRelations.length
+ ? field
+ : { ...field, morphRelations: permittedMorphRelations };
+};
+
export const getPermittedFields = ({
fields,
objectPermissions,
@@ -21,11 +48,23 @@ export const getPermittedFields = ({
});
if (canReadField) {
- readableFields.push(field);
+ readableFields.push(
+ getFieldWithPermittedMorphTargets({
+ field,
+ objectPermissions,
+ permission: 'canReadField',
+ }),
+ );
}
if (canUpdateField) {
- updatableFields.push(field);
+ updatableFields.push(
+ getFieldWithPermittedMorphTargets({
+ field,
+ objectPermissions,
+ permission: 'canUpdateField',
+ }),
+ );
}
}
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 2ceda9fd5a6..3cb64f03001 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
@@ -6,6 +6,7 @@ export type GenerateDepthRecordGqlFieldsFromFields = {
EnrichedObjectMetadataItem,
| 'id'
| 'fields'
+ | 'readableFields'
| '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 707d090f41c..7e1d91e584d 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
@@ -1,3 +1,4 @@
+import { getPermittedFields } from '@/object-metadata/utils/getPermittedFields';
import { generateDepthRecordGqlFieldsFromFields } from '@/object-record/graphql/record-gql-fields/utils/generateDepthRecordGqlFieldsFromFields';
import { getMockFieldMetadataItemOrThrow } from '~/testing/utils/getMockFieldMetadataItemOrThrow';
import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';
@@ -32,4 +33,50 @@ describe('generateDepthRecordGqlFieldsFromFields', () => {
}),
).not.toHaveProperty('taskTargets');
});
+
+ it('does not query junction morph targets the role cannot read', () => {
+ const taskMetadata = getMockObjectMetadataItemOrThrow('task');
+ const taskTargetsField = getMockFieldMetadataItemOrThrow({
+ objectMetadataItem: taskMetadata,
+ fieldName: 'taskTargets',
+ });
+ const taskTargetMetadata = getMockObjectMetadataItemOrThrow('taskTarget');
+ const companyTargetSourceFieldMetadataId = getMockFieldMetadataItemOrThrow({
+ objectMetadataItem: taskTargetMetadata,
+ fieldName: 'target',
+ }).morphRelations?.find(
+ (morphRelation) =>
+ morphRelation.targetObjectMetadata.nameSingular === 'company',
+ )?.sourceFieldMetadata.id;
+
+ const objectMetadataItems = getTestEnrichedObjectMetadataItemsMock().map(
+ (objectMetadataItem) =>
+ objectMetadataItem.id === taskTargetMetadata.id
+ ? {
+ ...objectMetadataItem,
+ ...getPermittedFields({
+ fields: objectMetadataItem.fields,
+ objectPermissions: {
+ restrictedFields: {
+ [companyTargetSourceFieldMetadataId as string]: {
+ canRead: false,
+ canUpdate: false,
+ },
+ },
+ },
+ }),
+ }
+ : objectMetadataItem,
+ );
+
+ const { taskTargets } = generateDepthRecordGqlFieldsFromFields({
+ objectMetadataItems,
+ sourceObjectMetadataItem: taskMetadata,
+ fields: [taskTargetsField],
+ depth: 1,
+ });
+
+ expect(taskTargets).toHaveProperty('targetPerson');
+ expect(taskTargets).not.toHaveProperty('targetCompany');
+ });
});
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 414532d01b5..4244dab69a4 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
@@ -85,7 +85,15 @@ export const generateJunctionRelationGqlFields = ({
}: GenerateJunctionRelationGqlFieldsArgs): RecordGqlFields => {
const { junctionObjectMetadata, targetFields } = junctionConfig;
- const junctionTargetFields = targetFields.reduce<RecordGqlFields>(
+ const readableTargetFields = targetFields.flatMap((targetField) => {
+ const readableTargetField = junctionObjectMetadata.readableFields.find(
+ (readableField) => readableField.id === targetField.id,
+ );
+
+ return isDefined(readableTargetField) ? [readableTargetField] : [];
+ });
+
+ const junctionTargetFields = readableTargetFields.reduce<RecordGqlFields>(
(acc, targetField) => ({
...acc,
...buildTargetFieldGqlFields(targetField, objectMetadataItems),
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 665ede385a4..2cd13e115e3 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
@@ -4,6 +4,7 @@ export type JunctionObjectMetadataItem = Pick<
EnrichedObjectMetadataItem,
| 'id'
| 'fields'
+ | 'readableFields'
| 'labelIdentifierFieldMetadataId'
| 'imageIdentifierFieldMetadataId'
| 'nameSingular'