Skip to content

The open alternative to Salesforce, designed for AI.

Writability 3/3: derive record read-only state from writability instead of the system-object flag (#25472)

Félix Malfait88d46d6e97d1
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useGetIsMetadataItemFromStandardApplication.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useGetIsMetadataItemFromStandardApplication.ts
deleted file mode 100644
index 3f6c84a9678..00000000000
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useGetIsMetadataItemFromStandardApplication.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { useCallback } from 'react';
-
-import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
-import { getIsMetadataItemFromStandardApplication } from '@/object-metadata/utils/getIsMetadataItemFromStandardApplication';
-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-
-export const useGetIsMetadataItemFromStandardApplication = () => {
- const currentWorkspace = useAtomStateValue(currentWorkspaceState);
-
- const applications = currentWorkspace?.installedApplications;
-
- return useCallback(
- (metadataItem: { applicationId?: string | null }) =>
- getIsMetadataItemFromStandardApplication(
- metadataItem,
- applications ?? [],
- ),
- [applications],
- );
-};
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/__tests__/getIsMetadataItemFromStandardApplication.test.ts b/packages/twenty-front/src/modules/object-metadata/utils/__tests__/getIsMetadataItemFromStandardApplication.test.ts
deleted file mode 100644
index 863d50471e4..00000000000
--- a/packages/twenty-front/src/modules/object-metadata/utils/__tests__/getIsMetadataItemFromStandardApplication.test.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { getIsMetadataItemFromStandardApplication } from '@/object-metadata/utils/getIsMetadataItemFromStandardApplication';
-import { TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER } from 'twenty-shared/application';
-
-describe('getIsMetadataItemFromStandardApplication', () => {
- const applications = [
- {
- id: 'standard-application-id',
- universalIdentifier: TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER,
- },
- {
- id: 'workspace-custom-application-id',
- universalIdentifier: 'workspace-custom-application-universal-id',
- },
- {
- id: 'installed-application-id',
- universalIdentifier: 'installed-application-universal-id',
- },
- ];
-
- it('should return true when metadata item belongs to the standard application', () => {
- expect(
- getIsMetadataItemFromStandardApplication(
- { applicationId: 'standard-application-id' },
- applications,
- ),
- ).toBe(true);
- });
-
- it('should return false when metadata item belongs to the workspace custom application', () => {
- expect(
- getIsMetadataItemFromStandardApplication(
- { applicationId: 'workspace-custom-application-id' },
- applications,
- ),
- ).toBe(false);
- });
-
- it('should return false when metadata item belongs to an installed application', () => {
- expect(
- getIsMetadataItemFromStandardApplication(
- { applicationId: 'installed-application-id' },
- applications,
- ),
- ).toBe(false);
- });
-
- it('should return undefined when metadata item application cannot be resolved', () => {
- expect(
- getIsMetadataItemFromStandardApplication(
- { applicationId: 'unknown-application-id' },
- applications,
- ),
- ).toBeUndefined();
- });
-});
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/getIsMetadataItemFromStandardApplication.ts b/packages/twenty-front/src/modules/object-metadata/utils/getIsMetadataItemFromStandardApplication.ts
deleted file mode 100644
index 6ce6a9997ac..00000000000
--- a/packages/twenty-front/src/modules/object-metadata/utils/getIsMetadataItemFromStandardApplication.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { isTwentyStandardApplication } from '@/applications/utils/isTwentyStandardApplication';
-import { isDefined } from 'twenty-shared/utils';
-
-type ApplicationLike = {
- id: string;
- universalIdentifier?: string | null;
-};
-
-export const getIsMetadataItemFromStandardApplication = (
- metadataItem: { applicationId?: string | null },
- applications: ApplicationLike[],
-): boolean | undefined => {
- if (!isDefined(metadataItem.applicationId)) {
- return undefined;
- }
-
- const application = applications.find(
- (application) => application.id === metadataItem.applicationId,
- );
-
- if (!isDefined(application) || !isDefined(application.universalIdentifier)) {
- return undefined;
- }
-
- return isTwentyStandardApplication(application);
-};
diff --git a/packages/twenty-front/src/modules/object-record/read-only/hooks/useIsRecordFieldReadOnly.ts b/packages/twenty-front/src/modules/object-record/read-only/hooks/useIsRecordFieldReadOnly.ts
index c5816423557..11e2e504cee 100644
--- a/packages/twenty-front/src/modules/object-record/read-only/hooks/useIsRecordFieldReadOnly.ts
+++ b/packages/twenty-front/src/modules/object-record/read-only/hooks/useIsRecordFieldReadOnly.ts
@@ -1,4 +1,3 @@
-import { useGetIsMetadataItemFromStandardApplication } from '@/object-metadata/hooks/useGetIsMetadataItemFromStandardApplication';
import { useObjectMetadataItemById } from '@/object-metadata/hooks/useObjectMetadataItemById';
import { formatFieldMetadataItemAsFieldDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsFieldDefinition';
import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';
@@ -26,8 +25,6 @@ export const useIsRecordFieldReadOnly = ({
);
const { objectPermissionsByObjectMetadataId } = useObjectPermissions();
- const getIsMetadataItemFromStandardApplication =
- useGetIsMetadataItemFromStandardApplication();
const objectPermissions = getObjectPermissionsForObject(
objectPermissionsByObjectMetadataId,
@@ -50,9 +47,6 @@ export const useIsRecordFieldReadOnly = ({
return isRecordFieldReadOnly({
isRecordReadOnly,
- isSystemObject: objectMetadataItem.isSystem,
- isFieldFromStandardApplication:
- getIsMetadataItemFromStandardApplication(fieldMetadataItem),
objectPermissions,
fieldMetadataItem,
fieldDefinition,
diff --git a/packages/twenty-front/src/modules/object-record/read-only/utils/__tests__/isObjectMetadataReadOnly.test.ts b/packages/twenty-front/src/modules/object-record/read-only/utils/__tests__/isObjectMetadataReadOnly.test.ts
index a5f8007118b..0c9d2ddec72 100644
--- a/packages/twenty-front/src/modules/object-record/read-only/utils/__tests__/isObjectMetadataReadOnly.test.ts
+++ b/packages/twenty-front/src/modules/object-record/read-only/utils/__tests__/isObjectMetadataReadOnly.test.ts
@@ -1,4 +1,5 @@
import { isObjectMetadataReadOnly } from '@/object-record/read-only/utils/isObjectMetadataReadOnly';
+import { MetadataWritability } from '~/generated-metadata/graphql';
describe('isObjectMetadataReadOnly', () => {
it('should return false if object can be updated and is not UI read only and is not remote', () => {
@@ -11,6 +12,7 @@ describe('isObjectMetadataReadOnly', () => {
objectMetadataItem: {
isUIEditable: true,
isRemote: false,
+ writability: MetadataWritability.OPEN,
},
});
@@ -27,6 +29,7 @@ describe('isObjectMetadataReadOnly', () => {
objectMetadataItem: {
isUIEditable: true,
isRemote: false,
+ writability: MetadataWritability.OPEN,
},
});
@@ -43,6 +46,7 @@ describe('isObjectMetadataReadOnly', () => {
objectMetadataItem: {
isUIEditable: false,
isRemote: false,
+ writability: MetadataWritability.OPEN,
},
});
@@ -59,33 +63,39 @@ describe('isObjectMetadataReadOnly', () => {
objectMetadataItem: {
isUIEditable: true,
isRemote: true,
+ writability: MetadataWritability.OPEN,
},
});
expect(result).toBe(true);
});
- it('should return false if object is managed by application', () => {
+ it('should return false without object permissions when the object is OPEN', () => {
const result = isObjectMetadataReadOnly({
objectMetadataItem: {
- applicationId: 'applicationId',
isUIEditable: true,
isRemote: false,
+ writability: MetadataWritability.OPEN,
},
});
expect(result).toBe(false);
});
- it('should return false if object is custom', () => {
+ it('should return true if object metadata writability is not OPEN', () => {
const result = isObjectMetadataReadOnly({
+ objectPermissions: {
+ canUpdateObjectRecords: true,
+ objectMetadataId: '123',
+ restrictedFields: {},
+ },
objectMetadataItem: {
- applicationId: undefined,
isUIEditable: true,
isRemote: false,
+ writability: MetadataWritability.SYSTEM,
},
});
- expect(result).toBe(false);
+ expect(result).toBe(true);
});
});
diff --git a/packages/twenty-front/src/modules/object-record/read-only/utils/__tests__/isRecordFieldReadOnly.test.ts b/packages/twenty-front/src/modules/object-record/read-only/utils/__tests__/isRecordFieldReadOnly.test.ts
index 48633a2f8e8..1cf94a16e73 100644
--- a/packages/twenty-front/src/modules/object-record/read-only/utils/__tests__/isRecordFieldReadOnly.test.ts
+++ b/packages/twenty-front/src/modules/object-record/read-only/utils/__tests__/isRecordFieldReadOnly.test.ts
@@ -1,5 +1,5 @@
import { isRecordFieldReadOnly } from '@/object-record/read-only/utils/isRecordFieldReadOnly';
-import { FieldMetadataType, RelationType } from '~/generated-metadata/graphql';
+import { MetadataWritability } from '~/generated-metadata/graphql';
describe('isRecordFieldReadOnly', () => {
const mockObjectPermissions = {
@@ -14,7 +14,7 @@ describe('isRecordFieldReadOnly', () => {
fieldMetadataItem: {
id: 'field-123',
isUIEditable: true,
- type: FieldMetadataType.TEXT,
+ writability: MetadataWritability.OPEN,
},
};
@@ -73,85 +73,39 @@ describe('isRecordFieldReadOnly', () => {
expect(result).toBe(false);
});
- it('should return true when field is from the standard application on a system object', () => {
+ it('should return true when the field writability is SYSTEM', () => {
const result = isRecordFieldReadOnly({
...mockParams,
- isSystemObject: true,
- isFieldFromStandardApplication: true,
- });
-
- expect(result).toBe(true);
- });
-
- it('should return false when field is not from the standard application on a system object', () => {
- const result = isRecordFieldReadOnly({
- ...mockParams,
- isSystemObject: true,
- isFieldFromStandardApplication: false,
- });
-
- expect(result).toBe(false);
- });
-
- it('should return true when field application is not resolved on a system object', () => {
- const result = isRecordFieldReadOnly({
- ...mockParams,
- isSystemObject: true,
- });
-
- expect(result).toBe(true);
- });
-
- it('should return false for a junction target field on a system object', () => {
- const result = isRecordFieldReadOnly({
- ...mockParams,
- isSystemObject: true,
- isFieldFromStandardApplication: true,
fieldMetadataItem: {
...mockParams.fieldMetadataItem,
- type: FieldMetadataType.RELATION,
- settings: { junctionTargetFieldId: 'target-field-123' },
+ writability: MetadataWritability.SYSTEM,
},
});
- expect(result).toBe(false);
+ expect(result).toBe(true);
});
- it('should return true for a plain relation field on a system object', () => {
+ it('should return true when the field writability is APPLICATION', () => {
const result = isRecordFieldReadOnly({
...mockParams,
- isSystemObject: true,
- isFieldFromStandardApplication: true,
fieldMetadataItem: {
...mockParams.fieldMetadataItem,
- type: FieldMetadataType.RELATION,
- settings: { relationType: RelationType.ONE_TO_MANY },
+ writability: MetadataWritability.APPLICATION,
},
});
expect(result).toBe(true);
});
- it('should keep a junction target field read-only when the record is read-only', () => {
+ it('should treat a missing field writability as OPEN', () => {
const result = isRecordFieldReadOnly({
...mockParams,
- isRecordReadOnly: true,
- isSystemObject: true,
fieldMetadataItem: {
...mockParams.fieldMetadataItem,
- type: FieldMetadataType.RELATION,
- settings: { junctionTargetFieldId: 'target-field-123' },
+ writability: undefined,
},
});
- expect(result).toBe(true);
- });
-
- it('should return false when isSystemObject is not provided', () => {
- const result = isRecordFieldReadOnly({
- ...mockParams,
- });
-
expect(result).toBe(false);
});
});
diff --git a/packages/twenty-front/src/modules/object-record/read-only/utils/__tests__/isRecordReadonly.test.ts b/packages/twenty-front/src/modules/object-record/read-only/utils/__tests__/isRecordReadonly.test.ts
index e9cb206c33e..22b34c21fb8 100644
--- a/packages/twenty-front/src/modules/object-record/read-only/utils/__tests__/isRecordReadonly.test.ts
+++ b/packages/twenty-front/src/modules/object-record/read-only/utils/__tests__/isRecordReadonly.test.ts
@@ -1,4 +1,5 @@
import { isRecordReadOnly } from '@/object-record/read-only/utils/isRecordReadOnly';
+import { MetadataWritability } from '~/generated-metadata/graphql';
describe('isRecordReadOnly', () => {
it('should return false if record is not deleted, has update permissions and object metadata is not read only', () => {
@@ -11,6 +12,7 @@ describe('isRecordReadOnly', () => {
objectMetadataItem: {
isUIEditable: true,
isRemote: false,
+ writability: MetadataWritability.OPEN,
},
});
@@ -27,6 +29,7 @@ describe('isRecordReadOnly', () => {
objectMetadataItem: {
isUIEditable: true,
isRemote: false,
+ writability: MetadataWritability.OPEN,
},
});
@@ -43,6 +46,7 @@ describe('isRecordReadOnly', () => {
objectMetadataItem: {
isUIEditable: true,
isRemote: false,
+ writability: MetadataWritability.OPEN,
},
});
@@ -59,6 +63,7 @@ describe('isRecordReadOnly', () => {
objectMetadataItem: {
isUIEditable: false,
isRemote: false,
+ writability: MetadataWritability.OPEN,
},
});
@@ -75,6 +80,7 @@ describe('isRecordReadOnly', () => {
objectMetadataItem: {
isUIEditable: true,
isRemote: true,
+ writability: MetadataWritability.OPEN,
},
});
diff --git a/packages/twenty-front/src/modules/object-record/read-only/utils/internal/isMetadataWritabilityRestricted.ts b/packages/twenty-front/src/modules/object-record/read-only/utils/internal/isMetadataWritabilityRestricted.ts
new file mode 100644
index 00000000000..240849eca95
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/read-only/utils/internal/isMetadataWritabilityRestricted.ts
@@ -0,0 +1,10 @@
+import { isDefined } from 'twenty-shared/utils';
+import { MetadataWritability } from '~/generated-metadata/graphql';
+
+// Only OPEN metadata accepts writes from a user session: APPLICATION is
+// reserved to the owning application and SYSTEM to the platform itself.
+// Missing writability means the metadata predates the flag, which is OPEN.
+export const isMetadataWritabilityRestricted = (
+ writability: MetadataWritability | null | undefined,
+): boolean =>
+ isDefined(writability) && writability !== MetadataWritability.OPEN;
diff --git a/packages/twenty-front/src/modules/object-record/read-only/utils/isObjectMetadataReadOnly.ts b/packages/twenty-front/src/modules/object-record/read-only/utils/isObjectMetadataReadOnly.ts
index 75dd21f80fb..549a178de8b 100644
--- a/packages/twenty-front/src/modules/object-record/read-only/utils/isObjectMetadataReadOnly.ts
+++ b/packages/twenty-front/src/modules/object-record/read-only/utils/isObjectMetadataReadOnly.ts
@@ -1,4 +1,5 @@
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
+import { isMetadataWritabilityRestricted } from '@/object-record/read-only/utils/internal/isMetadataWritabilityRestricted';
import { type ObjectPermission } from '~/generated-metadata/graphql';
import { isDefined } from 'twenty-shared/utils';
@@ -6,7 +7,7 @@ type IsObjectMetadataReadOnlyParams = {
objectPermissions?: ObjectPermission;
objectMetadataItem?: Pick<
EnrichedObjectMetadataItem,
- 'isUIEditable' | 'isRemote' | 'applicationId'
+ 'isUIEditable' | 'isRemote' | 'writability'
>;
};
@@ -18,6 +19,8 @@ export const isObjectMetadataReadOnly = ({
(isDefined(objectPermissions) &&
!objectPermissions.canUpdateObjectRecords) ||
(isDefined(objectMetadataItem) &&
- (!objectMetadataItem.isUIEditable || objectMetadataItem.isRemote))
+ (!objectMetadataItem.isUIEditable ||
+ objectMetadataItem.isRemote ||
+ isMetadataWritabilityRestricted(objectMetadataItem.writability)))
);
};
diff --git a/packages/twenty-front/src/modules/object-record/read-only/utils/isRecordFieldReadOnly.ts b/packages/twenty-front/src/modules/object-record/read-only/utils/isRecordFieldReadOnly.ts
index 3437727b1d4..6bb50486d20 100644
--- a/packages/twenty-front/src/modules/object-record/read-only/utils/isRecordFieldReadOnly.ts
+++ b/packages/twenty-front/src/modules/object-record/read-only/utils/isRecordFieldReadOnly.ts
@@ -1,7 +1,7 @@
import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
import { isFieldMetadataReadOnlyByPermissions } from '@/object-record/read-only/utils/internal/isFieldMetadataReadOnlyByPermissions';
+import { isMetadataWritabilityRestricted } from '@/object-record/read-only/utils/internal/isMetadataWritabilityRestricted';
import { isOneToManyRelationFieldReadOnlyDueToTargetUpdatePermission } from '@/object-record/read-only/utils/isOneToManyRelationFieldReadOnlyDueToTargetUpdatePermission';
-import { isConfiguredJunctionRelationField } from '@/object-record/record-field/ui/utils/junction/isConfiguredJunctionRelationField';
import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
import { type FieldMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';
import { type ObjectPermission } from '~/generated-metadata/graphql';
@@ -15,11 +15,9 @@ type ObjectPermissionsByObjectMetadataId = Record<
type IsRecordFieldReadOnlyParams = {
isRecordReadOnly: boolean;
- isSystemObject?: boolean;
- isFieldFromStandardApplication?: boolean;
fieldMetadataItem: Pick<
FieldMetadataItem,
- 'id' | 'isUIEditable' | 'type' | 'settings'
+ 'id' | 'isUIEditable' | 'writability'
>;
objectPermissions: ObjectPermission;
fieldDefinition?: FieldDefinition<FieldMetadata>;
@@ -29,8 +27,6 @@ type IsRecordFieldReadOnlyParams = {
export const isRecordFieldReadOnly = ({
objectPermissions,
isRecordReadOnly,
- isSystemObject,
- isFieldFromStandardApplication,
fieldMetadataItem,
fieldDefinition,
objectPermissionsByObjectMetadataId,
@@ -48,25 +44,10 @@ export const isRecordFieldReadOnly = ({
objectPermissionsByObjectMetadataId,
});
- // A junction target field carries links the workspace owns, not data synced
- // from the provider, so it is exempt from the system-object lock below.
- // Record-level read-only still wins.
- const isJunctionTargetField = isConfiguredJunctionRelationField({
- type: fieldMetadataItem.type,
- settings: fieldMetadataItem.settings,
- });
-
- // Keep system-object standard fields read-only. If the application origin
- // cannot be resolved yet, fail closed until metadata finishes loading.
- const isReadOnlyStandardFieldOnSystemObject =
- isSystemObject === true &&
- isFieldFromStandardApplication !== false &&
- !isJunctionTargetField;
-
return (
isRecordReadOnly ||
- isReadOnlyStandardFieldOnSystemObject ||
!(fieldMetadataItem.isUIEditable ?? true) ||
+ isMetadataWritabilityRestricted(fieldMetadataItem.writability) ||
fieldReadOnlyByPermissions ||
oneToManyTargetReadOnly
);
diff --git a/packages/twenty-front/src/modules/object-record/read-only/utils/isRecordReadOnly.ts b/packages/twenty-front/src/modules/object-record/read-only/utils/isRecordReadOnly.ts
index 196bfc4a849..14fa5bd71d5 100644
--- a/packages/twenty-front/src/modules/object-record/read-only/utils/isRecordReadOnly.ts
+++ b/packages/twenty-front/src/modules/object-record/read-only/utils/isRecordReadOnly.ts
@@ -6,7 +6,7 @@ export type IsObjectReadOnlyParams = {
objectPermissions: ObjectPermission;
objectMetadataItem: Pick<
EnrichedObjectMetadataItem,
- 'isUIEditable' | 'isRemote'
+ 'isUIEditable' | 'isRemote' | 'writability'
>;
isRecordDeleted: boolean;
};
diff --git a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardBody.tsx b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardBody.tsx
index 658a8ae8e53..6ab0d27127b 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardBody.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-board/record-board-card/components/RecordBoardCardBody.tsx
@@ -1,4 +1,3 @@
-import { useGetIsMetadataItemFromStandardApplication } from '@/object-metadata/hooks/useGetIsMetadataItemFromStandardApplication';
import { isRecordFieldReadOnly } from '@/object-record/read-only/utils/isRecordFieldReadOnly';
import { RecordBoardContext } from '@/object-record/record-board/contexts/RecordBoardContext';
import { StopPropagationContainer } from '@/object-record/record-board/record-board-card/components/StopPropagationContainer';
@@ -26,8 +25,7 @@ export const RecordBoardCardBody = () => {
RecordBoardCardContext,
);
- const { updateOneRecord, objectPermissions, objectMetadataItem } =
- useContext(RecordBoardContext);
+ const { updateOneRecord, objectPermissions } = useContext(RecordBoardContext);
const {
labelIdentifierFieldMetadataItem,
@@ -59,8 +57,6 @@ export const RecordBoardCardBody = () => {
const setRecordBoardCardHoverPosition = useSetAtomComponentState(
recordBoardCardHoverPositionComponentState,
);
- const getIsMetadataItemFromStandardApplication =
- useGetIsMetadataItemFromStandardApplication();
const handleMouseEnter = (index: number) => {
setRecordBoardCardHoverPosition(index);
@@ -92,12 +88,6 @@ export const RecordBoardCardBody = () => {
isLabelIdentifier: false,
isRecordFieldReadOnly: isRecordFieldReadOnly({
isRecordReadOnly,
- isSystemObject: objectMetadataItem.isSystem,
- isFieldFromStandardApplication:
- getIsMetadataItemFromStandardApplication({
- applicationId:
- correspondingFieldDefinition.metadata.applicationId,
- }),
objectPermissions,
fieldMetadataItem,
fieldDefinition: correspondingFieldDefinition,
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardBody.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardBody.tsx
index b4c401e1799..f751dd5fae7 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardBody.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardBody.tsx
@@ -1,4 +1,3 @@
-import { useGetIsMetadataItemFromStandardApplication } from '@/object-metadata/hooks/useGetIsMetadataItemFromStandardApplication';
import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
import { isRecordFieldReadOnly } from '@/object-record/read-only/utils/isRecordFieldReadOnly';
import { StopPropagationContainer } from '@/object-record/record-board/record-board-card/components/StopPropagationContainer';
@@ -71,8 +70,6 @@ export const RecordCalendarCardBody = ({
const setRecordCalendarCardHoverPosition = useSetAtomComponentState(
recordCalendarCardHoverPositionComponentState,
);
- const getIsMetadataItemFromStandardApplication =
- useGetIsMetadataItemFromStandardApplication();
const handleMouseEnter = (index: number) => {
setRecordCalendarCardHoverPosition(index);
@@ -106,12 +103,6 @@ export const RecordCalendarCardBody = ({
isLabelIdentifier: false,
isRecordFieldReadOnly: isRecordFieldReadOnly({
isRecordReadOnly,
- isSystemObject: objectMetadataItem.isSystem,
- isFieldFromStandardApplication:
- getIsMetadataItemFromStandardApplication({
- applicationId:
- correspondingFieldDefinition.metadata.applicationId,
- }),
objectPermissions,
fieldMetadataItem,
fieldDefinition: correspondingFieldDefinition,
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/components/RecordFieldList.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/components/RecordFieldList.tsx
index 916a80955e5..7355c07ac15 100644
--- a/packages/twenty-front/src/modules/object-record/record-field-list/components/RecordFieldList.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field-list/components/RecordFieldList.tsx
@@ -1,4 +1,3 @@
-import { useGetIsMetadataItemFromStandardApplication } from '@/object-metadata/hooks/useGetIsMetadataItemFromStandardApplication';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
import { formatFieldMetadataItemAsColumnDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsColumnDefinition';
@@ -54,8 +53,6 @@ export const RecordFieldList = ({
const { objectPermissionsByObjectMetadataId } = useObjectPermissions();
const { objectMetadataItems } = useObjectMetadataItems();
- const getIsMetadataItemFromStandardApplication =
- useGetIsMetadataItemFromStandardApplication();
const { useUpdateOneObjectRecordMutation } = useRecordShowContainerActions({
objectNameSingular,
@@ -111,14 +108,11 @@ export const RecordFieldList = ({
isDisplayModeFixHeight: true,
isRecordFieldReadOnly: isRecordFieldReadOnly({
isRecordReadOnly,
- isSystemObject: objectMetadataItem.isSystem,
objectPermissions:
getObjectPermissionsFromMapByObjectMetadataId({
objectPermissionsByObjectMetadataId,
objectMetadataId: objectMetadataItem.id,
}),
- isFieldFromStandardApplication:
- getIsMetadataItemFromStandardApplication(fieldMetadataItem),
fieldMetadataItem,
fieldDefinition,
objectPermissionsByObjectMetadataId,
@@ -185,14 +179,11 @@ export const RecordFieldList = ({
isDisplayModeFixHeight: true,
isRecordFieldReadOnly: isRecordFieldReadOnly({
isRecordReadOnly,
- isSystemObject: objectMetadataItem.isSystem,
objectPermissions:
getObjectPermissionsFromMapByObjectMetadataId({
objectPermissionsByObjectMetadataId,
objectMetadataId: objectMetadataItem.id,
}),
- isFieldFromStandardApplication:
- getIsMetadataItemFromStandardApplication(fieldMetadataItem),
fieldMetadataItem,
fieldDefinition,
objectPermissionsByObjectMetadataId,
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFieldContextGeneric.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFieldContextGeneric.tsx
index 3cc9b131bcc..8e470555a78 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFieldContextGeneric.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFieldContextGeneric.tsx
@@ -1,4 +1,3 @@
-import { useGetIsMetadataItemFromStandardApplication } from '@/object-metadata/hooks/useGetIsMetadataItemFromStandardApplication';
import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';
import { isLabelIdentifierField } from '@/object-metadata/utils/isLabelIdentifierField';
import { isRecordFieldReadOnly } from '@/object-record/read-only/utils/isRecordFieldReadOnly';
@@ -47,8 +46,6 @@ export const RecordTableCellFieldContextGeneric = ({
fieldMetadataItemByFieldMetadataItemId[recordField.fieldMetadataItemId];
const updateRecord = useContext(RecordTableUpdateContext);
- const getIsMetadataItemFromStandardApplication =
- useGetIsMetadataItemFromStandardApplication();
if (!isDefined(fieldMetadataItem)) {
return null;
@@ -126,11 +123,6 @@ export const RecordTableCellFieldContextGeneric = ({
isInvalidJunctionRelation ||
isRecordFieldReadOnly({
isRecordReadOnly: isRecordReadOnly ?? false,
- isSystemObject: objectMetadataItem.isSystem,
- isFieldFromStandardApplication:
- getIsMetadataItemFromStandardApplication({
- applicationId: fieldDefinition.metadata.applicationId,
- }),
objectPermissions,
fieldMetadataItem,
fieldDefinition,
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFieldContextLabelIdentifier.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFieldContextLabelIdentifier.tsx
index b92f0cb990c..58d9b7edc1f 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFieldContextLabelIdentifier.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellFieldContextLabelIdentifier.tsx
@@ -1,4 +1,3 @@
-import { useGetIsMetadataItemFromStandardApplication } from '@/object-metadata/hooks/useGetIsMetadataItemFromStandardApplication';
import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';
import { isRecordFieldReadOnly } from '@/object-record/read-only/utils/isRecordFieldReadOnly';
import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
@@ -43,8 +42,6 @@ export const RecordTableCellFieldContextLabelIdentifier = ({
const hasObjectReadPermissions = objectPermissions.canReadObjectRecords;
const updateRecord = useContext(RecordTableUpdateContext);
- const getIsMetadataItemFromStandardApplication =
- useGetIsMetadataItemFromStandardApplication();
const fieldDefinition =
fieldDefinitionByFieldMetadataItemId[recordField.fieldMetadataItemId];
@@ -71,11 +68,6 @@ export const RecordTableCellFieldContextLabelIdentifier = ({
isRecordTableCellsNonEditable ||
isRecordFieldReadOnly({
isRecordReadOnly: isRecordReadOnly ?? false,
- isSystemObject: objectMetadataItem.isSystem,
- isFieldFromStandardApplication:
- getIsMetadataItemFromStandardApplication({
- applicationId: fieldDefinition.metadata.applicationId,
- }),
objectPermissions,
fieldMetadataItem,
fieldDefinition,
diff --git a/packages/twenty-front/src/modules/object-record/utils/__tests__/canCreateRecordsForObjectMetadataItem.test.ts b/packages/twenty-front/src/modules/object-record/utils/__tests__/canCreateRecordsForObjectMetadataItem.test.ts
index ef67f4134b9..476f3b6aaea 100644
--- a/packages/twenty-front/src/modules/object-record/utils/__tests__/canCreateRecordsForObjectMetadataItem.test.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/__tests__/canCreateRecordsForObjectMetadataItem.test.ts
@@ -5,9 +5,7 @@ const creatableObjectMetadataItem = {
isUICreatable: true,
writability: MetadataWritability.OPEN,
isUIEditable: true,
- isSystem: false,
isRemote: false,
- applicationId: 'applicationId',
};
const objectPermissionsAllowingUpdate = {
@@ -17,7 +15,7 @@ const objectPermissionsAllowingUpdate = {
};
describe('canCreateRecordsForObjectMetadataItem', () => {
- it('should return true for a creatable, editable, non-system, non-remote object with update permission', () => {
+ it('should return true for a creatable, editable, OPEN, non-remote object with update permission', () => {
const result = canCreateRecordsForObjectMetadataItem({
objectPermissions: objectPermissionsAllowingUpdate,
objectMetadataItem: creatableObjectMetadataItem,
@@ -38,28 +36,28 @@ describe('canCreateRecordsForObjectMetadataItem', () => {
expect(result).toBe(false);
});
- it('should return false when the object is not UI editable', () => {
+ it('should return false when the object writability is not OPEN', () => {
const result = canCreateRecordsForObjectMetadataItem({
objectPermissions: objectPermissionsAllowingUpdate,
objectMetadataItem: {
...creatableObjectMetadataItem,
- isUIEditable: false,
+ writability: MetadataWritability.SYSTEM,
},
});
expect(result).toBe(false);
});
- it('should return true for a UI-creatable system object (isSystem only controls Data-Model visibility)', () => {
+ it('should return false when the object is not UI editable', () => {
const result = canCreateRecordsForObjectMetadataItem({
objectPermissions: objectPermissionsAllowingUpdate,
objectMetadataItem: {
...creatableObjectMetadataItem,
- isSystem: true,
+ isUIEditable: false,
},
});
- expect(result).toBe(true);
+ expect(result).toBe(false);
});
it('should return false when the object is remote', () => {
diff --git a/packages/twenty-front/src/modules/object-record/utils/canCreateRecordsForObjectMetadataItem.ts b/packages/twenty-front/src/modules/object-record/utils/canCreateRecordsForObjectMetadataItem.ts
index 5c5383086db..9753828095d 100644
--- a/packages/twenty-front/src/modules/object-record/utils/canCreateRecordsForObjectMetadataItem.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/canCreateRecordsForObjectMetadataItem.ts
@@ -6,14 +6,15 @@ type CanCreateRecordsForObjectMetadataItemParams = {
objectPermissions?: ObjectPermission;
objectMetadataItem: Pick<
EnrichedObjectMetadataItem,
- 'isUICreatable' | 'isUIEditable' | 'isSystem' | 'isRemote' | 'applicationId'
+ 'isUICreatable' | 'isUIEditable' | 'isRemote' | 'writability'
>;
};
// Single predicate for every generic "create a record" UI affordance.
-// Creatability is driven solely by isUICreatable: isSystem only controls
-// Data-Model visibility, so a system object can still be user-creatable
-// (e.g. marketing message lists kept out of the Data Model).
+// Creatability is driven by isUICreatable: isSystem only controls Data-Model
+// visibility, so a system object can still be user-creatable (e.g. marketing
+// message lists kept out of the Data Model), while a non-OPEN writability
+// rules the user session out regardless of the affordance flags.
// Creation requires effective editability because today's inline creation UX
// creates a blank record that the user must then be able to edit.
// There is no CREATE permission yet, so canUpdateObjectRecords (checked
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionFieldEdit.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionFieldEdit.tsx
index 44341acf1fc..3282e9821b5 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionFieldEdit.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionFieldEdit.tsx
@@ -1,4 +1,3 @@
-import { useGetIsMetadataItemFromStandardApplication } from '@/object-metadata/hooks/useGetIsMetadataItemFromStandardApplication';
import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
import { useIsRecordReadOnly } from '@/object-record/read-only/hooks/useIsRecordReadOnly';
import { isRecordFieldReadOnly } from '@/object-record/read-only/utils/isRecordFieldReadOnly';
@@ -37,8 +36,6 @@ export const WidgetActionFieldEdit = ({
useFieldWidgetFieldDefinition(widget);
const { objectPermissionsByObjectMetadataId } = useObjectPermissions();
- const getIsMetadataItemFromStandardApplication =
- useGetIsMetadataItemFromStandardApplication();
const { useUpdateOneObjectRecordMutation } = useRecordShowContainerActions({
objectNameSingular: objectMetadataItem.nameSingular,
@@ -92,13 +89,10 @@ export const WidgetActionFieldEdit = ({
isDisplayModeFixHeight: false,
isRecordFieldReadOnly: isRecordFieldReadOnly({
isRecordReadOnly,
- isSystemObject: objectMetadataItem.isSystem,
objectPermissions: getObjectPermissionsFromMapByObjectMetadataId({
objectPermissionsByObjectMetadataId,
objectMetadataId: objectMetadataItem.id,
}),
- isFieldFromStandardApplication:
- getIsMetadataItemFromStandardApplication(fieldMetadataItem),
fieldMetadataItem,
fieldDefinition,
objectPermissionsByObjectMetadataId,
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetDisplay.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetDisplay.tsx
index a3fd1325622..2ed113d2fa1 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetDisplay.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetDisplay.tsx
@@ -1,4 +1,3 @@
-import { useGetIsMetadataItemFromStandardApplication } from '@/object-metadata/hooks/useGetIsMetadataItemFromStandardApplication';
import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
@@ -54,8 +53,6 @@ export const FieldWidgetDisplay = ({
});
const { objectPermissionsByObjectMetadataId } = useObjectPermissions();
- const getIsMetadataItemFromStandardApplication =
- useGetIsMetadataItemFromStandardApplication();
const { useUpdateOneObjectRecordMutation } = useRecordShowContainerActions({
objectNameSingular: objectMetadataItem.nameSingular,
@@ -92,14 +89,11 @@ export const FieldWidgetDisplay = ({
isDisplayModeFixHeight: false,
isRecordFieldReadOnly: isRecordFieldReadOnly({
isRecordReadOnly,
- isSystemObject: objectMetadataItem.isSystem,
objectPermissions:
getObjectPermissionsFromMapByObjectMetadataId({
objectPermissionsByObjectMetadataId,
objectMetadataId: objectMetadataItem.id,
}),
- isFieldFromStandardApplication:
- getIsMetadataItemFromStandardApplication(fieldMetadataItem),
fieldMetadataItem,
fieldDefinition,
objectPermissionsByObjectMetadataId,
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/hooks/useFieldWidgetActionVisibility.ts b/packages/twenty-front/src/modules/page-layout/widgets/field/hooks/useFieldWidgetActionVisibility.ts
index c5369406711..ea1821ce8f1 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/field/hooks/useFieldWidgetActionVisibility.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/hooks/useFieldWidgetActionVisibility.ts
@@ -1,4 +1,3 @@
-import { useGetIsMetadataItemFromStandardApplication } from '@/object-metadata/hooks/useGetIsMetadataItemFromStandardApplication';
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
import { useIsRecordReadOnly } from '@/object-record/read-only/hooks/useIsRecordReadOnly';
@@ -30,8 +29,6 @@ export const useFieldWidgetActionVisibility = ({
const { objectPermissionsByObjectMetadataId } = useObjectPermissions();
const { objectMetadataItems } = useObjectMetadataItems();
- const getIsMetadataItemFromStandardApplication =
- useGetIsMetadataItemFromStandardApplication();
const isRecordReadOnly = useIsRecordReadOnly({
recordId: targetRecord.id,
@@ -77,13 +74,10 @@ export const useFieldWidgetActionVisibility = ({
const isFieldReadOnly = isRecordFieldReadOnly({
isRecordReadOnly,
- isSystemObject: objectMetadataItem.isSystem,
objectPermissions: getObjectPermissionsFromMapByObjectMetadataId({
objectPermissionsByObjectMetadataId,
objectMetadataId: objectMetadataItem.id,
}),
- isFieldFromStandardApplication:
- getIsMetadataItemFromStandardApplication(fieldMetadataItem),
fieldMetadataItem,
fieldDefinition,
objectPermissionsByObjectMetadataId,
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidgetFieldItem.tsx b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidgetFieldItem.tsx
index 8b65aac2b2f..f8a8a00f5ef 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidgetFieldItem.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidgetFieldItem.tsx
@@ -1,4 +1,3 @@
-import { useGetIsMetadataItemFromStandardApplication } from '@/object-metadata/hooks/useGetIsMetadataItemFromStandardApplication';
import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { formatFieldMetadataItemAsColumnDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsColumnDefinition';
@@ -44,9 +43,6 @@ export const FieldsWidgetFieldItem = ({
instanceId,
onMouseEnter,
}: FieldsWidgetFieldItemProps) => {
- const getIsMetadataItemFromStandardApplication =
- useGetIsMetadataItemFromStandardApplication();
-
const fieldDefinition = formatFieldMetadataItemAsColumnDefinition({
field: fieldMetadataItem,
position: globalIndex,
@@ -67,13 +63,10 @@ export const FieldsWidgetFieldItem = ({
isDisplayModeFixHeight: true,
isRecordFieldReadOnly: isRecordFieldReadOnly({
isRecordReadOnly,
- isSystemObject: objectMetadataItem.isSystem,
objectPermissions: getObjectPermissionsFromMapByObjectMetadataId({
objectPermissionsByObjectMetadataId,
objectMetadataId: objectMetadataItem.id,
}),
- isFieldFromStandardApplication:
- getIsMetadataItemFromStandardApplication(fieldMetadataItem),
fieldMetadataItem,
fieldDefinition,
objectPermissionsByObjectMetadataId,