Skip to content

The open alternative to Salesforce, designed for AI.

refactor(permissions): one way to read object, field and flag permissions (#27114)

Félix Malfaitf8900bc15c28
diff --git a/packages/twenty-front/src/modules/ai/components/AIChatNoMoreBillingCreditsBanner.tsx b/packages/twenty-front/src/modules/ai/components/AIChatNoMoreBillingCreditsBanner.tsx
index 5cd9d55b7c5..388394d81c7 100644
--- a/packages/twenty-front/src/modules/ai/components/AIChatNoMoreBillingCreditsBanner.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AIChatNoMoreBillingCreditsBanner.tsx
@@ -3,7 +3,7 @@ import { useAiChatEndTrialPeriod } from '@/ai/hooks/useAiChatEndTrialPeriod';
import { AddCreditCardModal } from '@/settings/billing/components/AddCreditCardModal';
import { StartSubscriptionConfirmationModal } from '@/settings/billing/components/StartSubscriptionConfirmationModal';
import { useCreditUpgradeAction } from '@/settings/billing/hooks/useCreditUpgradeAction';
-import { usePermissionFlagMap } from '@/settings/roles/hooks/usePermissionFlagMap';
+import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
import { ConfirmationDialog } from '@/ui/layout/dialog/components/ConfirmationDialog';
import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
import { useSubscriptionStatus } from '@/workspace/hooks/useSubscriptionStatus';
@@ -24,8 +24,9 @@ export const AIChatNoMoreBillingCreditsBanner = () => {
const { openDialog } = useDialog();
- const { [PermissionFlagType.BILLING]: hasPermissionToManageBilling } =
- usePermissionFlagMap();
+ const hasPermissionToManageBilling = useHasPermissionFlag(
+ PermissionFlagType.BILLING,
+ );
const isTrialing = subscriptionStatus === SubscriptionStatus.Trialing;
diff --git a/packages/twenty-front/src/modules/ai/hooks/useChatReferenceTarget.tsx b/packages/twenty-front/src/modules/ai/hooks/useChatReferenceTarget.tsx
index ebd654bcba1..253e10d3466 100644
--- a/packages/twenty-front/src/modules/ai/hooks/useChatReferenceTarget.tsx
+++ b/packages/twenty-front/src/modules/ai/hooks/useChatReferenceTarget.tsx
@@ -18,7 +18,7 @@ import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataI
import { objectMetadataItemFamilySelector } from '@/object-metadata/states/objectMetadataItemFamilySelector';
import { objectMetadataItemsByIdMapSelector } from '@/object-metadata/states/objectMetadataItemsByIdMapSelector';
import { getLinkToShowPage } from '@/object-metadata/utils/getLinkToShowPage';
-import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
+import { permissionFlagMapSelector } from '@/settings/roles/states/permissionFlagMapSelector';
import { useOpenRecordInSidePanel } from '@/side-panel/hooks/useOpenRecordInSidePanel';
import { useOpenRoutedPageInSidePanel } from '@/side-panel/routing/hooks/useOpenRoutedPageInSidePanel';
import { DEFAULT_SKILL_ICON } from '@/skill-suggestion/constants/DefaultSkillIcon';
@@ -48,9 +48,12 @@ export const useChatReferenceTarget = (
const isAiChatArtifactSurface = useIsAiChatArtifactSurface();
const { openRecordInSidePanel } = useOpenRecordInSidePanel();
const { openRoutedPageInSidePanel } = useOpenRoutedPageInSidePanel();
- const hasPermission = useHasPermissionFlag(
- CHAT_REFERENCE_PERMISSION_FLAG_BY_KIND[reference.kind],
- );
+ const permissionFlagMap = useAtomStateValue(permissionFlagMapSelector);
+ const requiredPermissionFlag =
+ CHAT_REFERENCE_PERMISSION_FLAG_BY_KIND[reference.kind];
+ const hasPermission =
+ !isDefined(requiredPermissionFlag) ||
+ permissionFlagMap[requiredPermissionFlag];
const objectMetadataItem = useAtomFamilySelectorValue(
objectMetadataItemFamilySelector,
{
diff --git a/packages/twenty-front/src/modules/auth/states/currentUserWorkspaceObjectsPermissionsSelector.ts b/packages/twenty-front/src/modules/auth/states/currentUserWorkspaceObjectsPermissionsSelector.ts
new file mode 100644
index 00000000000..e1b4cdc4226
--- /dev/null
+++ b/packages/twenty-front/src/modules/auth/states/currentUserWorkspaceObjectsPermissionsSelector.ts
@@ -0,0 +1,9 @@
+import { currentUserWorkspaceState } from '@/auth/states/currentUserWorkspaceState';
+import { type CurrentUserWorkspaceObjectPermissions } from '@/auth/types/CurrentUserWorkspaceObjectPermissions';
+import { createAtomSelector } from '@/ui/utilities/state/jotai/utils/createAtomSelector';
+
+export const currentUserWorkspaceObjectsPermissionsSelector =
+ createAtomSelector<CurrentUserWorkspaceObjectPermissions[] | undefined>({
+ key: 'currentUserWorkspaceObjectsPermissionsSelector',
+ get: ({ get }) => get(currentUserWorkspaceState)?.objectsPermissions,
+ });
diff --git a/packages/twenty-front/src/modules/auth/states/currentUserWorkspaceState.ts b/packages/twenty-front/src/modules/auth/states/currentUserWorkspaceState.ts
index 941c0cc9796..a07571b5161 100644
--- a/packages/twenty-front/src/modules/auth/states/currentUserWorkspaceState.ts
+++ b/packages/twenty-front/src/modules/auth/states/currentUserWorkspaceState.ts
@@ -1,4 +1,4 @@
-import { type ObjectPermissions } from 'twenty-shared/types';
+import { type CurrentUserWorkspaceObjectPermissions } from '@/auth/types/CurrentUserWorkspaceObjectPermissions';
import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';
import { type UserWorkspace } from '~/generated-metadata/graphql';
@@ -6,7 +6,7 @@ export type CurrentUserWorkspace = Pick<
UserWorkspace,
'permissionFlags' | 'twoFactorAuthenticationMethodSummary' | 'isImpersonating'
> & {
- objectsPermissions: Array<ObjectPermissions & { objectMetadataId: string }>;
+ objectsPermissions: CurrentUserWorkspaceObjectPermissions[];
};
export const currentUserWorkspaceState =
diff --git a/packages/twenty-front/src/modules/auth/states/objectPermissionsFamilySelector.ts b/packages/twenty-front/src/modules/auth/states/objectPermissionsFamilySelector.ts
deleted file mode 100644
index c0a53480878..00000000000
--- a/packages/twenty-front/src/modules/auth/states/objectPermissionsFamilySelector.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { currentUserWorkspaceState } from '@/auth/states/currentUserWorkspaceState';
-import { flatObjectMetadataItemsSelector } from '@/object-metadata/states/flatObjectMetadataItemsSelector';
-import { createAtomFamilySelector } from '@/ui/utilities/state/jotai/utils/createAtomFamilySelector';
-
-export const objectPermissionsFamilySelector = createAtomFamilySelector<
- {
- canRead: boolean;
- canUpdate: boolean;
- },
- { objectNameSingular: string }
->({
- key: 'objectPermissionsFamilySelector',
- get:
- ({ objectNameSingular }) =>
- ({ get }) => {
- const currentUserWorkspace = get(currentUserWorkspaceState);
- const objectMetadataItems = get(flatObjectMetadataItemsSelector);
-
- const objectMetadataItem = objectMetadataItems.find(
- (item) => item.nameSingular === objectNameSingular,
- );
-
- if (!objectMetadataItem) {
- return {
- canRead: false,
- canUpdate: false,
- };
- }
-
- const objectPermissions = currentUserWorkspace?.objectsPermissions?.find(
- (permission) => permission.objectMetadataId === objectMetadataItem.id,
- );
-
- return {
- canRead: objectPermissions?.canReadObjectRecords ?? false,
- canUpdate: objectPermissions?.canUpdateObjectRecords ?? false,
- };
- },
-});
diff --git a/packages/twenty-front/src/modules/auth/types/CurrentUserWorkspaceObjectPermissions.ts b/packages/twenty-front/src/modules/auth/types/CurrentUserWorkspaceObjectPermissions.ts
new file mode 100644
index 00000000000..127178757c5
--- /dev/null
+++ b/packages/twenty-front/src/modules/auth/types/CurrentUserWorkspaceObjectPermissions.ts
@@ -0,0 +1,8 @@
+import { type ObjectPermissions } from 'twenty-shared/types';
+
+// Mirrors the GraphQL ObjectPermission, whose fields are all nullable
+export type CurrentUserWorkspaceObjectPermissions = {
+ [Key in keyof ObjectPermissions]?: ObjectPermissions[Key] | null;
+} & {
+ objectMetadataId: string;
+};
diff --git a/packages/twenty-front/src/modules/command-menu-item/components/StandalonePageCommandMenu.tsx b/packages/twenty-front/src/modules/command-menu-item/components/StandalonePageCommandMenu.tsx
index 1cb1de3aeea..ccdea974fcb 100644
--- a/packages/twenty-front/src/modules/command-menu-item/components/StandalonePageCommandMenu.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/components/StandalonePageCommandMenu.tsx
@@ -1,22 +1,21 @@
import { CommandMenuItemContainerType } from '@/command-menu-item/types/CommandMenuItemContainerType';
import { currentUserState } from '@/auth/states/currentUserState';
-import { currentUserWorkspaceState } from '@/auth/states/currentUserWorkspaceState';
import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
-import { objectPermissionsFamilySelector } from '@/auth/states/objectPermissionsFamilySelector';
import { CommandMenuContext } from '@/command-menu-item/contexts/CommandMenuContext';
import { PinnedCommandMenuItemButtons } from '@/command-menu-item/display/components/PinnedCommandMenuItemButtons';
import { CommandMenuItemEditButton } from '@/command-menu-item/edit/components/CommandMenuItemEditButton';
+import { EMPTY_COMMAND_MENU_CONTEXT_API } from '@/command-menu-item/constants/EmptyCommandMenuContextApi';
import { commandMenuItemsSelector } from '@/command-menu-item/states/commandMenuItemsSelector';
+import { commandMenuTargetObjectPermissionsSelector } from '@/command-menu-item/states/commandMenuTargetObjectPermissionsSelector';
import { doesCommandMenuItemMatchObjectMetadataId } from '@/command-menu-item/utils/doesCommandMenuItemMatchObjectMetadataId';
import { doesCommandMenuItemMatchPageLayoutId } from '@/command-menu-item/utils/doesCommandMenuItemMatchPageLayoutId';
import { resolveCommandMenuItemPinning } from '@/command-menu-item/utils/resolveCommandMenuItemPinning';
import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';
import { useIsLayoutCustomizationAllowedOnCurrentPage } from '@/layout-customization/hooks/useIsLayoutCustomizationAllowedOnCurrentPage';
-import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
import { currentPageLayoutIdState } from '@/page-layout/states/currentPageLayoutIdState';
+import { permissionFlagMapSelector } from '@/settings/roles/states/permissionFlagMapSelector';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { getWorkspaceFeatureFlagsMap } from '@/workspace/utils/getWorkspaceFeatureFlagsMap';
-import { useStore } from 'jotai';
import { useMemo } from 'react';
import {
ContextStorePageType,
@@ -29,45 +28,24 @@ import {
} from '~/generated-metadata/graphql';
export const StandalonePageCommandMenu = () => {
- const store = useStore();
const isLayoutCustomizationAllowedOnCurrentPage =
useIsLayoutCustomizationAllowedOnCurrentPage();
const commandMenuItems = useAtomStateValue(commandMenuItemsSelector);
const currentWorkspace = useAtomStateValue(currentWorkspaceState);
- const currentUserWorkspace = useAtomStateValue(currentUserWorkspaceState);
+ const permissionFlagMap = useAtomStateValue(permissionFlagMapSelector);
const currentUser = useAtomStateValue(currentUserState);
const currentPageLayoutId = useAtomStateValue(currentPageLayoutIdState);
const isLayoutCustomizationModeEnabled = useAtomStateValue(
isLayoutCustomizationModeEnabledState,
);
- const { objectMetadataItems } = useObjectMetadataItems();
+ const { targetObjectReadPermissions, targetObjectWritePermissions } =
+ useAtomStateValue(commandMenuTargetObjectPermissionsSelector);
const commandMenuContextApi = useMemo<CommandMenuContextApi>(() => {
const featureFlags = getWorkspaceFeatureFlagsMap(
currentWorkspace?.featureFlags,
);
- const permissionFlags: Record<string, boolean> = {};
-
- for (const flag of currentUserWorkspace?.permissionFlags ?? []) {
- permissionFlags[flag] = true;
- }
-
- const targetObjectReadPermissions: Record<string, boolean> = {};
- const targetObjectWritePermissions: Record<string, boolean> = {};
-
- for (const metadataItem of objectMetadataItems) {
- const permissions = store.get(
- objectPermissionsFamilySelector.selectorFamily({
- objectNameSingular: metadataItem.nameSingular,
- }),
- );
- targetObjectReadPermissions[metadataItem.nameSingular] =
- permissions.canRead;
- targetObjectWritePermissions[metadataItem.nameSingular] =
- permissions.canUpdate;
- }
-
return {
pageType: ContextStorePageType.Standalone,
isInSidePanel: false,
@@ -77,19 +55,10 @@ export const StandalonePageCommandMenu = () => {
isSelectAll: false,
hasAnySoftDeleteFilterOnView: false,
numberOfSelectedRecords: 0,
- objectPermissions: {
- canReadObjectRecords: false,
- canUpdateObjectRecords: false,
- canSoftDeleteObjectRecords: false,
- canDestroyObjectRecords: false,
- restrictedFields: {},
- objectMetadataId: '',
- rowLevelPermissionPredicates: [],
- rowLevelPermissionPredicateGroups: [],
- },
+ objectPermissions: EMPTY_COMMAND_MENU_CONTEXT_API.objectPermissions,
selectedRecords: [],
featureFlags,
- permissionFlags,
+ permissionFlags: permissionFlagMap,
targetObjectReadPermissions,
targetObjectWritePermissions,
canImpersonate: currentUser?.canImpersonate === true,
@@ -99,12 +68,12 @@ export const StandalonePageCommandMenu = () => {
};
}, [
currentWorkspace?.featureFlags,
- currentUserWorkspace?.permissionFlags,
+ permissionFlagMap,
currentUser?.canImpersonate,
currentUser?.canAccessFullAdminPanel,
isLayoutCustomizationModeEnabled,
- objectMetadataItems,
- store,
+ targetObjectReadPermissions,
+ targetObjectWritePermissions,
]);
const filteredCommandMenuItems = useMemo(() => {
diff --git a/packages/twenty-front/src/modules/command-menu-item/hooks/useCurrentCommandMenuContextApi.ts b/packages/twenty-front/src/modules/command-menu-item/hooks/useCurrentCommandMenuContextApi.ts
index 10d02a8f921..f46f1d49205 100644
--- a/packages/twenty-front/src/modules/command-menu-item/hooks/useCurrentCommandMenuContextApi.ts
+++ b/packages/twenty-front/src/modules/command-menu-item/hooks/useCurrentCommandMenuContextApi.ts
@@ -1,7 +1,7 @@
import { currentUserState } from '@/auth/states/currentUserState';
-import { currentUserWorkspaceState } from '@/auth/states/currentUserWorkspaceState';
import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
-import { objectPermissionsFamilySelector } from '@/auth/states/objectPermissionsFamilySelector';
+import { EMPTY_COMMAND_MENU_CONTEXT_API } from '@/command-menu-item/constants/EmptyCommandMenuContextApi';
+import { commandMenuTargetObjectPermissionsSelector } from '@/command-menu-item/states/commandMenuTargetObjectPermissionsSelector';
import { contextStoreCurrentObjectMetadataItemIdComponentState } from '@/context-store/states/contextStoreCurrentObjectMetadataItemIdComponentState';
import { MAIN_CONTEXT_STORE_INSTANCE_ID } from '@/context-store/constants/MainContextStoreInstanceId';
import { useContextStoreInstanceId } from '@/context-store/hooks/useContextStoreInstanceId';
@@ -18,6 +18,7 @@ import { recordPermissionsByRecordIdFamilySelector } from '@/object-record/recor
import { recordStoreRecordsSelector } from '@/object-record/record-store/states/selectors/recordStoreRecordsSelector';
import { getRecordIndexIdFromObjectNamePluralAndViewId } from '@/object-record/utils/getRecordIndexIdFromObjectNamePluralAndViewId';
import { currentPageLayoutIdState } from '@/page-layout/states/currentPageLayoutIdState';
+import { permissionFlagMapSelector } from '@/settings/roles/states/permissionFlagMapSelector';
import { getWorkspaceFeatureFlagsMap } from '@/workspace/utils/getWorkspaceFeatureFlagsMap';
import { isDashboardInEditModeComponentState } from '@/page-layout/states/isDashboardInEditModeComponentState';
import { useWorkspaceSurface } from '@/ui/layout/hooks/useWorkspaceSurface';
@@ -26,7 +27,7 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/use
import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { isNonEmptyArray } from '@sniptt/guards';
-import { useAtomValue, useStore } from 'jotai';
+import { useAtomValue } from 'jotai';
import {
ContextStorePageType,
type CommandMenuContextApi,
@@ -34,8 +35,6 @@ import {
import { isDefined, resolveObjectMetadataLabel } from 'twenty-shared/utils';
export const useCurrentCommandMenuContextApi = (): CommandMenuContextApi => {
- const store = useStore();
-
const workspaceSurface = useWorkspaceSurface();
const isInSidePanel = workspaceSurface.type === 'side-panel';
const contextStoreInstanceId = useContextStoreInstanceId();
@@ -101,21 +100,12 @@ export const useCurrentCommandMenuContextApi = (): CommandMenuContextApi => {
const dashboardPageLayoutIdForCommandMenu =
selectedRecords[0]?.pageLayoutId ?? currentPageLayoutId ?? '';
- const objectPermissionsFromHook = useObjectPermissionsForObject(
+ const currentObjectPermissions = useObjectPermissionsForObject(
objectMetadataItem?.id ?? '',
);
const objectPermissions = isDefined(objectMetadataItem)
- ? objectPermissionsFromHook
- : {
- canReadObjectRecords: false,
- canUpdateObjectRecords: false,
- canSoftDeleteObjectRecords: false,
- canDestroyObjectRecords: false,
- restrictedFields: {},
- objectMetadataId: '',
- rowLevelPermissionPredicates: [],
- rowLevelPermissionPredicateGroups: [],
- };
+ ? currentObjectPermissions
+ : EMPTY_COMMAND_MENU_CONTEXT_API.objectPermissions;
const contextStoreCurrentViewId = useAtomComponentStateValue(
contextStoreCurrentViewIdComponentState,
@@ -163,32 +153,14 @@ export const useCurrentCommandMenuContextApi = (): CommandMenuContextApi => {
currentWorkspace?.featureFlags,
);
- const currentUserWorkspace = useAtomStateValue(currentUserWorkspaceState);
-
- const permissionFlags: Record<string, boolean> = {};
-
- for (const flag of currentUserWorkspace?.permissionFlags ?? []) {
- permissionFlags[flag] = true;
- }
+ const permissionFlagMap = useAtomStateValue(permissionFlagMapSelector);
const currentUser = useAtomStateValue(currentUserState);
const canImpersonate = currentUser?.canImpersonate === true;
const canAccessFullAdminPanel = currentUser?.canAccessFullAdminPanel === true;
- const targetObjectReadPermissions: Record<string, boolean> = {};
- const targetObjectWritePermissions: Record<string, boolean> = {};
-
- for (const metadataItem of objectMetadataItems) {
- const permissions = store.get(
- objectPermissionsFamilySelector.selectorFamily({
- objectNameSingular: metadataItem.nameSingular,
- }),
- );
- targetObjectReadPermissions[metadataItem.nameSingular] =
- permissions.canRead;
- targetObjectWritePermissions[metadataItem.nameSingular] =
- permissions.canUpdate;
- }
+ const { targetObjectReadPermissions, targetObjectWritePermissions } =
+ useAtomStateValue(commandMenuTargetObjectPermissionsSelector);
const objectMetadataLabel = isDefined(objectMetadataItem)
? resolveObjectMetadataLabel({
@@ -209,7 +181,7 @@ export const useCurrentCommandMenuContextApi = (): CommandMenuContextApi => {
objectPermissions,
selectedRecords,
featureFlags,
- permissionFlags,
+ permissionFlags: permissionFlagMap,
targetObjectReadPermissions,
targetObjectWritePermissions,
canImpersonate,
diff --git a/packages/twenty-front/src/modules/command-menu-item/states/__tests__/commandMenuTargetObjectPermissionsSelector.test.ts b/packages/twenty-front/src/modules/command-menu-item/states/__tests__/commandMenuTargetObjectPermissionsSelector.test.ts
new file mode 100644
index 00000000000..518b8ee676e
--- /dev/null
+++ b/packages/twenty-front/src/modules/command-menu-item/states/__tests__/commandMenuTargetObjectPermissionsSelector.test.ts
@@ -0,0 +1,77 @@
+import { createStore } from 'jotai';
+
+import { currentUserWorkspaceState } from '@/auth/states/currentUserWorkspaceState';
+import { commandMenuTargetObjectPermissionsSelector } from '@/command-menu-item/states/commandMenuTargetObjectPermissionsSelector';
+import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';
+import { getTestEnrichedObjectMetadataItemsMock } from '~/testing/utils/getTestEnrichedObjectMetadataItemsMock';
+import { setTestObjectMetadataItemsInMetadataStore } from '~/testing/utils/setTestObjectMetadataItemsInMetadataStore';
+
+const objectMetadataItems = getTestEnrichedObjectMetadataItemsMock();
+
+describe('commandMenuTargetObjectPermissionsSelector', () => {
+ afterEach(() => {
+ localStorage.clear();
+ });
+
+ it('should read the role permissions of each object by singular name', () => {
+ const store = createStore();
+
+ setTestObjectMetadataItemsInMetadataStore(store, objectMetadataItems);
+ store.set(currentUserWorkspaceState.atom, {
+ permissionFlags: [],
+ twoFactorAuthenticationMethodSummary: [],
+ objectsPermissions: [
+ {
+ objectMetadataId: getMockObjectMetadataItemOrThrow('company').id,
+ canReadObjectRecords: true,
+ canUpdateObjectRecords: false,
+ canSoftDeleteObjectRecords: false,
+ canDestroyObjectRecords: false,
+ restrictedFields: {},
+ rowLevelPermissionPredicates: [],
+ rowLevelPermissionPredicateGroups: [],
+ },
+ {
+ objectMetadataId: getMockObjectMetadataItemOrThrow('opportunity').id,
+ canReadObjectRecords: false,
+ canUpdateObjectRecords: false,
+ canSoftDeleteObjectRecords: false,
+ canDestroyObjectRecords: false,
+ restrictedFields: {},
+ rowLevelPermissionPredicates: [],
+ rowLevelPermissionPredicateGroups: [],
+ },
+ ],
+ isImpersonating: false,
+ });
+
+ const { targetObjectReadPermissions, targetObjectWritePermissions } =
+ store.get(commandMenuTargetObjectPermissionsSelector.atom);
+
+ expect(targetObjectReadPermissions.company).toBe(true);
+ expect(targetObjectWritePermissions.company).toBe(false);
+ expect(targetObjectReadPermissions.opportunity).toBe(false);
+ expect(targetObjectWritePermissions.opportunity).toBe(false);
+ });
+
+ it('should allow objects missing from the role permissions', () => {
+ const store = createStore();
+
+ setTestObjectMetadataItemsInMetadataStore(store, objectMetadataItems);
+ store.set(currentUserWorkspaceState.atom, {
+ permissionFlags: [],
+ twoFactorAuthenticationMethodSummary: [],
+ objectsPermissions: [],
+ isImpersonating: false,
+ });
+
+ const { targetObjectReadPermissions, targetObjectWritePermissions } =
+ store.get(commandMenuTargetObjectPermissionsSelector.atom);
+
+ expect(Object.keys(targetObjectReadPermissions)).toHaveLength(
+ objectMetadataItems.length,
+ );
+ expect(targetObjectReadPermissions.person).toBe(true);
+ expect(targetObjectWritePermissions.person).toBe(true);
+ });
+});
diff --git a/packages/twenty-front/src/modules/command-menu-item/states/commandMenuTargetObjectPermissionsSelector.ts b/packages/twenty-front/src/modules/command-menu-item/states/commandMenuTargetObjectPermissionsSelector.ts
new file mode 100644
index 00000000000..f2155c098c0
--- /dev/null
+++ b/packages/twenty-front/src/modules/command-menu-item/states/commandMenuTargetObjectPermissionsSelector.ts
@@ -0,0 +1,38 @@
+import { flatObjectMetadataItemsSelector } from '@/object-metadata/states/flatObjectMetadataItemsSelector';
+import { objectPermissionsByObjectMetadataIdSelector } from '@/object-metadata/states/objectPermissionsByObjectMetadataIdSelector';
+import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';
+import { createAtomSelector } from '@/ui/utilities/state/jotai/utils/createAtomSelector';
+import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
+import { type CommandMenuContextApi } from 'twenty-shared/types';
+
+export const commandMenuTargetObjectPermissionsSelector = createAtomSelector<
+ Pick<
+ CommandMenuContextApi,
+ 'targetObjectReadPermissions' | 'targetObjectWritePermissions'
+ >
+>({
+ key: 'commandMenuTargetObjectPermissionsSelector',
+ areEqual: isDeeplyEqual,
+ get: ({ get }) => {
+ const objectPermissionsByObjectMetadataId = get(
+ objectPermissionsByObjectMetadataIdSelector,
+ );
+
+ const targetObjectReadPermissions: Record<string, boolean> = {};
+ const targetObjectWritePermissions: Record<string, boolean> = {};
+
+ for (const objectMetadataItem of get(flatObjectMetadataItemsSelector)) {
+ const objectPermissions = getObjectPermissionsForObject(
+ objectPermissionsByObjectMetadataId,
+ objectMetadataItem.id,
+ );
+
+ targetObjectReadPermissions[objectMetadataItem.nameSingular] =
+ objectPermissions.canReadObjectRecords;
+ targetObjectWritePermissions[objectMetadataItem.nameSingular] =
+ objectPermissions.canUpdateObjectRecords;
+ }
+
+ return { targetObjectReadPermissions, targetObjectWritePermissions };
+ },
+});
diff --git a/packages/twenty-front/src/modules/information-banner/components/InformationBannerWrapper.tsx b/packages/twenty-front/src/modules/information-banner/components/InformationBannerWrapper.tsx
index ac7fe9104ef..9355c5d3afb 100644
--- a/packages/twenty-front/src/modules/information-banner/components/InformationBannerWrapper.tsx
+++ b/packages/twenty-front/src/modules/information-banner/components/InformationBannerWrapper.tsx
@@ -10,7 +10,7 @@ import { InformationBannerNonProductionInstance } from '@/information-banner/com
import { InformationBannerMaintenance } from '@/information-banner/components/maintenance/InformationBannerMaintenance';
import { InformationBannerReconnectAccountEmailAliases } from '@/information-banner/components/reconnect-account/InformationBannerReconnectAccountEmailAliases';
import { InformationBannerReconnectAccountInsufficientPermissions } from '@/information-banner/components/reconnect-account/InformationBannerReconnectAccountInsufficientPermissions';
-import { usePermissionFlagMap } from '@/settings/roles/hooks/usePermissionFlagMap';
+import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useIsWorkspaceActivationStatusEqualsTo } from '@/workspace/hooks/useIsWorkspaceActivationStatusEqualsTo';
import { isSubscriptionPaymentOverdue } from '@/settings/billing/utils/isSubscriptionPaymentOverdue';
@@ -33,9 +33,9 @@ const StyledInformationBannerWrapper = styled.div`
export const InformationBannerWrapper = () => {
const subscriptionStatus = useSubscriptionStatus();
- const permissionMap = usePermissionFlagMap();
- const isAccountSyncEnabled =
- permissionMap[PermissionFlagType.CONNECTED_ACCOUNTS];
+ const isAccountSyncEnabled = useHasPermissionFlag(
+ PermissionFlagType.CONNECTED_ACCOUNTS,
+ );
const isWorkspaceSuspended = useIsWorkspaceActivationStatusEqualsTo(
WorkspaceActivationStatus.SUSPENDED,
);
diff --git a/packages/twenty-front/src/modules/information-banner/components/billing/InformationBannerBillingSubscriptionPaused.tsx b/packages/twenty-front/src/modules/information-banner/components/billing/InformationBannerBillingSubscriptionPaused.tsx
index c9508b3629b..c0a88c3eacf 100644
--- a/packages/twenty-front/src/modules/information-banner/components/billing/InformationBannerBillingSubscriptionPaused.tsx
+++ b/packages/twenty-front/src/modules/information-banner/components/billing/InformationBannerBillingSubscriptionPaused.tsx
@@ -1,7 +1,7 @@
import { ToastOnQueryErrorEffect } from '@/apollo/components/ToastOnQueryErrorEffect';
import { useRedirect } from '@/domain-manager/hooks/useRedirect';
import { InformationBanner } from '@/information-banner/components/InformationBanner';
-import { usePermissionFlagMap } from '@/settings/roles/hooks/usePermissionFlagMap';
+import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
import { useQuery } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
import { SettingsPath } from 'twenty-shared/types';
@@ -14,8 +14,9 @@ import {
export const InformationBannerBillingSubscriptionPaused = () => {
const { redirect } = useRedirect();
- const { [PermissionFlagType.BILLING]: hasPermissionToUpdateBillingDetails } =
- usePermissionFlagMap();
+ const hasPermissionToUpdateBillingDetails = useHasPermissionFlag(
+ PermissionFlagType.BILLING,
+ );
const { data, loading, error } = useQuery(BillingPortalSessionDocument, {
variables: {
diff --git a/packages/twenty-front/src/modules/information-banner/components/billing/InformationBannerEndTrialPeriod.tsx b/packages/twenty-front/src/modules/information-banner/components/billing/InformationBannerEndTrialPeriod.tsx
index 8eb2f926ab2..3ff742eace9 100644
--- a/packages/twenty-front/src/modules/information-banner/components/billing/InformationBannerEndTrialPeriod.tsx
+++ b/packages/twenty-front/src/modules/information-banner/components/billing/InformationBannerEndTrialPeriod.tsx
@@ -3,7 +3,7 @@ import { AddCreditCardModal } from '@/settings/billing/components/AddCreditCardM
import { StartSubscriptionConfirmationModal } from '@/settings/billing/components/StartSubscriptionConfirmationModal';
import { billingHasPaymentMethodSelector } from '@/settings/billing/states/billingHasPaymentMethodSelector';
import { useEndSubscriptionTrialPeriod } from '@/settings/billing/hooks/useEndSubscriptionTrialPeriod';
-import { usePermissionFlagMap } from '@/settings/roles/hooks/usePermissionFlagMap';
+import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useLingui } from '@lingui/react/macro';
@@ -17,8 +17,9 @@ export const InformationBannerEndTrialPeriod = () => {
const { t } = useLingui();
const { openDialog } = useDialog();
- const { [PermissionFlagType.BILLING]: hasPermissionToEndTrialPeriod } =
- usePermissionFlagMap();
+ const hasPermissionToEndTrialPeriod = useHasPermissionFlag(
+ PermissionFlagType.BILLING,
+ );
const billingHasPaymentMethod = useAtomStateValue(
billingHasPaymentMethodSelector,
diff --git a/packages/twenty-front/src/modules/information-banner/components/billing/InformationBannerNoBillingSubscription.tsx b/packages/twenty-front/src/modules/information-banner/components/billing/InformationBannerNoBillingSubscription.tsx
index 1b67f718d5f..610a1c3b997 100644
--- a/packages/twenty-front/src/modules/information-banner/components/billing/InformationBannerNoBillingSubscription.tsx
+++ b/packages/twenty-front/src/modules/information-banner/components/billing/InformationBannerNoBillingSubscription.tsx
@@ -1,7 +1,7 @@
import { BILLING_CHECKOUT_SESSION_DEFAULT_VALUE } from '@/settings/billing/constants/BillingCheckoutSessionDefaultValue';
import { useHandleCheckoutSession } from '@/settings/billing/hooks/useHandleCheckoutSession';
import { InformationBanner } from '@/information-banner/components/InformationBanner';
-import { usePermissionFlagMap } from '@/settings/roles/hooks/usePermissionFlagMap';
+import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
import { t } from '@lingui/core/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
@@ -15,8 +15,9 @@ export const InformationBannerNoBillingSubscription = () => {
successUrlPath: getSettingsPath(SettingsPath.Billing),
});
- const { [PermissionFlagType.WORKSPACE]: hasPermissionToSubscribe } =
- usePermissionFlagMap();
+ const hasPermissionToSubscribe = useHasPermissionFlag(
+ PermissionFlagType.WORKSPACE,
+ );
return (
<InformationBanner
diff --git a/packages/twenty-front/src/modules/information-banner/components/billing/InformationBannerNoMoreCredits.tsx b/packages/twenty-front/src/modules/information-banner/components/billing/InformationBannerNoMoreCredits.tsx
index ce7a59093fc..b5ac443f114 100644
--- a/packages/twenty-front/src/modules/information-banner/components/billing/InformationBannerNoMoreCredits.tsx
+++ b/packages/twenty-front/src/modules/information-banner/components/billing/InformationBannerNoMoreCredits.tsx
@@ -1,7 +1,7 @@
import { InformationBanner } from '@/information-banner/components/InformationBanner';
import { informationBannerIsOpenComponentState } from '@/information-banner/states/informationBannerIsOpenComponentState';
import { useCreditUpgradeAction } from '@/settings/billing/hooks/useCreditUpgradeAction';
-import { usePermissionFlagMap } from '@/settings/roles/hooks/usePermissionFlagMap';
+import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
import { ConfirmationDialog } from '@/ui/layout/dialog/components/ConfirmationDialog';
import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
@@ -19,8 +19,9 @@ const INFORMATION_BANNER_UPGRADE_CREDIT_PLAN_MODAL_ID =
export const InformationBannerNoMoreCredits = () => {
const { t } = useLingui();
- const { [PermissionFlagType.BILLING]: hasPermissionToUpdateCreditPlan } =
- usePermissionFlagMap();
+ const hasPermissionToUpdateCreditPlan = useHasPermissionFlag(
+ PermissionFlagType.BILLING,
+ );
const navigateSettings = useNavigateSettings();
const { openDialog } = useDialog();
diff --git a/packages/twenty-front/src/modules/metadata-store/effect-components/UserMetadataProviderInitialEffect.tsx b/packages/twenty-front/src/modules/metadata-store/effect-components/UserMetadataProviderInitialEffect.tsx
index 5da27e64f6b..ade932f43a7 100644
--- a/packages/twenty-front/src/modules/metadata-store/effect-components/UserMetadataProviderInitialEffect.tsx
+++ b/packages/twenty-front/src/modules/metadata-store/effect-components/UserMetadataProviderInitialEffect.tsx
@@ -19,7 +19,7 @@ import { enUS } from 'date-fns/locale';
import { useStore } from 'jotai';
import { useCallback, useEffect, useState } from 'react';
import { type APP_LOCALES, SOURCE_LOCALE } from 'twenty-shared/translations';
-import { type ObjectPermissions } from 'twenty-shared/types';
+import { type CurrentUserWorkspaceObjectPermissions } from '@/auth/types/CurrentUserWorkspaceObjectPermissions';
import { isDefined } from 'twenty-shared/utils';
import { useQuery } from '@apollo/client/react';
import {
@@ -114,9 +114,8 @@ export const UserMetadataProviderInitialEffect = () => {
.twoFactorAuthenticationMethodSummary ?? [],
objectsPermissions:
(userQueryData.currentUser.currentUserWorkspace
- .objectsPermissions as Array<
- ObjectPermissions & { objectMetadataId: string }
- >) ?? [],
+ .objectsPermissions as CurrentUserWorkspaceObjectPermissions[]) ??
+ [],
isImpersonating:
userQueryData.currentUser.currentUserWorkspace.isImpersonating ??
false,
diff --git a/packages/twenty-front/src/modules/object-metadata/states/__tests__/objectPermissionsByObjectMetadataIdSelector.test.ts b/packages/twenty-front/src/modules/object-metadata/states/__tests__/objectPermissionsByObjectMetadataIdSelector.test.ts
new file mode 100644
index 00000000000..c33d4dc5534
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-metadata/states/__tests__/objectPermissionsByObjectMetadataIdSelector.test.ts
@@ -0,0 +1,118 @@
+import { createStore } from 'jotai';
+
+import {
+ type CurrentUserWorkspace,
+ currentUserWorkspaceState,
+} from '@/auth/states/currentUserWorkspaceState';
+import { type CurrentUserWorkspaceObjectPermissions } from '@/auth/types/CurrentUserWorkspaceObjectPermissions';
+import { objectPermissionsByObjectMetadataIdSelector } from '@/object-metadata/states/objectPermissionsByObjectMetadataIdSelector';
+import { type ObjectPermissionsWithObjectMetadataId } from '@/object-metadata/types/ObjectPermissionsWithObjectMetadataId';
+import { PermissionFlagType } from '~/generated-metadata/graphql';
+
+const COMPANY_OBJECT_PERMISSIONS: ObjectPermissionsWithObjectMetadataId = {
+ objectMetadataId: 'company-object-metadata-id',
+ canReadObjectRecords: true,
+ canUpdateObjectRecords: false,
+ canSoftDeleteObjectRecords: false,
+ canDestroyObjectRecords: false,
+ restrictedFields: {
+ 'company-name-field-metadata-id': { canRead: true, canUpdate: false },
+ },
+ rowLevelPermissionPredicates: [],
+ rowLevelPermissionPredicateGroups: [],
+};
+
+const PERSON_OBJECT_PERMISSIONS_WITH_UNSET_FLAGS: CurrentUserWorkspaceObjectPermissions =
+ {
+ objectMetadataId: 'person-object-metadata-id',
+ canReadObjectRecords: false,
+ canUpdateObjectRecords: null,
+ restrictedFields: null,
+ };
+
+const buildCurrentUserWorkspace = (
+ objectsPermissions: CurrentUserWorkspace['objectsPermissions'],
+): CurrentUserWorkspace => ({
+ permissionFlags: [],
+ twoFactorAuthenticationMethodSummary: [],
+ objectsPermissions,
+ isImpersonating: false,
+});
+
+describe('objectPermissionsByObjectMetadataIdSelector', () => {
+ afterEach(() => {
+ localStorage.clear();
+ });
+
+ it('should be empty while the current user workspace is not loaded', () => {
+ const store = createStore();
+
+ store.set(currentUserWorkspaceState.atom, null);
+
+ expect(store.get(objectPermissionsByObjectMetadataIdSelector.atom)).toEqual(
+ {},
+ );
+ });
+
+ it('should index the permissions of the current user by object metadata id', () => {
+ const store = createStore();
+
+ store.set(
+ currentUserWorkspaceState.atom,
+ buildCurrentUserWorkspace([COMPANY_OBJECT_PERMISSIONS]),
+ );
+
+ expect(store.get(objectPermissionsByObjectMetadataIdSelector.atom)).toEqual(
+ {
+ [COMPANY_OBJECT_PERMISSIONS.objectMetadataId]:
+ COMPANY_OBJECT_PERMISSIONS,
+ },
+ );
+ });
+
+ it('should allow the flags the server left unset', () => {
+ const store = createStore();
+
+ store.set(
+ currentUserWorkspaceState.atom,
+ buildCurrentUserWorkspace([PERSON_OBJECT_PERMISSIONS_WITH_UNSET_FLAGS]),
+ );
+
+ expect(
+ store.get(objectPermissionsByObjectMetadataIdSelector.atom)[
+ 'person-object-metadata-id'
+ ],
+ ).toEqual({
+ objectMetadataId: 'person-object-metadata-id',
+ canReadObjectRecords: false,
+ canUpdateObjectRecords: true,
+ canSoftDeleteObjectRecords: true,
+ canDestroyObjectRecords: true,
+ restrictedFields: {},
+ rowLevelPermissionPredicates: [],
+ rowLevelPermissionPredicateGroups: [],
+ });
+ });
+
+ it('should keep the same map when only the permission flags change', () => {
+ const store = createStore();
+
+ store.set(
+ currentUserWorkspaceState.atom,
+ buildCurrentUserWorkspace([COMPANY_OBJECT_PERMISSIONS]),
+ );
+
+ const initialObjectPermissionsByObjectMetadataId = store.get(
+ objectPermissionsByObjectMetadataIdSelector.atom,
+ );
+
+ store.set(currentUserWorkspaceState.atom, {
+ ...buildCurrentUserWorkspace([{ ...COMPANY_OBJECT_PERMISSIONS }]),
+ permissionFlags: [PermissionFlagType.DATA_MODEL],
+ });
+
+ expect(store.get(objectPermissionsByObjectMetadataIdSelector.atom)).toBe(
+ initialObjectPermissionsByObjectMetadataId,
+ );
+ });
+});
diff --git a/packages/twenty-front/src/modules/object-metadata/states/objectMetadataItemsWithFieldsSelector.ts b/packages/twenty-front/src/modules/object-metadata/states/objectMetadataItemsWithFieldsSelector.ts
index f259e1fbde7..3c443266831 100644
--- a/packages/twenty-front/src/modules/object-metadata/states/objectMetadataItemsWithFieldsSelector.ts
+++ b/packages/twenty-front/src/modules/object-metadata/states/objectMetadataItemsWithFieldsSelector.ts
@@ -1,13 +1,11 @@
-import { currentUserWorkspaceState } from '@/auth/states/currentUserWorkspaceState';
import { fieldMetadataItemsSelector } from '@/metadata-store/states/fieldMetadataItemsSelector';
import { indexMetadataItemsSelector } from '@/metadata-store/states/indexMetadataItemsSelector';
import { flatObjectMetadataItemsSelector } from '@/object-metadata/states/flatObjectMetadataItemsSelector';
+import { objectPermissionsByObjectMetadataIdSelector } from '@/object-metadata/states/objectPermissionsByObjectMetadataIdSelector';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
-import { getNonReadableFieldMetadataIdsFromObjectPermissions } from '@/object-metadata/utils/getNonReadableFieldMetadataIdsFromObjectPermissions';
-import { getNonUpdatableFieldMetadataIdsFromObjectPermissions } from '@/object-metadata/utils/getNonUpdatableFieldMetadataIdsFromObjectPermissions';
import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';
+import { getPermittedFields } from '@/object-metadata/utils/getPermittedFields';
import { createAtomSelector } from '@/ui/utilities/state/jotai/utils/createAtomSelector';
-import { type ObjectPermissions } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
export const objectMetadataItemsWithFieldsSelector = createAtomSelector<
@@ -18,7 +16,9 @@ export const objectMetadataItemsWithFieldsSelector = createAtomSelector<
const flatObjects = get(flatObjectMetadataItemsSelector);
const allFlatFields = get(fieldMetadataItemsSelector);
const allFlatIndexes = get(indexMetadataItemsSelector);
- const currentUserWorkspace = get(currentUserWorkspaceState);
+ const objectPermissionsByObjectMetadataId = get(
+ objectPermissionsByObjectMetadataIdSelector,
+ );
const fieldsByObjectId = new Map<
string,
@@ -50,46 +50,22 @@ export const objectMetadataItemsWithFieldsSelector = createAtomSelector<
}
}
- const objectPermissionsByObjectMetadataId =
- currentUserWorkspace?.objectsPermissions.reduce(
- (accumulator, objectPermission) => {
- accumulator[objectPermission.objectMetadataId] = objectPermission;
-
- return accumulator;
- },
- {} as Record<string, ObjectPermissions & { objectMetadataId: string }>,
- ) ?? {};
-
return flatObjects.map((flatObject) => {
const fields = fieldsByObjectId.get(flatObject.id) ?? [];
const indexMetadatas = indexesByObjectId.get(flatObject.id) ?? [];
- const objectPermissions = getObjectPermissionsForObject(
- objectPermissionsByObjectMetadataId,
- flatObject.id,
- );
-
- const nonReadableFieldMetadataIds =
- getNonReadableFieldMetadataIdsFromObjectPermissions({
- objectPermissions,
- });
-
- const nonUpdatableFieldMetadataIds =
- getNonUpdatableFieldMetadataIdsFromObjectPermissions({
- objectPermissions,
- });
-
return {
...flatObject,
fields,
indexMetadatas,
searchFieldMetadatas: flatObject.searchFieldMetadatas ?? [],
- readableFields: fields.filter(
- (field) => !nonReadableFieldMetadataIds.includes(field.id),
- ),
- updatableFields: fields.filter(
- (field) => !nonUpdatableFieldMetadataIds.includes(field.id),
- ),
+ ...getPermittedFields({
+ fields,
+ objectPermissions: getObjectPermissionsForObject(
+ objectPermissionsByObjectMetadataId,
+ flatObject.id,
+ ),
+ }),
} satisfies EnrichedObjectMetadataItem;
});
},
diff --git a/packages/twenty-front/src/modules/object-metadata/states/objectPermissionsByObjectMetadataIdSelector.ts b/packages/twenty-front/src/modules/object-metadata/states/objectPermissionsByObjectMetadataIdSelector.ts
new file mode 100644
index 00000000000..bea2304e900
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-metadata/states/objectPermissionsByObjectMetadataIdSelector.ts
@@ -0,0 +1,51 @@
+import { currentUserWorkspaceObjectsPermissionsSelector } from '@/auth/states/currentUserWorkspaceObjectsPermissionsSelector';
+import { type ObjectPermissionsByObjectMetadataId } from '@/object-metadata/types/ObjectPermissionsByObjectMetadataId';
+import { getDefaultObjectPermissions } from '@/object-metadata/utils/getDefaultObjectPermissions';
+import { createAtomSelector } from '@/ui/utilities/state/jotai/utils/createAtomSelector';
+import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
+
+export const objectPermissionsByObjectMetadataIdSelector =
+ createAtomSelector<ObjectPermissionsByObjectMetadataId>({
+ key: 'objectPermissionsByObjectMetadataIdSelector',
+ areEqual: isDeeplyEqual,
+ get: ({ get }) => {
+ const objectsPermissions =
+ get(currentUserWorkspaceObjectsPermissionsSelector) ?? [];
+
+ return Object.fromEntries(
+ objectsPermissions.map((objectPermissions) => {
+ const defaultObjectPermissions = getDefaultObjectPermissions(
+ objectPermissions.objectMetadataId,
+ );
+
+ return [
+ objectPermissions.objectMetadataId,
+ {
+ objectMetadataId: objectPermissions.objectMetadataId,
+ canReadObjectRecords:
+ objectPermissions.canReadObjectRecords ??
+ defaultObjectPermissions.canReadObjectRecords,
+ canUpdateObjectRecords:
+ objectPermissions.canUpdateObjectRecords ??
+ defaultObjectPermissions.canUpdateObjectRecords,
+ canSoftDeleteObjectRecords:
+ objectPermissions.canSoftDeleteObjectRecords ??
+ defaultObjectPermissions.canSoftDeleteObjectRecords,
+ canDestroyObjectRecords:
+ objectPermissions.canDestroyObjectRecords ??
+ defaultObjectPermissions.canDestroyObjectRecords,
+ restrictedFields:
+ objectPermissions.restrictedFields ??
+ defaultObjectPermissions.restrictedFields,
+ rowLevelPermissionPredicates:
+ objectPermissions.rowLevelPermissionPredicates ??
+ defaultObjectPermissions.rowLevelPermissionPredicates,
+ rowLevelPermissionPredicateGroups:
+ objectPermissions.rowLevelPermissionPredicateGroups ??
+ defaultObjectPermissions.rowLevelPermissionPredicateGroups,
+ },
+ ];
+ }),
+ );
+ },
+ });
diff --git a/packages/twenty-front/src/modules/object-metadata/types/ObjectPermissionsByObjectMetadataId.ts b/packages/twenty-front/src/modules/object-metadata/types/ObjectPermissionsByObjectMetadataId.ts
new file mode 100644
index 00000000000..e07be1d1382
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-metadata/types/ObjectPermissionsByObjectMetadataId.ts
@@ -0,0 +1,6 @@
+import { type ObjectPermissionsWithObjectMetadataId } from '@/object-metadata/types/ObjectPermissionsWithObjectMetadataId';
+
+export type ObjectPermissionsByObjectMetadataId = Record<
+ string,
+ ObjectPermissionsWithObjectMetadataId
+>;
diff --git a/packages/twenty-front/src/modules/object-metadata/types/ObjectPermissionsWithObjectMetadataId.ts b/packages/twenty-front/src/modules/object-metadata/types/ObjectPermissionsWithObjectMetadataId.ts
new file mode 100644
index 00000000000..76c19d7f510
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-metadata/types/ObjectPermissionsWithObjectMetadataId.ts
@@ -0,0 +1,5 @@
+import { type ObjectPermissions } from 'twenty-shared/types';
+
+export type ObjectPermissionsWithObjectMetadataId = ObjectPermissions & {
+ objectMetadataId: string;
+};
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/__tests__/getFieldPermissions.test.ts b/packages/twenty-front/src/modules/object-metadata/utils/__tests__/getFieldPermissions.test.ts
new file mode 100644
index 00000000000..7c4a7753bd9
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-metadata/utils/__tests__/getFieldPermissions.test.ts
@@ -0,0 +1,40 @@
+import { getFieldPermissions } from '@/object-metadata/utils/getFieldPermissions';
+
+const FIELD_METADATA_ID = 'field-metadata-id';
+
+describe('getFieldPermissions', () => {
+ it('should allow reading and updating a field without restriction', () => {
+ expect(
+ getFieldPermissions({
+ objectPermissions: { restrictedFields: {} },
+ fieldMetadataId: FIELD_METADATA_ID,
+ }),
+ ).toEqual({ canReadField: true, canUpdateField: true });
+ });
+
+ it('should only deny what the restriction explicitly denies', () => {
+ expect(
+ getFieldPermissions({
+ objectPermissions: {
+ restrictedFields: {
+ [FIELD_METADATA_ID]: { canRead: null, canUpdate: false },
+ },
+ },
+ fieldMetadataId: FIELD_METADATA_ID,
+ }),
+ ).toEqual({ canReadField: true, canUpdateField: false });
+ });
+
+ it('should deny reading a field restricted for reading', () => {
+ expect(
+ getFieldPermissions({
+ objectPermissions: {
+ restrictedFields: {
+ [FIELD_METADATA_ID]: { canRead: false, canUpdate: false },
+ },
+ },
+ fieldMetadataId: FIELD_METADATA_ID,
+ }),
+ ).toEqual({ canReadField: false, canUpdateField: false });
+ });
+});
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
new file mode 100644
index 00000000000..77190d78c20
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-metadata/utils/__tests__/getPermittedFields.test.ts
@@ -0,0 +1,37 @@
+import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
+import { getPermittedFields } from '@/object-metadata/utils/getPermittedFields';
+import { getMockFieldMetadataItemOrThrow } from '~/testing/utils/getMockFieldMetadataItemOrThrow';
+import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';
+
+const companyObjectMetadataItem = getMockObjectMetadataItemOrThrow('company');
+
+const getCompanyFieldOrThrow = (fieldName: string): FieldMetadataItem =>
+ getMockFieldMetadataItemOrThrow({
+ objectMetadataItem: companyObjectMetadataItem,
+ fieldName,
+ });
+
+describe('getPermittedFields', () => {
+ it('should split fields by their read and update restrictions', () => {
+ const nameField = getCompanyFieldOrThrow('name');
+ const employeesField = getCompanyFieldOrThrow('employees');
+ const domainNameField = getCompanyFieldOrThrow('domainName');
+ const addressField = getCompanyFieldOrThrow('address');
+
+ expect(
+ getPermittedFields({
+ fields: [nameField, employeesField, domainNameField, addressField],
+ objectPermissions: {
+ restrictedFields: {
+ [employeesField.id]: { canRead: false, canUpdate: false },
+ [domainNameField.id]: { canRead: true, canUpdate: false },
+ [addressField.id]: { canRead: false, canUpdate: true },
+ },
+ },
+ }),
+ ).toEqual({
+ readableFields: [nameField, domainNameField],
+ updatableFields: [nameField, addressField],
+ });
+ });
+});
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/enrichObjectMetadataItemsWithPermissions.ts b/packages/twenty-front/src/modules/object-metadata/utils/enrichObjectMetadataItemsWithPermissions.ts
deleted file mode 100644
index 54627137532..00000000000
--- a/packages/twenty-front/src/modules/object-metadata/utils/enrichObjectMetadataItemsWithPermissions.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { getNonReadableFieldMetadataIdsFromObjectPermissions } from '@/object-metadata/utils/getNonReadableFieldMetadataIdsFromObjectPermissions';
-import { getNonUpdatableFieldMetadataIdsFromObjectPermissions } from '@/object-metadata/utils/getNonUpdatableFieldMetadataIdsFromObjectPermissions';
-import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';
-import { type ObjectPermissions } from 'twenty-shared/types';
-import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
-
-type enrichObjectMetadataItemsWithPermissionsArgs = {
- objectMetadataItems: Omit<
- EnrichedObjectMetadataItem,
- 'readableFields' | 'updatableFields'
- >[];
- objectPermissionsByObjectMetadataId: Record<
- string,
- ObjectPermissions & { objectMetadataId: string }
- >;
-};
-
-export const enrichObjectMetadataItemsWithPermissions = ({
- objectMetadataItems,
- objectPermissionsByObjectMetadataId,
-}: enrichObjectMetadataItemsWithPermissionsArgs) => {
- const formattedObjects: EnrichedObjectMetadataItem[] =
- objectMetadataItems.map((object) => {
- const objectPermissions = getObjectPermissionsForObject(
- objectPermissionsByObjectMetadataId,
- object.id,
- );
-
- const nonReadableFieldMetadataIds =
- getNonReadableFieldMetadataIdsFromObjectPermissions({
- objectPermissions,
- });
-
- const nonUpdatableFieldMetadataIds =
- getNonUpdatableFieldMetadataIdsFromObjectPermissions({
- objectPermissions,
- });
-
- const { fields, ...objectWithoutFields } = object;
-
- return {
- ...objectWithoutFields,
- fields: fields,
- readableFields: fields.filter(
- (field) => !nonReadableFieldMetadataIds.includes(field.id),
- ),
- updatableFields: fields.filter(
- (field) => !nonUpdatableFieldMetadataIds.includes(field.id),
- ),
- } satisfies EnrichedObjectMetadataItem;
- }) ?? [];
-
- return formattedObjects;
-};
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/getDefaultObjectPermissions.ts b/packages/twenty-front/src/modules/object-metadata/utils/getDefaultObjectPermissions.ts
new file mode 100644
index 00000000000..d048d9fa5b7
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-metadata/utils/getDefaultObjectPermissions.ts
@@ -0,0 +1,15 @@
+import { type ObjectPermissionsWithObjectMetadataId } from '@/object-metadata/types/ObjectPermissionsWithObjectMetadataId';
+
+// Anything the role does not specify is allowed; the server still enforces the real permissions
+export const getDefaultObjectPermissions = (
+ objectMetadataId: string,
+): ObjectPermissionsWithObjectMetadataId => ({
+ objectMetadataId,
+ canReadObjectRecords: true,
+ canUpdateObjectRecords: true,
+ canSoftDeleteObjectRecords: true,
+ canDestroyObjectRecords: true,
+ restrictedFields: {},
+ rowLevelPermissionPredicates: [],
+ rowLevelPermissionPredicateGroups: [],
+});
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/getFieldPermissions.ts b/packages/twenty-front/src/modules/object-metadata/utils/getFieldPermissions.ts
new file mode 100644
index 00000000000..dfb4e81f7b8
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-metadata/utils/getFieldPermissions.ts
@@ -0,0 +1,18 @@
+import { type ObjectPermissions } from 'twenty-shared/types';
+
+type GetFieldPermissionsArgs = {
+ objectPermissions: Pick<ObjectPermissions, 'restrictedFields'>;
+ fieldMetadataId: string;
+};
+
+export const getFieldPermissions = ({
+ objectPermissions,
+ fieldMetadataId,
+}: GetFieldPermissionsArgs) => {
+ const restrictedField = objectPermissions.restrictedFields[fieldMetadataId];
+
+ return {
+ canReadField: restrictedField?.canRead !== false,
+ canUpdateField: restrictedField?.canUpdate !== false,
+ };
+};
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/getNonReadableFieldMetadataIdsFromObjectPermissions.ts b/packages/twenty-front/src/modules/object-metadata/utils/getNonReadableFieldMetadataIdsFromObjectPermissions.ts
deleted file mode 100644
index fcde6f198b4..00000000000
--- a/packages/twenty-front/src/modules/object-metadata/utils/getNonReadableFieldMetadataIdsFromObjectPermissions.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { type ObjectPermissions } from 'twenty-shared/types';
-
-type GetNonReadableFieldMetadataIdsFromObjectPermissionsArgs = {
- objectPermissions: ObjectPermissions;
-};
-
-export const getNonReadableFieldMetadataIdsFromObjectPermissions = ({
- objectPermissions,
-}: GetNonReadableFieldMetadataIdsFromObjectPermissionsArgs) => {
- const restrictedFields = objectPermissions.restrictedFields;
-
- return Object.entries(restrictedFields)
- .filter(([_, restrictedField]) => restrictedField.canRead === false)
- .map(([fieldMetadataId]) => fieldMetadataId);
-};
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/getNonUpdatableFieldMetadataIdsFromObjectPermissions.ts b/packages/twenty-front/src/modules/object-metadata/utils/getNonUpdatableFieldMetadataIdsFromObjectPermissions.ts
deleted file mode 100644
index 85583ca40d8..00000000000
--- a/packages/twenty-front/src/modules/object-metadata/utils/getNonUpdatableFieldMetadataIdsFromObjectPermissions.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { type ObjectPermissions } from 'twenty-shared/types';
-
-type GetNonUpdatableFieldMetadataIdsFromObjectPermissionsArgs = {
- objectPermissions: ObjectPermissions;
-};
-
-export const getNonUpdatableFieldMetadataIdsFromObjectPermissions = ({
- objectPermissions,
-}: GetNonUpdatableFieldMetadataIdsFromObjectPermissionsArgs): string[] => {
- const restrictedFields = objectPermissions.restrictedFields;
-
- return Object.entries(restrictedFields)
- .filter(([_, restrictedField]) => restrictedField.canUpdate === false)
- .map(([fieldMetadataId]) => fieldMetadataId);
-};
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/getObjectPermissionsForObject.ts b/packages/twenty-front/src/modules/object-metadata/utils/getObjectPermissionsForObject.ts
index 57ed890b184..d339ac58ae6 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/getObjectPermissionsForObject.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/getObjectPermissionsForObject.ts
@@ -1,40 +1,11 @@
-import { type ObjectPermissions } from 'twenty-shared/types';
-import { isDefined } from 'twenty-shared/utils';
+import { type ObjectPermissionsByObjectMetadataId } from '@/object-metadata/types/ObjectPermissionsByObjectMetadataId';
+import { type ObjectPermissionsWithObjectMetadataId } from '@/object-metadata/types/ObjectPermissionsWithObjectMetadataId';
+import { getDefaultObjectPermissions } from '@/object-metadata/utils/getDefaultObjectPermissions';
+// An object missing from the role's permissions (e.g. created after they were loaded) gets the defaults
export const getObjectPermissionsForObject = (
- objectPermissionsByObjectMetadataId: Record<
- string,
- ObjectPermissions & { objectMetadataId: string }
- >,
+ objectPermissionsByObjectMetadataId: ObjectPermissionsByObjectMetadataId,
objectMetadataId: string,
-): ObjectPermissions & { objectMetadataId: string } => {
- const objectPermissions =
- objectPermissionsByObjectMetadataId[objectMetadataId];
-
- if (!isDefined(objectPermissions)) {
- return {
- canReadObjectRecords: true,
- canUpdateObjectRecords: true,
- canSoftDeleteObjectRecords: true,
- canDestroyObjectRecords: true,
- restrictedFields: {},
- objectMetadataId,
- rowLevelPermissionPredicates: [],
- rowLevelPermissionPredicateGroups: [],
- };
- }
-
- return {
- canReadObjectRecords: objectPermissions.canReadObjectRecords ?? true,
- canUpdateObjectRecords: objectPermissions.canUpdateObjectRecords ?? true,
- canSoftDeleteObjectRecords:
- objectPermissions.canSoftDeleteObjectRecords ?? true,
- canDestroyObjectRecords: objectPermissions.canDestroyObjectRecords ?? true,
- restrictedFields: objectPermissions.restrictedFields ?? {},
- objectMetadataId,
- rowLevelPermissionPredicates:
- objectPermissions.rowLevelPermissionPredicates ?? [],
- rowLevelPermissionPredicateGroups:
- objectPermissions.rowLevelPermissionPredicateGroups ?? [],
- };
-};
+): ObjectPermissionsWithObjectMetadataId =>
+ objectPermissionsByObjectMetadataId[objectMetadataId] ??
+ getDefaultObjectPermissions(objectMetadataId);
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/getPermittedFields.ts b/packages/twenty-front/src/modules/object-metadata/utils/getPermittedFields.ts
new file mode 100644
index 00000000000..640bab6ba9e
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-metadata/utils/getPermittedFields.ts
@@ -0,0 +1,33 @@
+import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
+import { getFieldPermissions } from '@/object-metadata/utils/getFieldPermissions';
+import { type ObjectPermissions } from 'twenty-shared/types';
+
+type GetPermittedFieldsArgs = {
+ fields: FieldMetadataItem[];
+ objectPermissions: Pick<ObjectPermissions, 'restrictedFields'>;
+};
+
+export const getPermittedFields = ({
+ fields,
+ objectPermissions,
+}: GetPermittedFieldsArgs) => {
+ const readableFields: FieldMetadataItem[] = [];
+ const updatableFields: FieldMetadataItem[] = [];
+
+ for (const field of fields) {
+ const { canReadField, canUpdateField } = getFieldPermissions({
+ objectPermissions,
+ fieldMetadataId: field.id,
+ });
+
+ if (canReadField) {
+ readableFields.push(field);
+ }
+
+ if (canUpdateField) {
+ updatableFields.push(field);
+ }
+ }
+
+ return { readableFields, updatableFields };
+};
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useObjectPermissions.ts b/packages/twenty-front/src/modules/object-record/hooks/useObjectPermissions.ts
index b63fba4d689..c6fd0564f37 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useObjectPermissions.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useObjectPermissions.ts
@@ -1,42 +1,10 @@
-import { useMemo } from 'react';
-
-import { currentUserWorkspaceState } from '@/auth/states/currentUserWorkspaceState';
+import { objectPermissionsByObjectMetadataIdSelector } from '@/object-metadata/states/objectPermissionsByObjectMetadataIdSelector';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { type ObjectPermissions } from 'twenty-shared/types';
-import { isDefined } from 'twenty-shared/utils';
-
-type useObjectPermissionsReturnType = {
- objectPermissionsByObjectMetadataId: Record<
- string,
- ObjectPermissions & { objectMetadataId: string }
- >;
-};
-
-const EMPTY_PERMISSIONS: Record<
- string,
- ObjectPermissions & { objectMetadataId: string }
-> = {};
-
-export const useObjectPermissions = (): useObjectPermissionsReturnType => {
- const currentUserWorkspace = useAtomStateValue(currentUserWorkspaceState);
- const objectsPermissions = currentUserWorkspace?.objectsPermissions;
-
- const objectPermissionsByObjectMetadataId = useMemo(() => {
- if (!isDefined(objectsPermissions)) {
- return EMPTY_PERMISSIONS;
- }
- return objectsPermissions.reduce(
- (
- acc: Record<string, ObjectPermissions & { objectMetadataId: string }>,
- objectPermission,
- ) => {
- acc[objectPermission.objectMetadataId] = objectPermission;
- return acc;
- },
- {},
- );
- }, [objectsPermissions]);
+export const useObjectPermissions = () => {
+ const objectPermissionsByObjectMetadataId = useAtomStateValue(
+ objectPermissionsByObjectMetadataIdSelector,
+ );
return {
objectPermissionsByObjectMetadataId,
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useObjectPermissionsForObject.ts b/packages/twenty-front/src/modules/object-record/hooks/useObjectPermissionsForObject.ts
index 81439708f9b..8fbabbf1a86 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useObjectPermissionsForObject.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useObjectPermissionsForObject.ts
@@ -1,18 +1,22 @@
-import { getObjectPermissionsForObject } from '~/modules/object-metadata/utils/getObjectPermissionsForObject';
-
+import { objectPermissionsByObjectMetadataIdSelector } from '@/object-metadata/states/objectPermissionsByObjectMetadataIdSelector';
+import { type ObjectPermissionsWithObjectMetadataId } from '@/object-metadata/types/ObjectPermissionsWithObjectMetadataId';
+import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';
+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useMemo } from 'react';
-import { type ObjectPermissions } from 'twenty-shared/types';
-import { useObjectPermissions } from './useObjectPermissions';
export const useObjectPermissionsForObject = (
objectMetadataId: string,
-): ObjectPermissions & { objectMetadataId: string } => {
- const { objectPermissionsByObjectMetadataId } = useObjectPermissions();
+): ObjectPermissionsWithObjectMetadataId => {
+ const objectPermissionsByObjectMetadataId = useAtomStateValue(
+ objectPermissionsByObjectMetadataIdSelector,
+ );
- return useMemo(() => {
- return getObjectPermissionsForObject(
- objectPermissionsByObjectMetadataId,
- objectMetadataId,
- );
- }, [objectPermissionsByObjectMetadataId, objectMetadataId]);
+ return useMemo(
+ () =>
+ getObjectPermissionsForObject(
+ objectPermissionsByObjectMetadataId,
+ objectMetadataId,
+ ),
+ [objectPermissionsByObjectMetadataId, objectMetadataId],
+ );
};
diff --git a/packages/twenty-front/src/modules/object-record/read-only/hooks/useIsObjectReadOnly.ts b/packages/twenty-front/src/modules/object-record/read-only/hooks/useIsObjectReadOnly.ts
new file mode 100644
index 00000000000..3704064584c
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/read-only/hooks/useIsObjectReadOnly.ts
@@ -0,0 +1,23 @@
+import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';
+import { useObjectMetadataItemById } from '@/object-metadata/hooks/useObjectMetadataItemById';
+import { useObjectPermissionsForObject } from '@/object-record/hooks/useObjectPermissionsForObject';
+import { isObjectReadOnly } from '@/object-record/read-only/utils/isObjectReadOnly';
+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
+
+export const useIsObjectReadOnly = (objectMetadataId: string) => {
+ const isLayoutCustomizationModeEnabled = useAtomStateValue(
+ isLayoutCustomizationModeEnabledState,
+ );
+
+ const { objectMetadataItem } = useObjectMetadataItemById({
+ objectId: objectMetadataId,
+ });
+
+ const objectPermissions = useObjectPermissionsForObject(objectMetadataId);
+
+ return isObjectReadOnly({
+ isLayoutCustomizationModeEnabled,
+ objectPermissions,
+ objectMetadataItem,
+ });
+};
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 11e2e504cee..44571f887ac 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,9 +1,10 @@
import { useObjectMetadataItemById } from '@/object-metadata/hooks/useObjectMetadataItemById';
import { formatFieldMetadataItemAsFieldDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsFieldDefinition';
-import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';
import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
import { useIsRecordReadOnly } from '@/object-record/read-only/hooks/useIsRecordReadOnly';
import { isRecordFieldReadOnly } from '@/object-record/read-only/utils/isRecordFieldReadOnly';
+import { useMemo } from 'react';
+import { isDefined } from 'twenty-shared/utils';
export type UseFieldIsReadOnlyParams = {
fieldMetadataId: string;
@@ -24,30 +25,31 @@ export const useIsRecordFieldReadOnly = ({
(field) => field.id === fieldMetadataId,
);
- const { objectPermissionsByObjectMetadataId } = useObjectPermissions();
-
- const objectPermissions = getObjectPermissionsForObject(
- objectPermissionsByObjectMetadataId,
- objectMetadataId,
+ const fieldDefinition = useMemo(
+ () =>
+ isDefined(fieldMetadataItem)
+ ? formatFieldMetadataItemAsFieldDefinition({
+ field: fieldMetadataItem,
+ objectMetadataItem,
+ })
+ : undefined,
+ [fieldMetadataItem, objectMetadataItem],
);
+ const { objectPermissionsByObjectMetadataId } = useObjectPermissions();
+
const isRecordReadOnly = useIsRecordReadOnly({
recordId,
objectMetadataId,
});
- if (!fieldMetadataItem) {
+ if (!isDefined(fieldMetadataItem)) {
return false;
}
- const fieldDefinition = formatFieldMetadataItemAsFieldDefinition({
- field: fieldMetadataItem,
- objectMetadataItem,
- });
-
return isRecordFieldReadOnly({
isRecordReadOnly,
- objectPermissions,
+ objectMetadataId,
fieldMetadataItem,
fieldDefinition,
objectPermissionsByObjectMetadataId,
diff --git a/packages/twenty-front/src/modules/object-record/read-only/hooks/useIsRecordReadOnly.ts b/packages/twenty-front/src/modules/object-record/read-only/hooks/useIsRecordReadOnly.ts
index aa8af14c2fc..e9562d6c9cb 100644
--- a/packages/twenty-front/src/modules/object-record/read-only/hooks/useIsRecordReadOnly.ts
+++ b/packages/twenty-front/src/modules/object-record/read-only/hooks/useIsRecordReadOnly.ts
@@ -1,10 +1,5 @@
-import { useObjectMetadataItemById } from '@/object-metadata/hooks/useObjectMetadataItemById';
-import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';
-import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';
-import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
-import { isRecordReadOnly } from '@/object-record/read-only/utils/isRecordReadOnly';
+import { useIsObjectReadOnly } from '@/object-record/read-only/hooks/useIsObjectReadOnly';
import { useIsRecordDeleted } from '@/object-record/record-field/ui/hooks/useIsRecordDeleted';
-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
type UseIsRecordReadOnlyParams = {
recordId: string;
@@ -15,29 +10,8 @@ export const useIsRecordReadOnly = ({
recordId,
objectMetadataId,
}: UseIsRecordReadOnlyParams) => {
- const isLayoutCustomizationModeEnabled = useAtomStateValue(
- isLayoutCustomizationModeEnabledState,
- );
-
- const { objectMetadataItem } = useObjectMetadataItemById({
- objectId: objectMetadataId,
- });
-
- const { objectPermissionsByObjectMetadataId } = useObjectPermissions();
-
- const objectPermissions = getObjectPermissionsForObject(
- objectPermissionsByObjectMetadataId,
- objectMetadataId,
- );
-
+ const isObjectReadOnly = useIsObjectReadOnly(objectMetadataId);
const isRecordDeleted = useIsRecordDeleted({ recordId });
- return (
- isLayoutCustomizationModeEnabled ||
- isRecordReadOnly({
- objectPermissions,
- isRecordDeleted,
- objectMetadataItem,
- })
- );
+ return isObjectReadOnly || isRecordDeleted;
};
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 0c9d2ddec72..1a93cfdbb21 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
@@ -6,8 +6,6 @@ describe('isObjectMetadataReadOnly', () => {
const result = isObjectMetadataReadOnly({
objectPermissions: {
canUpdateObjectRecords: true,
- objectMetadataId: '123',
- restrictedFields: {},
},
objectMetadataItem: {
isUIEditable: true,
@@ -23,8 +21,6 @@ describe('isObjectMetadataReadOnly', () => {
const result = isObjectMetadataReadOnly({
objectPermissions: {
canUpdateObjectRecords: false,
- objectMetadataId: '123',
- restrictedFields: {},
},
objectMetadataItem: {
isUIEditable: true,
@@ -40,8 +36,6 @@ describe('isObjectMetadataReadOnly', () => {
const result = isObjectMetadataReadOnly({
objectPermissions: {
canUpdateObjectRecords: true,
- objectMetadataId: '123',
- restrictedFields: {},
},
objectMetadataItem: {
isUIEditable: false,
@@ -57,8 +51,6 @@ describe('isObjectMetadataReadOnly', () => {
const result = isObjectMetadataReadOnly({
objectPermissions: {
canUpdateObjectRecords: true,
- objectMetadataId: '123',
- restrictedFields: {},
},
objectMetadataItem: {
isUIEditable: true,
@@ -86,8 +78,6 @@ describe('isObjectMetadataReadOnly', () => {
const result = isObjectMetadataReadOnly({
objectPermissions: {
canUpdateObjectRecords: true,
- objectMetadataId: '123',
- restrictedFields: {},
},
objectMetadataItem: {
isUIEditable: true,
diff --git a/packages/twenty-front/src/modules/object-record/read-only/utils/__tests__/isObjectReadOnly.test.ts b/packages/twenty-front/src/modules/object-record/read-only/utils/__tests__/isObjectReadOnly.test.ts
new file mode 100644
index 00000000000..e56184868e4
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/read-only/utils/__tests__/isObjectReadOnly.test.ts
@@ -0,0 +1,40 @@
+import { isObjectReadOnly } from '@/object-record/read-only/utils/isObjectReadOnly';
+import { MetadataWritability } from '~/generated-metadata/graphql';
+
+const editableObjectMetadataItem = {
+ isUIEditable: true,
+ isRemote: false,
+ writability: MetadataWritability.OPEN,
+};
+
+describe('isObjectReadOnly', () => {
+ it('should return false for an editable object the user can update', () => {
+ expect(
+ isObjectReadOnly({
+ isLayoutCustomizationModeEnabled: false,
+ objectPermissions: { canUpdateObjectRecords: true },
+ objectMetadataItem: editableObjectMetadataItem,
+ }),
+ ).toBe(false);
+ });
+
+ it('should return true while the layout is being customized', () => {
+ expect(
+ isObjectReadOnly({
+ isLayoutCustomizationModeEnabled: true,
+ objectPermissions: { canUpdateObjectRecords: true },
+ objectMetadataItem: editableObjectMetadataItem,
+ }),
+ ).toBe(true);
+ });
+
+ it('should return true when the user cannot update the object records', () => {
+ expect(
+ isObjectReadOnly({
+ isLayoutCustomizationModeEnabled: false,
+ objectPermissions: { canUpdateObjectRecords: false },
+ objectMetadataItem: editableObjectMetadataItem,
+ }),
+ ).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 1cf94a16e73..f4cee1f13a3 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,111 +1,202 @@
+import { type ObjectPermissionsWithObjectMetadataId } from '@/object-metadata/types/ObjectPermissionsWithObjectMetadataId';
import { isRecordFieldReadOnly } from '@/object-record/read-only/utils/isRecordFieldReadOnly';
-import { MetadataWritability } from '~/generated-metadata/graphql';
+import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
+import { type FieldRelationMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';
+import {
+ FieldMetadataType,
+ MetadataWritability,
+ RelationType,
+} from '~/generated-metadata/graphql';
+
+const OBJECT_METADATA_ID = 'object-metadata-id';
+const TARGET_OBJECT_METADATA_ID = 'target-object-metadata-id';
+const FIELD_METADATA_ID = 'field-metadata-id';
+const INVERSE_FIELD_METADATA_ID = 'inverse-field-metadata-id';
+
+const buildObjectPermissions = (
+ overrides: Partial<ObjectPermissionsWithObjectMetadataId> = {},
+): ObjectPermissionsWithObjectMetadataId => ({
+ objectMetadataId: OBJECT_METADATA_ID,
+ canReadObjectRecords: true,
+ canUpdateObjectRecords: true,
+ canSoftDeleteObjectRecords: true,
+ canDestroyObjectRecords: true,
+ restrictedFields: {},
+ rowLevelPermissionPredicates: [],
+ rowLevelPermissionPredicateGroups: [],
+ ...overrides,
+});
-describe('isRecordFieldReadOnly', () => {
- const mockObjectPermissions = {
- canUpdateObjectRecords: true,
- objectMetadataId: '123',
- restrictedFields: {},
- };
-
- const mockParams = {
- isRecordReadOnly: false,
- objectPermissions: mockObjectPermissions,
- fieldMetadataItem: {
- id: 'field-123',
- isUIEditable: true,
- writability: MetadataWritability.OPEN,
- },
- };
+const baseParams = {
+ isRecordReadOnly: false,
+ objectMetadataId: OBJECT_METADATA_ID,
+ fieldMetadataItem: {
+ id: FIELD_METADATA_ID,
+ isUIEditable: true,
+ writability: MetadataWritability.OPEN,
+ },
+ objectPermissionsByObjectMetadataId: {
+ [OBJECT_METADATA_ID]: buildObjectPermissions(),
+ },
+};
+
+const oneToManyFieldDefinition: FieldDefinition<FieldRelationMetadata> = {
+ fieldMetadataId: FIELD_METADATA_ID,
+ label: 'People',
+ iconName: 'IconUsers',
+ type: FieldMetadataType.RELATION,
+ metadata: {
+ fieldName: 'people',
+ relationType: RelationType.ONE_TO_MANY,
+ relationObjectMetadataId: TARGET_OBJECT_METADATA_ID,
+ relationObjectMetadataNameSingular: 'person',
+ relationObjectMetadataNamePlural: 'people',
+ relationFieldMetadataId: INVERSE_FIELD_METADATA_ID,
+ objectMetadataNameSingular: 'company',
+ targetFieldMetadataName: 'company',
+ },
+};
+describe('isRecordFieldReadOnly', () => {
it('should return true when record is read-only', () => {
- const result = isRecordFieldReadOnly({
- ...mockParams,
- isRecordReadOnly: true,
- });
-
- expect(result).toBe(true);
+ expect(
+ isRecordFieldReadOnly({ ...baseParams, isRecordReadOnly: true }),
+ ).toBe(true);
});
it('should return true when object lacks update permissions', () => {
- const result = isRecordFieldReadOnly({
- ...mockParams,
- objectPermissions: {
- ...mockObjectPermissions,
- canUpdateObjectRecords: false,
- },
- });
-
- expect(result).toBe(true);
+ expect(
+ isRecordFieldReadOnly({
+ ...baseParams,
+ objectPermissionsByObjectMetadataId: {
+ [OBJECT_METADATA_ID]: buildObjectPermissions({
+ canUpdateObjectRecords: false,
+ }),
+ },
+ }),
+ ).toBe(true);
});
it('should return true when field is restricted by permissions', () => {
- const result = isRecordFieldReadOnly({
- ...mockParams,
- objectPermissions: {
- ...mockObjectPermissions,
- restrictedFields: {
- 'field-123': { canUpdate: false },
+ expect(
+ isRecordFieldReadOnly({
+ ...baseParams,
+ objectPermissionsByObjectMetadataId: {
+ [OBJECT_METADATA_ID]: buildObjectPermissions({
+ restrictedFields: { [FIELD_METADATA_ID]: { canUpdate: false } },
+ }),
},
- },
- });
+ }),
+ ).toBe(true);
+ });
- expect(result).toBe(true);
+ it('should return false when the object has no permissions entry', () => {
+ expect(
+ isRecordFieldReadOnly({
+ ...baseParams,
+ objectPermissionsByObjectMetadataId: {},
+ }),
+ ).toBe(false);
});
it('should return true when field is marked as UI read-only', () => {
- const result = isRecordFieldReadOnly({
- ...mockParams,
- fieldMetadataItem: {
- ...mockParams.fieldMetadataItem,
- isUIEditable: false,
- },
- });
-
- expect(result).toBe(true);
+ expect(
+ isRecordFieldReadOnly({
+ ...baseParams,
+ fieldMetadataItem: {
+ ...baseParams.fieldMetadataItem,
+ isUIEditable: false,
+ },
+ }),
+ ).toBe(true);
});
it('should return false when all conditions allow editing', () => {
- const result = isRecordFieldReadOnly({
- ...mockParams,
- });
-
- expect(result).toBe(false);
+ expect(isRecordFieldReadOnly(baseParams)).toBe(false);
});
it('should return true when the field writability is SYSTEM', () => {
- const result = isRecordFieldReadOnly({
- ...mockParams,
- fieldMetadataItem: {
- ...mockParams.fieldMetadataItem,
- writability: MetadataWritability.SYSTEM,
- },
- });
-
- expect(result).toBe(true);
+ expect(
+ isRecordFieldReadOnly({
+ ...baseParams,
+ fieldMetadataItem: {
+ ...baseParams.fieldMetadataItem,
+ writability: MetadataWritability.SYSTEM,
+ },
+ }),
+ ).toBe(true);
});
it('should return true when the field writability is APPLICATION', () => {
- const result = isRecordFieldReadOnly({
- ...mockParams,
- fieldMetadataItem: {
- ...mockParams.fieldMetadataItem,
- writability: MetadataWritability.APPLICATION,
- },
- });
-
- expect(result).toBe(true);
+ expect(
+ isRecordFieldReadOnly({
+ ...baseParams,
+ fieldMetadataItem: {
+ ...baseParams.fieldMetadataItem,
+ writability: MetadataWritability.APPLICATION,
+ },
+ }),
+ ).toBe(true);
});
it('should treat a missing field writability as OPEN', () => {
- const result = isRecordFieldReadOnly({
- ...mockParams,
- fieldMetadataItem: {
- ...mockParams.fieldMetadataItem,
- writability: undefined,
- },
- });
-
- expect(result).toBe(false);
+ expect(
+ isRecordFieldReadOnly({
+ ...baseParams,
+ fieldMetadataItem: {
+ ...baseParams.fieldMetadataItem,
+ writability: undefined,
+ },
+ }),
+ ).toBe(false);
+ });
+
+ it('should return true for a one-to-many relation whose target object cannot be updated', () => {
+ expect(
+ isRecordFieldReadOnly({
+ ...baseParams,
+ fieldDefinition: oneToManyFieldDefinition,
+ objectPermissionsByObjectMetadataId: {
+ ...baseParams.objectPermissionsByObjectMetadataId,
+ [TARGET_OBJECT_METADATA_ID]: buildObjectPermissions({
+ objectMetadataId: TARGET_OBJECT_METADATA_ID,
+ canUpdateObjectRecords: false,
+ }),
+ },
+ }),
+ ).toBe(true);
+ });
+
+ it('should return false for a one-to-many relation whose target object can be updated', () => {
+ expect(
+ isRecordFieldReadOnly({
+ ...baseParams,
+ fieldDefinition: oneToManyFieldDefinition,
+ objectPermissionsByObjectMetadataId: {
+ ...baseParams.objectPermissionsByObjectMetadataId,
+ [TARGET_OBJECT_METADATA_ID]: buildObjectPermissions({
+ objectMetadataId: TARGET_OBJECT_METADATA_ID,
+ }),
+ },
+ }),
+ ).toBe(false);
+ });
+
+ it('should return true for a one-to-many relation whose inverse field on the updatable target is update-restricted', () => {
+ expect(
+ isRecordFieldReadOnly({
+ ...baseParams,
+ fieldDefinition: oneToManyFieldDefinition,
+ objectPermissionsByObjectMetadataId: {
+ ...baseParams.objectPermissionsByObjectMetadataId,
+ [TARGET_OBJECT_METADATA_ID]: buildObjectPermissions({
+ objectMetadataId: TARGET_OBJECT_METADATA_ID,
+ restrictedFields: {
+ [INVERSE_FIELD_METADATA_ID]: { canUpdate: false },
+ },
+ }),
+ },
+ }),
+ ).toBe(true);
});
});
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 22b34c21fb8..bbd82f74d12 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
@@ -6,7 +6,6 @@ describe('isRecordReadOnly', () => {
const result = isRecordReadOnly({
objectPermissions: {
canUpdateObjectRecords: true,
- objectMetadataId: '123',
},
isRecordDeleted: false,
objectMetadataItem: {
@@ -23,7 +22,6 @@ describe('isRecordReadOnly', () => {
const result = isRecordReadOnly({
objectPermissions: {
canUpdateObjectRecords: false,
- objectMetadataId: '123',
},
isRecordDeleted: false,
objectMetadataItem: {
@@ -40,7 +38,6 @@ describe('isRecordReadOnly', () => {
const result = isRecordReadOnly({
objectPermissions: {
canUpdateObjectRecords: true,
- objectMetadataId: '123',
},
isRecordDeleted: true,
objectMetadataItem: {
@@ -57,7 +54,6 @@ describe('isRecordReadOnly', () => {
const result = isRecordReadOnly({
objectPermissions: {
canUpdateObjectRecords: false,
- objectMetadataId: '123',
},
isRecordDeleted: true,
objectMetadataItem: {
@@ -74,7 +70,6 @@ describe('isRecordReadOnly', () => {
const result = isRecordReadOnly({
objectPermissions: {
canUpdateObjectRecords: true,
- objectMetadataId: '123',
},
isRecordDeleted: false,
objectMetadataItem: {
diff --git a/packages/twenty-front/src/modules/object-record/read-only/utils/internal/isFieldMetadataReadOnlyByPermissions.ts b/packages/twenty-front/src/modules/object-record/read-only/utils/internal/isFieldMetadataReadOnlyByPermissions.ts
deleted file mode 100644
index 7bd5bbc66e9..00000000000
--- a/packages/twenty-front/src/modules/object-record/read-only/utils/internal/isFieldMetadataReadOnlyByPermissions.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { type ObjectPermission } from '~/generated-metadata/graphql';
-
-type IsFieldMetadataReadOnlyByPermissionParams = {
- objectPermissions: ObjectPermission;
- fieldMetadataId: string;
-};
-
-export const isFieldMetadataReadOnlyByPermissions = ({
- objectPermissions,
- fieldMetadataId,
-}: IsFieldMetadataReadOnlyByPermissionParams) => {
- if (objectPermissions.canUpdateObjectRecords === false) {
- return true;
- }
-
- const fieldMetadataIsRestrictedForUpdate =
- objectPermissions.restrictedFields?.[fieldMetadataId]?.canUpdate === false;
-
- return fieldMetadataIsRestrictedForUpdate;
-};
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 549a178de8b..5a71ac87a70 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,10 +1,10 @@
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 { type ObjectPermissions } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
type IsObjectMetadataReadOnlyParams = {
- objectPermissions?: ObjectPermission;
+ objectPermissions?: Pick<ObjectPermissions, 'canUpdateObjectRecords'>;
objectMetadataItem?: Pick<
EnrichedObjectMetadataItem,
'isUIEditable' | 'isRemote' | 'writability'
diff --git a/packages/twenty-front/src/modules/object-record/read-only/utils/isObjectReadOnly.ts b/packages/twenty-front/src/modules/object-record/read-only/utils/isObjectReadOnly.ts
new file mode 100644
index 00000000000..e8f926922d4
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-record/read-only/utils/isObjectReadOnly.ts
@@ -0,0 +1,23 @@
+import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
+import { isObjectMetadataReadOnly } from '@/object-record/read-only/utils/isObjectMetadataReadOnly';
+import { type ObjectPermissions } from 'twenty-shared/types';
+
+type IsObjectReadOnlyParams = {
+ isLayoutCustomizationModeEnabled: boolean;
+ objectPermissions: Pick<ObjectPermissions, 'canUpdateObjectRecords'>;
+ objectMetadataItem: Pick<
+ EnrichedObjectMetadataItem,
+ 'isUIEditable' | 'isRemote' | 'writability'
+ >;
+};
+
+export const isObjectReadOnly = ({
+ isLayoutCustomizationModeEnabled,
+ objectPermissions,
+ objectMetadataItem,
+}: IsObjectReadOnlyParams) => {
+ return (
+ isLayoutCustomizationModeEnabled ||
+ isObjectMetadataReadOnly({ objectPermissions, objectMetadataItem })
+ );
+};
diff --git a/packages/twenty-front/src/modules/object-record/read-only/utils/isOneToManyRelationFieldReadOnlyDueToTargetUpdatePermission.ts b/packages/twenty-front/src/modules/object-record/read-only/utils/isOneToManyRelationFieldReadOnlyDueToTargetUpdatePermission.ts
index 2915884a033..a8dece24394 100644
--- a/packages/twenty-front/src/modules/object-record/read-only/utils/isOneToManyRelationFieldReadOnlyDueToTargetUpdatePermission.ts
+++ b/packages/twenty-front/src/modules/object-record/read-only/utils/isOneToManyRelationFieldReadOnlyDueToTargetUpdatePermission.ts
@@ -1,18 +1,14 @@
import { isNonEmptyString } from '@sniptt/guards';
+import { type ObjectPermissionsByObjectMetadataId } from '@/object-metadata/types/ObjectPermissionsByObjectMetadataId';
+import { getFieldPermissions } from '@/object-metadata/utils/getFieldPermissions';
import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';
import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
import { type FieldMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';
import { isFieldMorphRelationOneToMany } from '@/object-record/record-field/ui/types/guards/isFieldMorphRelationOneToMany';
import { isFieldRelationOneToMany } from '@/object-record/record-field/ui/types/guards/isFieldRelationOneToMany';
-import { type ObjectPermissions } from 'twenty-shared/types';
import { isNonEmptyArray } from 'twenty-shared/utils';
-type ObjectPermissionsByObjectMetadataId = Record<
- string,
- ObjectPermissions & { objectMetadataId: string }
->;
-
type IsOneToManyRelationFieldReadOnlyDueToTargetUpdatePermissionParams = {
fieldDefinition: FieldDefinition<FieldMetadata>;
objectPermissionsByObjectMetadataId: ObjectPermissionsByObjectMetadataId;
@@ -39,8 +35,10 @@ const isTargetRecordUpdateBlocked = ({
return (
isNonEmptyString(inverseFieldMetadataId) &&
- targetObjectPermissions.restrictedFields[inverseFieldMetadataId]
- ?.canUpdate === false
+ !getFieldPermissions({
+ objectPermissions: targetObjectPermissions,
+ fieldMetadataId: inverseFieldMetadataId,
+ }).canUpdateField
);
};
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 6bb50486d20..61004d67bcf 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,54 +1,59 @@
import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
-import { isFieldMetadataReadOnlyByPermissions } from '@/object-record/read-only/utils/internal/isFieldMetadataReadOnlyByPermissions';
+import { type ObjectPermissionsByObjectMetadataId } from '@/object-metadata/types/ObjectPermissionsByObjectMetadataId';
+import { getFieldPermissions } from '@/object-metadata/utils/getFieldPermissions';
+import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';
import { isMetadataWritabilityRestricted } from '@/object-record/read-only/utils/internal/isMetadataWritabilityRestricted';
import { isOneToManyRelationFieldReadOnlyDueToTargetUpdatePermission } from '@/object-record/read-only/utils/isOneToManyRelationFieldReadOnlyDueToTargetUpdatePermission';
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';
-import { type ObjectPermissions } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-type ObjectPermissionsByObjectMetadataId = Record<
- string,
- ObjectPermissions & { objectMetadataId: string }
->;
-
type IsRecordFieldReadOnlyParams = {
isRecordReadOnly: boolean;
+ objectMetadataId: string;
fieldMetadataItem: Pick<
FieldMetadataItem,
'id' | 'isUIEditable' | 'writability'
>;
- objectPermissions: ObjectPermission;
+ objectPermissionsByObjectMetadataId: ObjectPermissionsByObjectMetadataId;
fieldDefinition?: FieldDefinition<FieldMetadata>;
- objectPermissionsByObjectMetadataId?: ObjectPermissionsByObjectMetadataId;
};
export const isRecordFieldReadOnly = ({
- objectPermissions,
isRecordReadOnly,
+ objectMetadataId,
fieldMetadataItem,
- fieldDefinition,
objectPermissionsByObjectMetadataId,
+ fieldDefinition,
}: IsRecordFieldReadOnlyParams) => {
- const fieldReadOnlyByPermissions = isFieldMetadataReadOnlyByPermissions({
- objectPermissions,
- fieldMetadataId: fieldMetadataItem.id,
- });
+ if (
+ isRecordReadOnly ||
+ !(fieldMetadataItem.isUIEditable ?? true) ||
+ isMetadataWritabilityRestricted(fieldMetadataItem.writability)
+ ) {
+ return true;
+ }
+
+ const objectPermissions = getObjectPermissionsForObject(
+ objectPermissionsByObjectMetadataId,
+ objectMetadataId,
+ );
- const oneToManyTargetReadOnly =
+ if (
+ !objectPermissions.canUpdateObjectRecords ||
+ !getFieldPermissions({
+ objectPermissions,
+ fieldMetadataId: fieldMetadataItem.id,
+ }).canUpdateField
+ ) {
+ return true;
+ }
+
+ return (
isDefined(fieldDefinition) &&
- isDefined(objectPermissionsByObjectMetadataId) &&
isOneToManyRelationFieldReadOnlyDueToTargetUpdatePermission({
fieldDefinition,
objectPermissionsByObjectMetadataId,
- });
-
- return (
- isRecordReadOnly ||
- !(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 14fa5bd71d5..0c54db9bce0 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
@@ -1,9 +1,9 @@
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { isObjectMetadataReadOnly } from '@/object-record/read-only/utils/isObjectMetadataReadOnly';
-import { type ObjectPermission } from '~/generated-metadata/graphql';
+import { type ObjectPermissions } from 'twenty-shared/types';
export type IsObjectReadOnlyParams = {
- objectPermissions: ObjectPermission;
+ objectPermissions: Pick<ObjectPermissions, 'canUpdateObjectRecords'>;
objectMetadataItem: Pick<
EnrichedObjectMetadataItem,
'isUIEditable' | 'isRemote' | 'writability'
diff --git a/packages/twenty-front/src/modules/object-record/record-board/contexts/RecordBoardContext.ts b/packages/twenty-front/src/modules/object-record/record-board/contexts/RecordBoardContext.ts
index e4cd2efc5b7..48bc8cf2d1e 100644
--- a/packages/twenty-front/src/modules/object-record/record-board/contexts/RecordBoardContext.ts
+++ b/packages/twenty-front/src/modules/object-record/record-board/contexts/RecordBoardContext.ts
@@ -3,7 +3,7 @@ import { createContext } from 'react';
import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
-import { type ObjectPermission } from '~/generated-metadata/graphql';
+import { type ObjectPermissionsWithObjectMetadataId } from '@/object-metadata/types/ObjectPermissionsWithObjectMetadataId';
type RecordBoardContextProps = {
objectMetadataItem: EnrichedObjectMetadataItem;
@@ -18,7 +18,7 @@ type RecordBoardContextProps = {
}) => void;
deleteOneRecord: (idToDelete: string) => Promise<unknown>;
recordBoardId: string;
- objectPermissions: ObjectPermission;
+ objectPermissions: ObjectPermissionsWithObjectMetadataId;
};
export const RecordBoardContext = createContext<RecordBoardContextProps>(
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 6ab0d27127b..681d3124730 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
@@ -25,7 +25,8 @@ export const RecordBoardCardBody = () => {
RecordBoardCardContext,
);
- const { updateOneRecord, objectPermissions } = useContext(RecordBoardContext);
+ const { updateOneRecord, objectMetadataItem } =
+ useContext(RecordBoardContext);
const {
labelIdentifierFieldMetadataItem,
@@ -88,7 +89,7 @@ export const RecordBoardCardBody = () => {
isLabelIdentifier: false,
isRecordFieldReadOnly: isRecordFieldReadOnly({
isRecordReadOnly,
- objectPermissions,
+ objectMetadataId: objectMetadataItem.id,
fieldMetadataItem,
fieldDefinition: correspondingFieldDefinition,
objectPermissionsByObjectMetadataId,
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 b464be5cae1..2d817481633 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
@@ -1,6 +1,6 @@
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
+import { getFieldPermissions } from '@/object-metadata/utils/getFieldPermissions';
import { useObjectPermissionsForObject } from '@/object-record/hooks/useObjectPermissionsForObject';
-import { isFieldMetadataReadOnlyByPermissions } from '@/object-record/read-only/utils/internal/isFieldMetadataReadOnlyByPermissions';
import { useRecordCalendarContextOrThrow } from '@/object-record/record-calendar/contexts/RecordCalendarContext';
import { isRecordCalendarReadOnlyComponentState } from '@/object-record/record-calendar/states/isRecordCalendarReadOnlyComponentState';
import { hasAnySoftDeleteFilterOnViewComponentSelector } from '@/object-record/record-filter/states/hasAnySoftDeleteFilterOnView';
@@ -62,10 +62,10 @@ export const RecordCalendarAddNew = ({
const isCalendarFieldReadOnly = calendarFieldMetadataItem
? calendarFieldMetadataItem.isUIEditable === false ||
- isFieldMetadataReadOnlyByPermissions({
+ !getFieldPermissions({
objectPermissions,
fieldMetadataId: calendarFieldMetadataItem.id,
- })
+ }).canUpdateField
: false;
// Creating through a nested relation or junction needs a record picker only the table layout offers.
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/contexts/RecordCalendarContext.ts b/packages/twenty-front/src/modules/object-record/record-calendar/contexts/RecordCalendarContext.ts
index 8fda9bd941f..a3809a1c1c2 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/contexts/RecordCalendarContext.ts
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/contexts/RecordCalendarContext.ts
@@ -1,13 +1,13 @@
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { type RecordField } from '@/object-record/record-field/types/RecordField';
-import { type ObjectPermission } from '~/generated-metadata/graphql';
+import { type ObjectPermissionsWithObjectMetadataId } from '@/object-metadata/types/ObjectPermissionsWithObjectMetadataId';
import { createRequiredContext } from '~/utils/createRequiredContext';
type RecordCalendarContextValue = {
viewBarInstanceId: string;
objectNameSingular: string;
objectMetadataItem: EnrichedObjectMetadataItem;
- objectPermissions: ObjectPermission;
+ objectPermissions: ObjectPermissionsWithObjectMetadataId;
visibleRecordFields: RecordField[];
};
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 cab252579a8..bf36b14b942 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
@@ -31,8 +31,7 @@ export const RecordCalendarCardBody = ({
calendarDay,
isRecordReadOnly,
}: RecordCalendarCardBodyProps) => {
- const { objectPermissions, objectMetadataItem } =
- useRecordCalendarContextOrThrow();
+ const { objectMetadataItem } = useRecordCalendarContextOrThrow();
const cardInstanceIdPrefix =
getRecordCalendarCardInstanceIdPrefix(calendarDay);
@@ -103,7 +102,7 @@ export const RecordCalendarCardBody = ({
isLabelIdentifier: false,
isRecordFieldReadOnly: isRecordFieldReadOnly({
isRecordReadOnly,
- objectPermissions,
+ objectMetadataId: objectMetadataItem.id,
fieldMetadataItem,
fieldDefinition: correspondingFieldDefinition,
objectPermissionsByObjectMetadataId,
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/hooks/useIsRecordCalendarCardDragDisabled.ts b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/hooks/useIsRecordCalendarCardDragDisabled.ts
index f154b4fb495..fa695e7bd22 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/hooks/useIsRecordCalendarCardDragDisabled.ts
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/hooks/useIsRecordCalendarCardDragDisabled.ts
@@ -1,7 +1,7 @@
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
+import { getFieldPermissions } from '@/object-metadata/utils/getFieldPermissions';
import { useObjectPermissionsForObject } from '@/object-record/hooks/useObjectPermissionsForObject';
import { useIsRecordReadOnly } from '@/object-record/read-only/hooks/useIsRecordReadOnly';
-import { isFieldMetadataReadOnlyByPermissions } from '@/object-record/read-only/utils/internal/isFieldMetadataReadOnlyByPermissions';
import { useRecordCalendarContextOrThrow } from '@/object-record/record-calendar/contexts/RecordCalendarContext';
import { isRecordCalendarReadOnlyComponentState } from '@/object-record/record-calendar/states/isRecordCalendarReadOnlyComponentState';
import { recordIndexCalendarFieldMetadataIdComponentState } from '@/object-record/record-index/states/recordIndexCalendarFieldMetadataIdComponentState';
@@ -31,10 +31,10 @@ export const useIsRecordCalendarCardDragDisabled = (recordId: string) => {
const calendarFieldIsReadOnly =
calendarFieldMetadataItem?.isUIEditable === false ||
(isDefined(calendarFieldMetadataItem) &&
- isFieldMetadataReadOnlyByPermissions({
+ !getFieldPermissions({
objectPermissions,
fieldMetadataId: calendarFieldMetadataItem.id,
- }));
+ }).canUpdateField);
return (
isRecordCalendarReadOnly || recordIsReadOnly || calendarFieldIsReadOnly
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 0c616ad3128..5a1db918ed1 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
@@ -21,7 +21,6 @@ import { PropertyBox } from '@/object-record/record-inline-cell/property-box/com
import { useRecordShowContainerActions } from '@/object-record/record-show/hooks/useRecordShowContainerActions';
import { useRecordShowContainerData } from '@/object-record/record-show/hooks/useRecordShowContainerData';
import { getRecordFieldInputInstanceId } from '@/object-record/utils/getRecordFieldInputId';
-import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { FieldMetadataType } from 'twenty-shared/types';
@@ -110,10 +109,7 @@ export const RecordFieldList = ({
isDisplayModeFixHeight: true,
isRecordFieldReadOnly: isRecordFieldReadOnly({
isRecordReadOnly,
- objectPermissions: getObjectPermissionsForObject(
- objectPermissionsByObjectMetadataId,
- objectMetadataItem.id,
- ),
+ objectMetadataId: objectMetadataItem.id,
fieldMetadataItem,
fieldDefinition,
objectPermissionsByObjectMetadataId,
@@ -180,10 +176,7 @@ export const RecordFieldList = ({
isDisplayModeFixHeight: true,
isRecordFieldReadOnly: isRecordFieldReadOnly({
isRecordReadOnly,
- objectPermissions: getObjectPermissionsForObject(
- objectPermissionsByObjectMetadataId,
- objectMetadataItem.id,
- ),
+ objectMetadataId: objectMetadataItem.id,
fieldMetadataItem,
fieldDefinition,
objectPermissionsByObjectMetadataId,
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailMorphRelationSectionDropdown.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailMorphRelationSectionDropdown.tsx
index 803315a1fbd..becc2d31cd4 100644
--- a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailMorphRelationSectionDropdown.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailMorphRelationSectionDropdown.tsx
@@ -48,10 +48,7 @@ export const RecordDetailMorphRelationSectionDropdown = ({
const isRecordReadOnlyFromRelatedRecordPerspective =
relatedObjectMetadataItems.some((relatedObjectMetadataItem) => {
return isRecordReadOnly({
- objectPermissions: {
- canUpdateObjectRecords: true,
- objectMetadataId: relatedObjectMetadataItem.id,
- },
+ objectPermissions: { canUpdateObjectRecords: true },
isRecordDeleted: isDeleted,
objectMetadataItem: relatedObjectMetadataItem,
});
diff --git a/packages/twenty-front/src/modules/object-record/record-form/utils/computeRecordFormFieldMetadataItems.ts b/packages/twenty-front/src/modules/object-record/record-form/utils/computeRecordFormFieldMetadataItems.ts
index 256b8aaeab4..664b1f1d2fd 100644
--- a/packages/twenty-front/src/modules/object-record/record-form/utils/computeRecordFormFieldMetadataItems.ts
+++ b/packages/twenty-front/src/modules/object-record/record-form/utils/computeRecordFormFieldMetadataItems.ts
@@ -1,4 +1,5 @@
import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
+import { getFieldPermissions } from '@/object-metadata/utils/getFieldPermissions';
import { type PageLayoutTab } from '@/page-layout/types/PageLayoutTab';
import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';
import { type RestrictedFieldsPermissions } from 'twenty-shared/types';
@@ -56,7 +57,10 @@ export const computeRecordFormFieldMetadataItems = <
fieldMetadataItems
.filter(
(fieldMetadataItem) =>
- restrictedFields[fieldMetadataItem.id]?.canUpdate !== false,
+ getFieldPermissions({
+ objectPermissions: { restrictedFields },
+ fieldMetadataId: fieldMetadataItem.id,
+ }).canUpdateField,
)
.map((fieldMetadataItem) => [fieldMetadataItem.id, fieldMetadataItem]),
);
diff --git a/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupAggregateDropdownContent.tsx b/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupAggregateDropdownContent.tsx
index d736e4ada83..abb0388c7fe 100644
--- a/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupAggregateDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupAggregateDropdownContent.tsx
@@ -1,6 +1,4 @@
import { useDropdownContextStateManagement } from '@/dropdown-context-state-management/hooks/useDropdownContextStateManagement';
-import { getNonReadableFieldMetadataIdsFromObjectPermissions } from '@/object-metadata/utils/getNonReadableFieldMetadataIdsFromObjectPermissions';
-import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
import { RecordGroupAggregateDropdownFieldsContent } from '@/object-record/record-group/components/RecordGroupAggregateDropdownFieldsContent';
import { RecordGroupAggregateDropdownMenuContent } from '@/object-record/record-group/components/RecordGroupAggregateDropdownMenuContent';
import { RecordGroupAggregateDropdownOptionsContent } from '@/object-record/record-group/components/RecordGroupAggregateDropdownOptionsContent';
@@ -11,7 +9,6 @@ import { NON_STANDARD_AGGREGATE_OPERATION_OPTIONS } from '@/object-record/record
import { PERCENT_AGGREGATE_OPERATION_OPTIONS } from '@/object-record/record-table/record-table-footer/constants/percentAggregateOperationOptions';
import { type AvailableFieldsForAggregateOperation } from '@/object-record/types/AvailableFieldsForAggregateOperation';
import { getAvailableFieldsIdsForAggregationFromObjectFields } from '@/object-record/utils/getAvailableFieldsIdsForAggregationFromObjectFields';
-import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';
import { t } from '@lingui/core/macro';
export const RecordGroupAggregateDropdownContent = () => {
@@ -20,19 +17,7 @@ export const RecordGroupAggregateDropdownContent = () => {
context: RecordGroupAggregateDropdownContext,
});
- const { objectPermissionsByObjectMetadataId } = useObjectPermissions();
-
- const restrictedFieldMetadataIds =
- getNonReadableFieldMetadataIdsFromObjectPermissions({
- objectPermissions: getObjectPermissionsForObject(
- objectPermissionsByObjectMetadataId,
- objectMetadataItem.id,
- ),
- });
-
- const readableFields = objectMetadataItem.fields.filter(
- (field) => !restrictedFieldMetadataIds.includes(field.id),
- );
+ const { readableFields } = objectMetadataItem;
switch (currentContentId) {
case 'countAggregateOperationsOptions': {
diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexEmptyState.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexEmptyState.tsx
index b2776c271ac..06164c83ea6 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexEmptyState.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexEmptyState.tsx
@@ -12,11 +12,11 @@ import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useLingui } from '@lingui/react/macro';
import { IconFilterOff, IconPlus, IconSettings } from 'twenty-ui/icon';
-import { type ObjectPermission } from '~/generated-metadata/graphql';
+import { type ObjectPermissionsWithObjectMetadataId } from '@/object-metadata/types/ObjectPermissionsWithObjectMetadataId';
type RecordIndexEmptyStateProps = {
objectMetadataItem: EnrichedObjectMetadataItem;
- objectPermissions: ObjectPermission;
+ objectPermissions: ObjectPermissionsWithObjectMetadataId;
isSoftDeleteFilterActive: boolean;
onRemoveSoftDeleteFilter?: () => void;
onGoToSettings?: () => void;
diff --git a/packages/twenty-front/src/modules/object-record/record-list/contexts/RecordListContext.ts b/packages/twenty-front/src/modules/object-record/record-list/contexts/RecordListContext.ts
index a6873283d6b..a7c5f5c9603 100644
--- a/packages/twenty-front/src/modules/object-record/record-list/contexts/RecordListContext.ts
+++ b/packages/twenty-front/src/modules/object-record/record-list/contexts/RecordListContext.ts
@@ -1,12 +1,12 @@
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
-import { type ObjectPermission } from '~/generated-metadata/graphql';
+import { type ObjectPermissionsWithObjectMetadataId } from '@/object-metadata/types/ObjectPermissionsWithObjectMetadataId';
import { createRequiredContext } from '~/utils/createRequiredContext';
type RecordListContextValue = {
viewBarInstanceId: string;
objectNameSingular: string;
objectMetadataItem: EnrichedObjectMetadataItem;
- objectPermissions: ObjectPermission;
+ objectPermissions: ObjectPermissionsWithObjectMetadataId;
};
export const [RecordListContextProvider, useRecordListContextOrThrow] =
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableContextProvider.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableContextProvider.tsx
index e5e692e689c..d62339e6187 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableContextProvider.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableContextProvider.tsx
@@ -1,17 +1,20 @@
import { type ReactNode, useCallback } from 'react';
+import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
import { RecordTableContextProvider as RecordTableContextInternalProvider } from '@/object-record/record-table/contexts/RecordTableContext';
import { useObjectPermissionsForObject } from '@/object-record/hooks/useObjectPermissionsForObject';
import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
+import { isObjectReadOnly } from '@/object-record/read-only/utils/isObjectReadOnly';
import { visibleRecordFieldsComponentSelector } from '@/object-record/record-field/states/visibleRecordFieldsComponentSelector';
import { type RecordUpdateHookParams } from '@/object-record/record-field/ui/contexts/FieldContext';
import { useResolveOpenRecordIn } from '@/object-record/record-index/hooks/useResolveOpenRecordIn';
import { RECORD_TABLE_COLUMN_MIN_WIDTH } from '@/object-record/record-table/constants/RecordTableColumnMinWidth';
import { RecordTableUpdateContext } from '@/object-record/record-table/contexts/RecordTableUpdateContext';
import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';
+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useIsTouchDevice } from 'twenty-ui/utilities';
import { OpenRecordIn } from 'twenty-shared/types';
@@ -40,6 +43,10 @@ export const RecordTableContextProvider = ({
objectMetadataItem.id,
);
+ const isLayoutCustomizationModeEnabled = useAtomStateValue(
+ isLayoutCustomizationModeEnabledState,
+ );
+
const visibleRecordFields = useAtomComponentSelectorValue(
visibleRecordFieldsComponentSelector,
);
@@ -76,6 +83,11 @@ export const RecordTableContextProvider = ({
recordTableId,
objectNameSingular,
objectPermissions,
+ isObjectReadOnly: isObjectReadOnly({
+ isLayoutCustomizationModeEnabled,
+ objectPermissions,
+ objectMetadataItem,
+ }),
visibleRecordFields: visibleRecordFields.map((field) => ({
...field,
size: Math.max(field.size, RECORD_TABLE_COLUMN_MIN_WIDTH),
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/__stories__/perf/RecordTableCell.perf.stories.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/__stories__/perf/RecordTableCell.perf.stories.tsx
index 7c325eec541..b790e624ce8 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/components/__stories__/perf/RecordTableCell.perf.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/__stories__/perf/RecordTableCell.perf.stories.tsx
@@ -25,6 +25,7 @@ import { type RecordField } from '@/object-record/record-field/types/RecordField
import { RecordIndexContextProvider } from '@/object-record/record-index/contexts/RecordIndexContext';
import { mockPerformance } from '@/object-record/record-table/components/__stories__/perf/mock';
import { RecordTableBodyContextProvider } from '@/object-record/record-table/contexts/RecordTableBodyContext';
+import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';
import { RecordTableContextProvider } from '@/object-record/record-table/contexts/RecordTableContext';
import { RecordTableRowContextProvider } from '@/object-record/record-table/contexts/RecordTableRowContext';
import { RecordTableRowDraggableContextProvider } from '@/object-record/record-table/contexts/RecordTableRowDraggableContext';
@@ -175,9 +176,11 @@ const meta: Meta = {
objectMetadataItems: [],
objectNameSingular:
mockPerformance.objectMetadataItem.nameSingular,
- objectPermissions: {
- objectMetadataId: mockPerformance.objectMetadataItem.id,
- },
+ objectPermissions: getObjectPermissionsForObject(
+ {},
+ mockPerformance.objectMetadataItem.id,
+ ),
+ isObjectReadOnly: false,
visibleRecordFields,
onRecordIdentifierClick: () => {},
triggerEvent: 'CLICK',
diff --git a/packages/twenty-front/src/modules/object-record/record-table/contexts/RecordTableContext.ts b/packages/twenty-front/src/modules/object-record/record-table/contexts/RecordTableContext.ts
index f489e6298e8..a1a6025a52f 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/contexts/RecordTableContext.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/contexts/RecordTableContext.ts
@@ -1,6 +1,6 @@
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { type RecordField } from '@/object-record/record-field/types/RecordField';
-import { type ObjectPermission } from '~/generated-metadata/graphql';
+import { type ObjectPermissionsWithObjectMetadataId } from '@/object-metadata/types/ObjectPermissionsWithObjectMetadataId';
import { createRequiredContext } from '~/utils/createRequiredContext';
type RecordTableContextValue = {
@@ -9,7 +9,8 @@ type RecordTableContextValue = {
objectNameSingular: string;
objectMetadataItem: EnrichedObjectMetadataItem;
objectMetadataItems: EnrichedObjectMetadataItem[];
- objectPermissions: ObjectPermission;
+ objectPermissions: ObjectPermissionsWithObjectMetadataId;
+ isObjectReadOnly: boolean;
visibleRecordFields: RecordField[];
onRecordIdentifierClick?: (rowIndex: number, recordId: string) => void;
triggerEvent: 'CLICK' | 'MOUSE_DOWN';
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 8e470555a78..e163a78736f 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
@@ -123,7 +123,7 @@ export const RecordTableCellFieldContextGeneric = ({
isInvalidJunctionRelation ||
isRecordFieldReadOnly({
isRecordReadOnly: isRecordReadOnly ?? false,
- objectPermissions,
+ objectMetadataId: objectMetadataItem.id,
fieldMetadataItem,
fieldDefinition,
objectPermissionsByObjectMetadataId,
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 58d9b7edc1f..00ad79a8b21 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
@@ -68,7 +68,7 @@ export const RecordTableCellFieldContextLabelIdentifier = ({
isRecordTableCellsNonEditable ||
isRecordFieldReadOnly({
isRecordReadOnly: isRecordReadOnly ?? false,
- objectPermissions,
+ objectMetadataId: objectMetadataItem.id,
fieldMetadataItem,
fieldDefinition,
objectPermissionsByObjectMetadataId,
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/__stories__/RecordTableColumnAggregateFooter.stories.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/__stories__/RecordTableColumnAggregateFooter.stories.tsx
index 3028e8a4fce..8f46142ff38 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/__stories__/RecordTableColumnAggregateFooter.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/components/__stories__/RecordTableColumnAggregateFooter.stories.tsx
@@ -1,6 +1,7 @@
import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext';
import { contextStoreCurrentViewIdComponentState } from '@/context-store/states/contextStoreCurrentViewIdComponentState';
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
+import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';
import { RecordComponentInstanceContextsWrapper } from '@/object-record/components/RecordComponentInstanceContextsWrapper';
import { RecordTableComponentInstance } from '@/object-record/record-table/components/RecordTableComponentInstance';
import { RecordTableContextProvider } from '@/object-record/record-table/contexts/RecordTableContext';
@@ -51,7 +52,11 @@ const AggregateExample = () => {
objectNameSingular: 'company',
objectMetadataItem: company,
objectMetadataItems,
- objectPermissions: { objectMetadataId: company.id },
+ objectPermissions: getObjectPermissionsForObject(
+ {},
+ company.id,
+ ),
+ isObjectReadOnly: false,
visibleRecordFields: [],
triggerEvent: 'CLICK',
}}
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableTr.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableTr.tsx
index 81050426697..b543f4f5a58 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableTr.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-row/components/RecordTableTr.tsx
@@ -1,5 +1,5 @@
import { getBasePathToShowPage } from '@/object-metadata/utils/getBasePathToShowPage';
-import { useIsRecordReadOnly } from '@/object-record/read-only/hooks/useIsRecordReadOnly';
+import { useIsRecordDeleted } from '@/object-record/record-field/ui/hooks/useIsRecordDeleted';
import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';
import { RecordTableRowContextProvider } from '@/object-record/record-table/contexts/RecordTableRowContext';
import { RecordTableRowDiv } from '@/object-record/record-table/record-table-row/components/RecordTableRowDiv';
@@ -24,7 +24,8 @@ type RecordTableTrProps = {
export const RecordTableTr = forwardRef<HTMLDivElement, RecordTableTrProps>(
({ children, recordId, focusIndex, isDragging = false, ...props }, ref) => {
- const { objectMetadataItem } = useRecordTableContextOrThrow();
+ const { objectMetadataItem, isObjectReadOnly } =
+ useRecordTableContextOrThrow();
const isRowSelected = useAtomComponentFamilyStateValue(
isRowSelectedComponentFamilyState,
@@ -45,10 +46,7 @@ export const RecordTableTr = forwardRef<HTMLDivElement, RecordTableTrProps>(
isRecordTableRowFocusActiveComponentState,
);
- const isRecordReadOnly = useIsRecordReadOnly({
- recordId,
- objectMetadataId: objectMetadataItem.id,
- });
+ const isRecordDeleted = useIsRecordDeleted({ recordId });
return (
<RecordTableRowContextProvider
@@ -61,7 +59,7 @@ export const RecordTableTr = forwardRef<HTMLDivElement, RecordTableTrProps>(
}) + recordId,
objectNameSingular: objectMetadataItem.nameSingular,
isSelected: isRowSelected,
- isRecordReadOnly,
+ isRecordReadOnly: isObjectReadOnly || isRecordDeleted,
}}
>
<RecordTableRowDiv
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 4961b1b9c14..90a70f5affa 100644
--- a/packages/twenty-front/src/modules/object-record/utils/canCreateRecordsForObjectMetadataItem.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/canCreateRecordsForObjectMetadataItem.ts
@@ -1,9 +1,9 @@
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { isObjectMetadataReadOnly } from '@/object-record/read-only/utils/isObjectMetadataReadOnly';
-import { type ObjectPermission } from '~/generated-metadata/graphql';
+import { type ObjectPermissions } from 'twenty-shared/types';
type CanCreateRecordsForObjectMetadataItemParams = {
- objectPermissions?: ObjectPermission;
+ objectPermissions?: Pick<ObjectPermissions, 'canUpdateObjectRecords'>;
objectMetadataItem: Pick<
EnrichedObjectMetadataItem,
'isUICreatable' | 'isUIEditable' | 'isRemote' | 'writability'
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/checkFieldPermissions.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/checkFieldPermissions.test.ts
deleted file mode 100644
index 2d74b69de1e..00000000000
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/checkFieldPermissions.test.ts
+++ /dev/null
@@ -1,162 +0,0 @@
-import { checkFieldPermissions } from '@/page-layout/utils/checkFieldPermissions';
-import { type ObjectPermissions } from 'twenty-shared/types';
-
-describe('checkFieldPermissions', () => {
- const mockObjectPermissions: ObjectPermissions = {
- canReadObjectRecords: true,
- canUpdateObjectRecords: true,
- canSoftDeleteObjectRecords: true,
- canDestroyObjectRecords: true,
- restrictedFields: {},
- rowLevelPermissionPredicates: [],
- rowLevelPermissionPredicateGroups: [],
- };
-
- it('should return true when no fields are restricted', () => {
- const fieldIds = ['field-1', 'field-2', 'field-3'];
- const permissions = {
- ...mockObjectPermissions,
- restrictedFields: {},
- };
-
- expect(checkFieldPermissions(fieldIds, permissions)).toBe(true);
- });
-
- it('should return true when field is not in restrictedFields map', () => {
- const fieldIds = ['field-1', 'field-2'];
- const permissions = {
- ...mockObjectPermissions,
- restrictedFields: {
- 'field-3': { canRead: false },
- },
- };
-
- expect(checkFieldPermissions(fieldIds, permissions)).toBe(true);
- });
-
- it('should return false when any field has canRead set to false', () => {
- const fieldIds = ['field-1', 'field-2', 'field-3'];
- const permissions = {
- ...mockObjectPermissions,
- restrictedFields: {
- 'field-2': { canRead: false },
- },
- };
-
- expect(checkFieldPermissions(fieldIds, permissions)).toBe(false);
- });
-
- it('should return false when multiple fields are restricted', () => {
- const fieldIds = ['field-1', 'field-2', 'field-3'];
- const permissions = {
- ...mockObjectPermissions,
- restrictedFields: {
- 'field-1': { canRead: false },
- 'field-2': { canRead: false },
- },
- };
-
- expect(checkFieldPermissions(fieldIds, permissions)).toBe(false);
- });
-
- it('should return true when field has canRead set to true', () => {
- const fieldIds = ['field-1', 'field-2'];
- const permissions = {
- ...mockObjectPermissions,
- restrictedFields: {
- 'field-1': { canRead: true },
- 'field-2': { canRead: true },
- },
- };
-
- expect(checkFieldPermissions(fieldIds, permissions)).toBe(true);
- });
-
- it('should return true when field has canRead set to null', () => {
- const fieldIds = ['field-1'];
- const permissions = {
- ...mockObjectPermissions,
- restrictedFields: {
- 'field-1': { canRead: null },
- },
- };
-
- expect(checkFieldPermissions(fieldIds, permissions)).toBe(true);
- });
-
- it('should return true when field has canRead set to undefined', () => {
- const fieldIds = ['field-1'];
- const permissions = {
- ...mockObjectPermissions,
- restrictedFields: {
- 'field-1': { canRead: undefined },
- },
- };
-
- expect(checkFieldPermissions(fieldIds, permissions)).toBe(true);
- });
-
- it('should return true for empty field list', () => {
- const fieldIds: string[] = [];
- const permissions = {
- ...mockObjectPermissions,
- restrictedFields: {
- 'field-1': { canRead: false },
- },
- };
-
- expect(checkFieldPermissions(fieldIds, permissions)).toBe(true);
- });
-
- it('should handle mixed permissions correctly', () => {
- const fieldIds = ['field-1', 'field-2', 'field-3', 'field-4'];
- const permissions = {
- ...mockObjectPermissions,
- restrictedFields: {
- 'field-1': { canRead: true },
- 'field-2': { canRead: null },
- 'field-3': { canRead: undefined },
- },
- };
-
- expect(checkFieldPermissions(fieldIds, permissions)).toBe(true);
- });
-
- it('should fail fast and return false on first restricted field', () => {
- const fieldIds = ['field-1', 'field-2', 'field-3'];
- const permissions = {
- ...mockObjectPermissions,
- restrictedFields: {
- 'field-1': { canRead: false },
- 'field-2': { canRead: false },
- 'field-3': { canRead: false },
- },
- };
-
- expect(checkFieldPermissions(fieldIds, permissions)).toBe(false);
- });
-
- it('should only check canRead, not canUpdate', () => {
- const fieldIds = ['field-1'];
- const permissions = {
- ...mockObjectPermissions,
- restrictedFields: {
- 'field-1': { canRead: true, canUpdate: false },
- },
- };
-
- expect(checkFieldPermissions(fieldIds, permissions)).toBe(true);
- });
-
- it('should handle field with only canUpdate restriction', () => {
- const fieldIds = ['field-1'];
- const permissions = {
- ...mockObjectPermissions,
- restrictedFields: {
- 'field-1': { canUpdate: false },
- },
- };
-
- expect(checkFieldPermissions(fieldIds, permissions)).toBe(true);
- });
-});
diff --git a/packages/twenty-front/src/modules/page-layout/utils/checkFieldPermissions.ts b/packages/twenty-front/src/modules/page-layout/utils/checkFieldPermissions.ts
deleted file mode 100644
index 6d55d9df416..00000000000
--- a/packages/twenty-front/src/modules/page-layout/utils/checkFieldPermissions.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { type ObjectPermissions } from 'twenty-shared/types';
-import { isDefined } from 'twenty-shared/utils';
-
-export const checkFieldPermissions = (
- fieldMetadataIds: string[],
- objectPermissions: ObjectPermissions,
-): boolean => {
- const { restrictedFields } = objectPermissions;
-
- const hasInaccessibleField = fieldMetadataIds.some((fieldId) => {
- const fieldPermission = restrictedFields[fieldId];
-
- if (!isDefined(fieldPermission)) {
- return false;
- }
-
- return fieldPermission.canRead === false;
- });
-
- return !hasInaccessibleField;
-};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/call-recording/hooks/useCallRecordingWidgetRestriction.ts b/packages/twenty-front/src/modules/page-layout/widgets/call-recording/hooks/useCallRecordingWidgetRestriction.ts
index a6ea8cb33ad..29d9cba7539 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/call-recording/hooks/useCallRecordingWidgetRestriction.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/call-recording/hooks/useCallRecordingWidgetRestriction.ts
@@ -1,4 +1,5 @@
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { getFieldPermissions } from '@/object-metadata/utils/getFieldPermissions';
import { useObjectPermissionsForObject } from '@/object-record/hooks/useObjectPermissionsForObject';
import { type WidgetAccessDenialInfo } from '@/page-layout/widgets/types/WidgetAccessDenialInfo';
import { isNonEmptyString } from '@sniptt/guards';
@@ -23,8 +24,10 @@ export const useCallRecordingWidgetRestriction = ({
);
const isFieldMetadataItemRestricted = (fieldMetadataItem: { id: string }) =>
- callRecordingObjectPermissions.restrictedFields[fieldMetadataItem.id]
- ?.canRead === false;
+ !getFieldPermissions({
+ objectPermissions: callRecordingObjectPermissions,
+ fieldMetadataId: fieldMetadataItem.id,
+ }).canReadField;
const isFieldRestricted = (fieldName: string) => {
const fieldMetadataItem = callRecordingObjectMetadataItem.fields.find(
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 df524630263..eb502fc48c2 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
@@ -17,7 +17,6 @@ import { FieldWidgetEditAction } from '@/page-layout/widgets/field/components/Fi
import { FieldWidgetRelationEditAction } from '@/page-layout/widgets/field/components/FieldWidgetRelationEditAction';
import { useFieldWidgetFieldDefinition } from '@/page-layout/widgets/field/hooks/useFieldWidgetFieldDefinition';
import { generateFieldWidgetInstanceId } from '@/page-layout/widgets/field/utils/generateFieldWidgetInstanceId';
-import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';
import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';
import { useWorkspaceSurface } from '@/ui/layout/hooks/useWorkspaceSurface';
import { assertIsDefinedOrThrow } from 'twenty-shared/utils';
@@ -89,10 +88,7 @@ export const WidgetActionFieldEdit = ({
isDisplayModeFixHeight: false,
isRecordFieldReadOnly: isRecordFieldReadOnly({
isRecordReadOnly,
- objectPermissions: getObjectPermissionsForObject(
- objectPermissionsByObjectMetadataId,
- objectMetadataItem.id,
- ),
+ objectMetadataId: objectMetadataItem.id,
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 c2884e88560..6af6322d269 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
@@ -14,7 +14,6 @@ import { FieldWidgetInlineCell } from '@/page-layout/widgets/field/components/Fi
import { fieldWidgetHoverComponentState } from '@/page-layout/widgets/field/states/fieldWidgetHoverComponentState';
import { generateFieldWidgetInstanceId } from '@/page-layout/widgets/field/utils/generateFieldWidgetInstanceId';
import { useCurrentWidget } from '@/page-layout/widgets/hooks/useCurrentWidget';
-import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';
import { SidePanelProvider } from '@/ui/layout/side-panel/contexts/SidePanelContext';
import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';
import { styled } from '@linaria/react';
@@ -87,10 +86,7 @@ export const FieldWidgetDisplay = ({
isDisplayModeFixHeight: false,
isRecordFieldReadOnly: isRecordFieldReadOnly({
isRecordReadOnly,
- objectPermissions: getObjectPermissionsForObject(
- objectPermissionsByObjectMetadataId,
- objectMetadataItem.id,
- ),
+ objectMetadataId: objectMetadataItem.id,
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 a80a9a3e605..95a99245243 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
@@ -9,7 +9,6 @@ import { useIsPageLayoutInEditMode } from '@/page-layout/hooks/useIsPageLayoutIn
import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';
import { useFieldWidgetFieldDefinition } from '@/page-layout/widgets/field/hooks/useFieldWidgetFieldDefinition';
import { isFieldWidget } from '@/page-layout/widgets/field/utils/isFieldWidget';
-import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';
import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';
import { isDefined } from 'twenty-shared/utils';
import { RelationType } from '~/generated-metadata/graphql';
@@ -72,10 +71,7 @@ export const useFieldWidgetActionVisibility = ({
const isFieldReadOnly = isRecordFieldReadOnly({
isRecordReadOnly,
- objectPermissions: getObjectPermissionsForObject(
- objectPermissionsByObjectMetadataId,
- objectMetadataItem.id,
- ),
+ objectMetadataId: objectMetadataItem.id,
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 c4e182cfca9..5aeaffaf22c 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
@@ -10,7 +10,6 @@ import { RecordFieldComponentInstanceContext } from '@/object-record/record-fiel
import { isJunctionRelationForbidden } from '@/object-record/record-field/ui/utils/junction/isJunctionRelationForbidden';
import { RecordInlineCell } from '@/object-record/record-inline-cell/components/RecordInlineCell';
import { getRecordFieldInputInstanceId } from '@/object-record/utils/getRecordFieldInputId';
-import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';
import { type ObjectPermissions } from 'twenty-shared/types';
type FieldsWidgetFieldItemProps = {
@@ -63,10 +62,7 @@ export const FieldsWidgetFieldItem = ({
isDisplayModeFixHeight: true,
isRecordFieldReadOnly: isRecordFieldReadOnly({
isRecordReadOnly,
- objectPermissions: getObjectPermissionsForObject(
- objectPermissionsByObjectMetadataId,
- objectMetadataItem.id,
- ),
+ objectMetadataId: objectMetadataItem.id,
fieldMetadataItem,
fieldDefinition,
objectPermissionsByObjectMetadataId,
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/hooks/useWidgetPermissions.ts b/packages/twenty-front/src/modules/page-layout/widgets/hooks/useWidgetPermissions.ts
index 646a77563d4..e11112b7b2d 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/hooks/useWidgetPermissions.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/hooks/useWidgetPermissions.ts
@@ -1,8 +1,8 @@
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
+import { getFieldPermissions } from '@/object-metadata/utils/getFieldPermissions';
import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';
import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';
-import { checkFieldPermissions } from '@/page-layout/utils/checkFieldPermissions';
import { extractFieldMetadataIdsFromWidget } from '@/page-layout/utils/extractFieldMetadataIdsFromWidget';
import { type WidgetAccessDenialInfo } from '@/page-layout/widgets/types/WidgetAccessDenialInfo';
import { isDefined } from 'twenty-shared/utils';
@@ -48,23 +48,22 @@ export const useWidgetPermissions = (
};
}
- const fieldMetadataIds = extractFieldMetadataIdsFromWidget(widget);
- const allFieldsAccessible = checkFieldPermissions(
- fieldMetadataIds,
- objectPermissions,
+ const nonReadableFieldMetadataIds = extractFieldMetadataIdsFromWidget(
+ widget,
+ ).filter(
+ (fieldMetadataId) =>
+ !getFieldPermissions({ objectPermissions, fieldMetadataId }).canReadField,
);
- if (!allFieldsAccessible) {
- const restrictedFieldNames = fieldMetadataIds
- .filter((fieldId) => {
- const fieldPermission = objectPermissions.restrictedFields[fieldId];
- return isDefined(fieldPermission) && fieldPermission.canRead === false;
- })
- .map((fieldId) => {
- const field = objectMetadata?.fields?.find((f) => f.id === fieldId);
- return field?.label || field?.name || 'Unknown';
- })
- .filter(isDefined);
+ if (nonReadableFieldMetadataIds.length > 0) {
+ const restrictedFieldNames = nonReadableFieldMetadataIds.map(
+ (fieldMetadataId) => {
+ const fieldMetadataItem = objectMetadata?.fields?.find(
+ (field) => field.id === fieldMetadataId,
+ );
+ return fieldMetadataItem?.label || fieldMetadataItem?.name || 'Unknown';
+ },
+ );
return {
hasAccess: false,
diff --git a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingCreditsSection.tsx b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingCreditsSection.tsx
index 8c1d361e582..9f757f12f66 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingCreditsSection.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingCreditsSection.tsx
@@ -13,7 +13,7 @@ import { useCurrentBillingFlags } from '@/settings/billing/hooks/useCurrentBilli
import { useCurrentResourceCredit } from '@/settings/billing/hooks/useCurrentResourceCredit';
import { useGetResourceCreditUsage } from '@/settings/billing/hooks/useGetResourceCreditUsage';
import { useSplitPhaseItemsInPrices } from '@/settings/billing/hooks/useSplitPhaseItemsInPrices';
-import { usePermissionFlagMap } from '@/settings/roles/hooks/usePermissionFlagMap';
+import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
import { getDocumentationUrl } from '@/support/utils/getDocumentationUrl';
import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
import { isSubscriptionPaymentOverdue } from '@/settings/billing/utils/isSubscriptionPaymentOverdue';
@@ -155,8 +155,9 @@ export const SettingsBillingCreditsSection = ({
const isTrialing = subscriptionStatus === SubscriptionStatus.Trialing;
const shouldUpdatePayment = isSubscriptionPaymentOverdue(subscriptionStatus);
- const { [PermissionFlagType.WORKSPACE]: hasPermissionToEndTrialPeriod } =
- usePermissionFlagMap();
+ const hasPermissionToEndTrialPeriod = useHasPermissionFlag(
+ PermissionFlagType.WORKSPACE,
+ );
const { getResourceCreditUsage } = useGetResourceCreditUsage();
diff --git a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingSubscriptionInfo.tsx b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingSubscriptionInfo.tsx
index ccd3b2d1d94..47464563fd2 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingSubscriptionInfo.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingSubscriptionInfo.tsx
@@ -21,7 +21,7 @@ import { useNextPlan } from '@/settings/billing/hooks/useNextPlan';
import { useSplitPhaseItemsInPrices } from '@/settings/billing/hooks/useSplitPhaseItemsInPrices';
import { billingHasPaymentMethodSelector } from '@/settings/billing/states/billingHasPaymentMethodSelector';
import { isSubscriptionPaymentOverdue } from '@/settings/billing/utils/isSubscriptionPaymentOverdue';
-import { usePermissionFlagMap } from '@/settings/roles/hooks/usePermissionFlagMap';
+import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useSubscriptionStatus } from '@/workspace/hooks/useSubscriptionStatus';
@@ -136,8 +136,9 @@ export const SettingsBillingSubscriptionInfo = ({
await endTrialPeriod({ skipPaymentMethodRedirect: true });
};
- const { [PermissionFlagType.WORKSPACE]: hasPermissionToEndTrialPeriod } =
- usePermissionFlagMap();
+ const hasPermissionToEndTrialPeriod = useHasPermissionFlag(
+ PermissionFlagType.WORKSPACE,
+ );
const {
seats,
diff --git a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingTrialNoPaymentMethodBanner.tsx b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingTrialNoPaymentMethodBanner.tsx
index ea6ae2f7475..8cc981ed335 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingTrialNoPaymentMethodBanner.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingTrialNoPaymentMethodBanner.tsx
@@ -2,7 +2,7 @@ import { ToastOnQueryErrorEffect } from '@/apollo/components/ToastOnQueryErrorEf
import { type CurrentWorkspace } from '@/auth/states/currentWorkspaceState';
import { useRedirect } from '@/domain-manager/hooks/useRedirect';
import { getSubscriptionPlanKey } from '@/settings/billing/utils/getSubscriptionPlanKey';
-import { usePermissionFlagMap } from '@/settings/roles/hooks/usePermissionFlagMap';
+import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
import { useQuery } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
import { SettingsPath } from 'twenty-shared/types';
@@ -26,8 +26,9 @@ export const SettingsBillingTrialNoPaymentMethodBanner = ({
}: SettingsBillingTrialNoPaymentMethodBannerProps) => {
const { redirect } = useRedirect();
- const { [PermissionFlagType.BILLING]: hasPermissionToManageBilling } =
- usePermissionFlagMap();
+ const hasPermissionToManageBilling = useHasPermissionFlag(
+ PermissionFlagType.BILLING,
+ );
const { data, error } = useQuery(BillingPortalSessionDocument, {
variables: {
diff --git a/packages/twenty-front/src/modules/settings/billing/hooks/useBillingPlanActions.ts b/packages/twenty-front/src/modules/settings/billing/hooks/useBillingPlanActions.ts
index 7892a36d7a1..d5f63647967 100644
--- a/packages/twenty-front/src/modules/settings/billing/hooks/useBillingPlanActions.ts
+++ b/packages/twenty-front/src/modules/settings/billing/hooks/useBillingPlanActions.ts
@@ -8,7 +8,7 @@ import { type SettingsBillingPlanInterval } from '@/settings/billing/types/Setti
import { getBillingPlanCell } from '@/settings/billing/utils/getBillingPlanCell';
import { isBillingSubscriptionChangeUpgrade } from '@/settings/billing/utils/isBillingSubscriptionChangeUpgrade';
import { isSubscriptionPaymentOverdue } from '@/settings/billing/utils/isSubscriptionPaymentOverdue';
-import { usePermissionFlagMap } from '@/settings/roles/hooks/usePermissionFlagMap';
+import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useSubscriptionStatus } from '@/workspace/hooks/useSubscriptionStatus';
import { useLingui } from '@lingui/react/macro';
@@ -51,7 +51,9 @@ export const useBillingPlanActions = ({
const subscriptionStatus = useSubscriptionStatus();
const { nextPlan } = useNextPlan();
const { nextInterval } = useNextInterval();
- const permissionMap = usePermissionFlagMap();
+ const hasPermissionToManageBilling = useHasPermissionFlag(
+ PermissionFlagType.BILLING,
+ );
const { isBillingPortalSessionDisabled, openBillingPortal } =
useBillingPortalSession(getSettingsPath(SettingsPath.BillingPlans));
@@ -59,8 +61,6 @@ export const useBillingPlanActions = ({
const currentBillingSubscription =
currentWorkspace?.currentBillingSubscription;
const currentInterval = currentBillingSubscription?.interval;
- const hasPermissionToManageBilling =
- permissionMap[PermissionFlagType.BILLING] ?? false;
const shouldUpdatePayment = isSubscriptionPaymentOverdue(subscriptionStatus);
const isSubscriptionCanceled =
diff --git a/packages/twenty-front/src/modules/settings/billing/hooks/useManageUsageLimitsButton.ts b/packages/twenty-front/src/modules/settings/billing/hooks/useManageUsageLimitsButton.ts
index 3d54b3ac313..723f1b260e0 100644
--- a/packages/twenty-front/src/modules/settings/billing/hooks/useManageUsageLimitsButton.ts
+++ b/packages/twenty-front/src/modules/settings/billing/hooks/useManageUsageLimitsButton.ts
@@ -4,7 +4,7 @@ import { SettingsPath } from 'twenty-shared/types';
import { type InlineBanner } from 'twenty-ui/components';
import { IconSettings } from 'twenty-ui/icon';
-import { usePermissionFlagMap } from '@/settings/roles/hooks/usePermissionFlagMap';
+import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
import { PermissionFlagType } from '~/generated-metadata/graphql';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
@@ -13,8 +13,9 @@ export const useManageUsageLimitsButton = (): ComponentProps<
>['button'] => {
const { t } = useLingui();
- const { [PermissionFlagType.WORKSPACE]: hasPermissionToManageUsageLimits } =
- usePermissionFlagMap();
+ const hasPermissionToManageUsageLimits = useHasPermissionFlag(
+ PermissionFlagType.WORKSPACE,
+ );
const navigateSettings = useNavigateSettings();
diff --git a/packages/twenty-front/src/modules/settings/billing/hooks/usePaymentMethodFlow.ts b/packages/twenty-front/src/modules/settings/billing/hooks/usePaymentMethodFlow.ts
index a9df58e67be..a4ca00410a5 100644
--- a/packages/twenty-front/src/modules/settings/billing/hooks/usePaymentMethodFlow.ts
+++ b/packages/twenty-front/src/modules/settings/billing/hooks/usePaymentMethodFlow.ts
@@ -1,6 +1,6 @@
import { useBillingPortalSession } from '@/settings/billing/hooks/useBillingPortalSession';
import { billingHasPaymentMethodSelector } from '@/settings/billing/states/billingHasPaymentMethodSelector';
-import { usePermissionFlagMap } from '@/settings/roles/hooks/usePermissionFlagMap';
+import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { SettingsPath } from 'twenty-shared/types';
@@ -14,8 +14,9 @@ export const usePaymentMethodFlow = (modalInstanceId: string) => {
billingHasPaymentMethodSelector,
);
- const { [PermissionFlagType.BILLING]: hasPermissionToManageBilling } =
- usePermissionFlagMap();
+ const hasPermissionToManageBilling = useHasPermissionFlag(
+ PermissionFlagType.BILLING,
+ );
const { isBillingPortalSessionDisabled, openBillingPortal } =
useBillingPortalSession(getSettingsPath(SettingsPath.Billing));
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsProtectedRouteWrapper.tsx b/packages/twenty-front/src/modules/settings/components/SettingsProtectedRouteWrapper.tsx
index 7968a917413..5e40901139a 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsProtectedRouteWrapper.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsProtectedRouteWrapper.tsx
@@ -15,7 +15,7 @@ import {
type SettingsProtectedRouteWrapperProps = {
children?: ReactNode;
- settingsPermission?: PermissionFlagType;
+ settingsPermission: PermissionFlagType;
requiredFeatureFlag?: FeatureFlagKey;
};
diff --git a/packages/twenty-front/src/modules/settings/hooks/__tests__/useSettingsNavigationItems.test.tsx b/packages/twenty-front/src/modules/settings/hooks/__tests__/useSettingsNavigationItems.test.tsx
index 8f77bbdbacf..8336d478ae3 100644
--- a/packages/twenty-front/src/modules/settings/hooks/__tests__/useSettingsNavigationItems.test.tsx
+++ b/packages/twenty-front/src/modules/settings/hooks/__tests__/useSettingsNavigationItems.test.tsx
@@ -11,8 +11,8 @@ import {
} from '~/generated-metadata/graphql';
import { currentUserState } from '@/auth/states/currentUserState';
+import { currentUserWorkspaceState } from '@/auth/states/currentUserWorkspaceState';
import { billingState } from '@/client-config/states/billingState';
-import { usePermissionFlagMap } from '@/settings/roles/hooks/usePermissionFlagMap';
import {
jotaiStore,
resetJotaiStore,
@@ -61,16 +61,21 @@ const Wrapper = ({ children }: { children: ReactNode }) => (
</MockedProvider>
);
-jest.mock('@/settings/roles/hooks/usePermissionFlagMap', () => ({
- usePermissionFlagMap: jest.fn(),
-}));
-
jest.mock('@/domain-manager/hooks/useRedirectToWorkspaceDomain', () => ({
useRedirectToWorkspaceDomain: jest.fn().mockImplementation(() => ({
redirectToWorkspaceDomain: jest.fn(),
})),
}));
+const setPermissionFlags = (permissionFlags: PermissionFlagType[]) => {
+ jotaiStore.set(currentUserWorkspaceState.atom, {
+ permissionFlags,
+ twoFactorAuthenticationMethodSummary: [],
+ objectsPermissions: [],
+ isImpersonating: false,
+ });
+};
+
describe('useSettingsNavigationItems', () => {
beforeEach(() => {
resetJotaiStore();
@@ -79,15 +84,7 @@ describe('useSettingsNavigationItems', () => {
});
it('should hide workspace settings when no permissions', () => {
- (usePermissionFlagMap as jest.Mock).mockImplementation(() => ({
- [PermissionFlagType.WORKSPACE]: false,
- [PermissionFlagType.WORKSPACE_MEMBERS]: false,
- [PermissionFlagType.DATA_MODEL]: false,
- [PermissionFlagType.API_KEYS_AND_WEBHOOKS]: false,
- [PermissionFlagType.ROLES]: false,
- [PermissionFlagType.SECURITY]: false,
- [PermissionFlagType.CONNECTED_ACCOUNTS]: false,
- }));
+ setPermissionFlags([]);
const { result } = renderHook(() => useSettingsNavigationItems(), {
wrapper: Wrapper,
@@ -101,15 +98,15 @@ describe('useSettingsNavigationItems', () => {
});
it('should show workspace settings when has permissions', () => {
- (usePermissionFlagMap as jest.Mock).mockImplementation(() => ({
- [PermissionFlagType.WORKSPACE]: true,
- [PermissionFlagType.WORKSPACE_MEMBERS]: true,
- [PermissionFlagType.DATA_MODEL]: true,
- [PermissionFlagType.API_KEYS_AND_WEBHOOKS]: true,
- [PermissionFlagType.ROLES]: true,
- [PermissionFlagType.SECURITY]: true,
- [PermissionFlagType.CONNECTED_ACCOUNTS]: true,
- }));
+ setPermissionFlags([
+ PermissionFlagType.WORKSPACE,
+ PermissionFlagType.WORKSPACE_MEMBERS,
+ PermissionFlagType.DATA_MODEL,
+ PermissionFlagType.API_KEYS_AND_WEBHOOKS,
+ PermissionFlagType.ROLES,
+ PermissionFlagType.SECURITY,
+ PermissionFlagType.CONNECTED_ACCOUNTS,
+ ]);
const { result } = renderHook(() => useSettingsNavigationItems(), {
wrapper: Wrapper,
@@ -123,15 +120,15 @@ describe('useSettingsNavigationItems', () => {
});
it('should hide billing navigation when billing is disabled', () => {
- (usePermissionFlagMap as jest.Mock).mockImplementation(() => ({
- [PermissionFlagType.WORKSPACE]: true,
- [PermissionFlagType.WORKSPACE_MEMBERS]: true,
- [PermissionFlagType.DATA_MODEL]: true,
- [PermissionFlagType.API_KEYS_AND_WEBHOOKS]: true,
- [PermissionFlagType.ROLES]: true,
- [PermissionFlagType.SECURITY]: true,
- [PermissionFlagType.CONNECTED_ACCOUNTS]: true,
- }));
+ setPermissionFlags([
+ PermissionFlagType.WORKSPACE,
+ PermissionFlagType.WORKSPACE_MEMBERS,
+ PermissionFlagType.DATA_MODEL,
+ PermissionFlagType.API_KEYS_AND_WEBHOOKS,
+ PermissionFlagType.ROLES,
+ PermissionFlagType.SECURITY,
+ PermissionFlagType.CONNECTED_ACCOUNTS,
+ ]);
const { result } = renderHook(() => useSettingsNavigationItems(), {
wrapper: Wrapper,
@@ -151,15 +148,15 @@ describe('useSettingsNavigationItems', () => {
it('should hide billing navigation until billing config is loaded', () => {
jotaiStore.set(billingState.atom, null);
- (usePermissionFlagMap as jest.Mock).mockImplementation(() => ({
- [PermissionFlagType.WORKSPACE]: true,
- [PermissionFlagType.WORKSPACE_MEMBERS]: true,
- [PermissionFlagType.DATA_MODEL]: true,
- [PermissionFlagType.API_KEYS_AND_WEBHOOKS]: true,
- [PermissionFlagType.ROLES]: true,
- [PermissionFlagType.SECURITY]: true,
- [PermissionFlagType.CONNECTED_ACCOUNTS]: true,
- }));
+ setPermissionFlags([
+ PermissionFlagType.WORKSPACE,
+ PermissionFlagType.WORKSPACE_MEMBERS,
+ PermissionFlagType.DATA_MODEL,
+ PermissionFlagType.API_KEYS_AND_WEBHOOKS,
+ PermissionFlagType.ROLES,
+ PermissionFlagType.SECURITY,
+ PermissionFlagType.CONNECTED_ACCOUNTS,
+ ]);
const { result } = renderHook(() => useSettingsNavigationItems(), {
wrapper: Wrapper,
@@ -176,15 +173,7 @@ describe('useSettingsNavigationItems', () => {
});
it('should show user section items regardless of permissions', () => {
- (usePermissionFlagMap as jest.Mock).mockImplementation(() => ({
- [PermissionFlagType.WORKSPACE]: false,
- [PermissionFlagType.WORKSPACE_MEMBERS]: false,
- [PermissionFlagType.DATA_MODEL]: false,
- [PermissionFlagType.API_KEYS_AND_WEBHOOKS]: false,
- [PermissionFlagType.ROLES]: false,
- [PermissionFlagType.SECURITY]: false,
- [PermissionFlagType.CONNECTED_ACCOUNTS]: false,
- }));
+ setPermissionFlags([]);
const { result } = renderHook(() => useSettingsNavigationItems(), {
wrapper: Wrapper,
diff --git a/packages/twenty-front/src/modules/settings/hooks/useSettingsNavigationItems.tsx b/packages/twenty-front/src/modules/settings/hooks/useSettingsNavigationItems.tsx
index 928f7c37b78..590c61b2079 100644
--- a/packages/twenty-front/src/modules/settings/hooks/useSettingsNavigationItems.tsx
+++ b/packages/twenty-front/src/modules/settings/hooks/useSettingsNavigationItems.tsx
@@ -5,7 +5,7 @@ import { currentUserState } from '@/auth/states/currentUserState';
import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
import { billingState } from '@/client-config/states/billingState';
import { supportChatState } from '@/client-config/states/supportChatState';
-import { usePermissionFlagMap } from '@/settings/roles/hooks/usePermissionFlagMap';
+import { permissionFlagMapSelector } from '@/settings/roles/states/permissionFlagMapSelector';
import { getDocumentationUrl } from '@/support/utils/getDocumentationUrl';
import { type NavigationDrawerItemModifier } from '@/ui/navigation/navigation-drawer/types/NavigationDrawerItemModifier';
import { type NavigationDrawerItemIndentationLevel } from '@/ui/navigation/navigation-drawer/types/NavigationDrawerItemIndentationLevel';
@@ -69,7 +69,8 @@ const useSettingsNavigationItems = (): SettingsNavigationSection[] => {
supportChat?.supportDriver === 'FRONT' &&
isNonEmptyString(supportChat.supportFrontChatId);
- const permissionMap = usePermissionFlagMap();
+ const permissionFlagMap = useAtomStateValue(permissionFlagMapSelector);
+
return [
{
label: t`User`,
@@ -88,20 +89,22 @@ const useSettingsNavigationItems = (): SettingsNavigationSection[] => {
label: t`Accounts`,
path: SettingsPath.Accounts,
Icon: IconAt,
- isHidden: !permissionMap[PermissionFlagType.CONNECTED_ACCOUNTS],
+ isHidden: !permissionFlagMap[PermissionFlagType.CONNECTED_ACCOUNTS],
subItems: [
{
label: t`Emails`,
path: SettingsPath.AccountsEmails,
Icon: IconMail,
- isHidden: !permissionMap[PermissionFlagType.CONNECTED_ACCOUNTS],
+ isHidden:
+ !permissionFlagMap[PermissionFlagType.CONNECTED_ACCOUNTS],
indentationLevel: 2,
},
{
label: t`Calendars`,
path: SettingsPath.AccountsCalendars,
Icon: IconCalendarEvent,
- isHidden: !permissionMap[PermissionFlagType.CONNECTED_ACCOUNTS],
+ isHidden:
+ !permissionFlagMap[PermissionFlagType.CONNECTED_ACCOUNTS],
indentationLevel: 2,
},
],
@@ -115,63 +118,65 @@ const useSettingsNavigationItems = (): SettingsNavigationSection[] => {
label: t`General`,
path: SettingsPath.General,
Icon: IconSettings2,
- isHidden: !permissionMap[PermissionFlagType.WORKSPACE],
+ isHidden: !permissionFlagMap[PermissionFlagType.WORKSPACE],
},
{
label: t`Data model`,
path: SettingsPath.Objects,
Icon: IconHierarchy,
- isHidden: !permissionMap[PermissionFlagType.DATA_MODEL],
+ isHidden: !permissionFlagMap[PermissionFlagType.DATA_MODEL],
},
{
label: t`Layout`,
path: SettingsPath.Layout,
Icon: IconAppWindow,
- isHidden: !permissionMap[PermissionFlagType.LAYOUTS],
+ isHidden: !permissionFlagMap[PermissionFlagType.LAYOUTS],
},
{
label: t`Members`,
path: SettingsPath.WorkspaceMembersPage,
Icon: IconUsers,
- isHidden: !permissionMap[PermissionFlagType.WORKSPACE_MEMBERS],
+ isHidden: !permissionFlagMap[PermissionFlagType.WORKSPACE_MEMBERS],
},
{
label: t`Billing`,
path: SettingsPath.Billing,
Icon: IconCreditCard,
isHidden:
- !isBillingEnabled || !permissionMap[PermissionFlagType.WORKSPACE],
+ !isBillingEnabled ||
+ !permissionFlagMap[PermissionFlagType.WORKSPACE],
},
{
label: t`MCP & APIs`,
path: SettingsPath.ApiWebhooks,
Icon: IconPlug,
- isHidden: !permissionMap[PermissionFlagType.API_KEYS_AND_WEBHOOKS],
+ isHidden:
+ !permissionFlagMap[PermissionFlagType.API_KEYS_AND_WEBHOOKS],
},
// TODO: Re-enable when integrations page is ready
// {
// label: t`Integrations`,
// path: SettingsPath.Integrations,
// Icon: IconApps,
- // isHidden: !permissionMap[PermissionFlagType.API_KEYS_AND_WEBHOOKS],
+ // isHidden: !permissionFlagMap[PermissionFlagType.API_KEYS_AND_WEBHOOKS],
// },
{
label: t`Apps`,
path: SettingsPath.Applications,
Icon: IconApps,
- isHidden: !permissionMap[PermissionFlagType.APPLICATIONS],
+ isHidden: !permissionFlagMap[PermissionFlagType.APPLICATIONS],
},
{
label: t`AI`,
path: SettingsPath.AI,
Icon: IconSparkles,
- isHidden: !permissionMap[PermissionFlagType.AI_SETTINGS],
+ isHidden: !permissionFlagMap[PermissionFlagType.AI_SETTINGS],
},
{
label: t`Communication`,
path: SettingsPath.WorkspaceCommunications,
Icon: IconMessageCircle,
- isHidden: !permissionMap[PermissionFlagType.WORKSPACE],
+ isHidden: !permissionFlagMap[PermissionFlagType.WORKSPACE],
},
],
},
@@ -188,7 +193,7 @@ const useSettingsNavigationItems = (): SettingsNavigationSection[] => {
label: t`Community`,
path: SettingsPath.Community,
Icon: IconUsers,
- isHidden: !permissionMap[PermissionFlagType.WORKSPACE],
+ isHidden: !permissionFlagMap[PermissionFlagType.WORKSPACE],
},
{
label: t`Support`,
diff --git a/packages/twenty-front/src/modules/settings/profile/hooks/useCanChangePassword.ts b/packages/twenty-front/src/modules/settings/profile/hooks/useCanChangePassword.ts
index d980edcdd7a..fe4210a3520 100644
--- a/packages/twenty-front/src/modules/settings/profile/hooks/useCanChangePassword.ts
+++ b/packages/twenty-front/src/modules/settings/profile/hooks/useCanChangePassword.ts
@@ -1,11 +1,13 @@
-import { currentUserWorkspaceState } from '@/auth/states/currentUserWorkspaceState';
import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
+import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
import { PermissionFlagType } from '~/generated-metadata/graphql';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
export const useCanChangePassword = () => {
const currentWorkspace = useAtomStateValue(currentWorkspaceState);
- const currentUserWorkspace = useAtomStateValue(currentUserWorkspaceState);
+ const hasBypassPermission = useHasPermissionFlag(
+ PermissionFlagType.SSO_BYPASS,
+ );
const isPasswordAuthEnabled =
currentWorkspace?.isPasswordAuthEnabled === true;
@@ -14,10 +16,6 @@ export const useCanChangePassword = () => {
return { canChangePassword: true };
}
- const hasBypassPermission = currentUserWorkspace?.permissionFlags?.includes(
- PermissionFlagType.SSO_BYPASS,
- );
-
if (!hasBypassPermission) {
return { canChangePassword: false };
}
diff --git a/packages/twenty-front/src/modules/settings/profile/hooks/useCanEditProfileField.ts b/packages/twenty-front/src/modules/settings/profile/hooks/useCanEditProfileField.ts
index 91da1fe02e3..c926fc5356d 100644
--- a/packages/twenty-front/src/modules/settings/profile/hooks/useCanEditProfileField.ts
+++ b/packages/twenty-front/src/modules/settings/profile/hooks/useCanEditProfileField.ts
@@ -2,6 +2,7 @@ import { availableWorkspacesState } from '@/auth/states/availableWorkspacesState
import { currentUserWorkspaceState } from '@/auth/states/currentUserWorkspaceState';
import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
import { countAvailableWorkspaces } from '@/auth/utils/availableWorkspacesUtils';
+import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { PermissionFlagType } from '~/generated-metadata/graphql';
@@ -15,6 +16,9 @@ export const useCanEditProfileField = (field: EditableProfileField) => {
const currentWorkspace = useAtomStateValue(currentWorkspaceState);
const currentUserWorkspace = useAtomStateValue(currentUserWorkspaceState);
const availableWorkspaces = useAtomStateValue(availableWorkspacesState);
+ const hasProfilePermission = useHasPermissionFlag(
+ PermissionFlagType.PROFILE_INFORMATION,
+ );
if (!currentWorkspace || !currentUserWorkspace) {
return {
@@ -26,11 +30,6 @@ export const useCanEditProfileField = (field: EditableProfileField) => {
const editableFields = currentWorkspace.editableProfileFields ?? [];
const workspaceAllowsField = editableFields.includes(field);
- const permissionFlags = currentUserWorkspace.permissionFlags ?? [];
- const hasProfilePermission = permissionFlags.includes(
- PermissionFlagType.PROFILE_INFORMATION,
- );
-
const requiresSingleWorkspace = field === 'email';
const isSingleWorkspaceUser =
countAvailableWorkspaces(availableWorkspaces) <= 1;
diff --git a/packages/twenty-front/src/modules/settings/roles/hooks/useHasPermissionFlag.ts b/packages/twenty-front/src/modules/settings/roles/hooks/useHasPermissionFlag.ts
index a46fd877f5e..6f2b20bb4d7 100644
--- a/packages/twenty-front/src/modules/settings/roles/hooks/useHasPermissionFlag.ts
+++ b/packages/twenty-front/src/modules/settings/roles/hooks/useHasPermissionFlag.ts
@@ -1,29 +1,9 @@
-import { currentUserWorkspaceState } from '@/auth/states/currentUserWorkspaceState';
-import {
- WorkspaceActivationStatus,
- PermissionFlagType,
-} from '~/generated-metadata/graphql';
-import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
+import { permissionFlagMapSelector } from '@/settings/roles/states/permissionFlagMapSelector';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
+import { type PermissionFlagType } from '~/generated-metadata/graphql';
-export const useHasPermissionFlag = (
- permissionFlagKey?: PermissionFlagType,
-) => {
- const currentWorkspace = useAtomStateValue(currentWorkspaceState);
- const currentUserWorkspace = useAtomStateValue(currentUserWorkspaceState);
+export const useHasPermissionFlag = (permissionFlag: PermissionFlagType) => {
+ const permissionFlagMap = useAtomStateValue(permissionFlagMapSelector);
- if (!permissionFlagKey) {
- return true;
- }
-
- if (
- permissionFlagKey === PermissionFlagType.WORKSPACE &&
- currentWorkspace?.activationStatus ===
- WorkspaceActivationStatus.PENDING_CREATION
- ) {
- return true;
- }
-
- const userFlags = currentUserWorkspace?.permissionFlags ?? [];
- return userFlags.includes(permissionFlagKey);
+ return permissionFlagMap[permissionFlag];
};
diff --git a/packages/twenty-front/src/modules/settings/roles/hooks/usePermissionFlagMap.ts b/packages/twenty-front/src/modules/settings/roles/hooks/usePermissionFlagMap.ts
deleted file mode 100644
index c6fac51425c..00000000000
--- a/packages/twenty-front/src/modules/settings/roles/hooks/usePermissionFlagMap.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { currentUserWorkspaceState } from '@/auth/states/currentUserWorkspaceState';
-import { PermissionFlagType } from '~/generated-metadata/graphql';
-import { buildRecordFromKeysWithSameValue } from '~/utils/array/buildRecordFromKeysWithSameValue';
-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-
-export const usePermissionFlagMap = (): Record<PermissionFlagType, boolean> => {
- const currentUserWorkspace = useAtomStateValue(currentUserWorkspaceState);
-
- const currentUserWorkspaceSettingsPermissions =
- currentUserWorkspace?.permissionFlags;
-
- const initialPermissions = buildRecordFromKeysWithSameValue(
- Object.values(PermissionFlagType),
- false,
- );
-
- if (!currentUserWorkspaceSettingsPermissions) {
- return initialPermissions;
- }
-
- return currentUserWorkspaceSettingsPermissions.reduce((acc, permission) => {
- acc[permission] = true;
- return acc;
- }, initialPermissions);
-};
diff --git a/packages/twenty-front/src/modules/settings/roles/states/__tests__/permissionFlagMapSelector.test.ts b/packages/twenty-front/src/modules/settings/roles/states/__tests__/permissionFlagMapSelector.test.ts
new file mode 100644
index 00000000000..053cd21212b
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/roles/states/__tests__/permissionFlagMapSelector.test.ts
@@ -0,0 +1,79 @@
+import { createStore } from 'jotai';
+
+import { currentUserWorkspaceState } from '@/auth/states/currentUserWorkspaceState';
+import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
+import { permissionFlagMapSelector } from '@/settings/roles/states/permissionFlagMapSelector';
+import {
+ PermissionFlagType,
+ WorkspaceActivationStatus,
+} from '~/generated-metadata/graphql';
+import { mockCurrentWorkspace } from '~/testing/mock-data/users';
+
+const buildStore = ({
+ permissionFlags,
+ activationStatus,
+}: {
+ permissionFlags: PermissionFlagType[];
+ activationStatus: WorkspaceActivationStatus;
+}) => {
+ const store = createStore();
+
+ store.set(currentWorkspaceState.atom, {
+ ...mockCurrentWorkspace,
+ activationStatus,
+ });
+ store.set(currentUserWorkspaceState.atom, {
+ permissionFlags,
+ twoFactorAuthenticationMethodSummary: [],
+ objectsPermissions: [],
+ isImpersonating: false,
+ });
+
+ return store;
+};
+
+describe('permissionFlagMapSelector', () => {
+ afterEach(() => {
+ localStorage.clear();
+ });
+
+ it('should map every permission flag to whether the current user has it', () => {
+ const store = buildStore({
+ permissionFlags: [PermissionFlagType.DATA_MODEL],
+ activationStatus: WorkspaceActivationStatus.ACTIVE,
+ });
+
+ const permissionFlagMap = store.get(permissionFlagMapSelector.atom);
+
+ expect(Object.keys(permissionFlagMap).sort()).toEqual(
+ Object.values(PermissionFlagType).sort(),
+ );
+ expect(permissionFlagMap[PermissionFlagType.DATA_MODEL]).toBe(true);
+ expect(permissionFlagMap[PermissionFlagType.WORKSPACE]).toBe(false);
+ });
+
+ it('should deny every flag while the current user workspace is not loaded', () => {
+ const store = createStore();
+
+ store.set(currentWorkspaceState.atom, null);
+ store.set(currentUserWorkspaceState.atom, null);
+
+ expect(
+ Object.values(store.get(permissionFlagMapSelector.atom)).some(
+ (hasPermissionFlag) => hasPermissionFlag,
+ ),
+ ).toBe(false);
+ });
+
+ it('should grant the workspace flag only while the workspace is pending creation', () => {
+ const store = buildStore({
+ permissionFlags: [],
+ activationStatus: WorkspaceActivationStatus.PENDING_CREATION,
+ });
+
+ const permissionFlagMap = store.get(permissionFlagMapSelector.atom);
+
+ expect(permissionFlagMap[PermissionFlagType.WORKSPACE]).toBe(true);
+ expect(permissionFlagMap[PermissionFlagType.ROLES]).toBe(false);
+ });
+});
diff --git a/packages/twenty-front/src/modules/settings/roles/states/permissionFlagMapSelector.ts b/packages/twenty-front/src/modules/settings/roles/states/permissionFlagMapSelector.ts
new file mode 100644
index 00000000000..51ea6bf1546
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/roles/states/permissionFlagMapSelector.ts
@@ -0,0 +1,37 @@
+import { currentUserWorkspaceState } from '@/auth/states/currentUserWorkspaceState';
+import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
+import { createAtomSelector } from '@/ui/utilities/state/jotai/utils/createAtomSelector';
+import { buildRecordFromKeysWithSameValue } from '~/utils/array/buildRecordFromKeysWithSameValue';
+import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
+import {
+ PermissionFlagType,
+ WorkspaceActivationStatus,
+} from '~/generated-metadata/graphql';
+
+export const permissionFlagMapSelector = createAtomSelector<
+ Record<PermissionFlagType, boolean>
+>({
+ key: 'permissionFlagMapSelector',
+ areEqual: isDeeplyEqual,
+ get: ({ get }) => {
+ const permissionFlagMap = buildRecordFromKeysWithSameValue(
+ Object.values(PermissionFlagType),
+ false,
+ );
+
+ for (const permissionFlag of get(currentUserWorkspaceState)
+ ?.permissionFlags ?? []) {
+ permissionFlagMap[permissionFlag] = true;
+ }
+
+ // Roles are not set up before the workspace is created, and the server lets settings calls through until then
+ if (
+ get(currentWorkspaceState)?.activationStatus ===
+ WorkspaceActivationStatus.PENDING_CREATION
+ ) {
+ permissionFlagMap[PermissionFlagType.WORKSPACE] = true;
+ }
+
+ return permissionFlagMap;
+ },
+});
diff --git a/packages/twenty-front/src/modules/users/hooks/useLoadCurrentUser.ts b/packages/twenty-front/src/modules/users/hooks/useLoadCurrentUser.ts
index 8271487f8db..01bd7441d8c 100644
--- a/packages/twenty-front/src/modules/users/hooks/useLoadCurrentUser.ts
+++ b/packages/twenty-front/src/modules/users/hooks/useLoadCurrentUser.ts
@@ -13,7 +13,7 @@ import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomStat
import { workspaceAuthBypassProvidersState } from '@/workspace/states/workspaceAuthBypassProvidersState';
import { useCallback } from 'react';
import { SOURCE_LOCALE, type APP_LOCALES } from 'twenty-shared/translations';
-import { type ObjectPermissions } from 'twenty-shared/types';
+import { type CurrentUserWorkspaceObjectPermissions } from '@/auth/types/CurrentUserWorkspaceObjectPermissions';
import { isDefined } from 'twenty-shared/utils';
import { toOpenRecordInPreference } from '@/workspace-member/utils/toOpenRecordInPreference';
import {
@@ -82,9 +82,9 @@ export const useLoadCurrentUser = () => {
twoFactorAuthenticationMethodSummary:
user.currentUserWorkspace.twoFactorAuthenticationMethodSummary ?? [],
objectsPermissions:
- (user.currentUserWorkspace.objectsPermissions as Array<
- ObjectPermissions & { objectMetadataId: string }
- >) ?? [],
+ (user.currentUserWorkspace
+ .objectsPermissions as CurrentUserWorkspaceObjectPermissions[]) ??
+ [],
isImpersonating: user.currentUserWorkspace.isImpersonating ?? false,
});
}
diff --git a/packages/twenty-front/src/testing/decorators/RecordTableDecorator.tsx b/packages/twenty-front/src/testing/decorators/RecordTableDecorator.tsx
index bba278be220..1a8a2c3a753 100644
--- a/packages/twenty-front/src/testing/decorators/RecordTableDecorator.tsx
+++ b/packages/twenty-front/src/testing/decorators/RecordTableDecorator.tsx
@@ -11,6 +11,7 @@ import { formatFieldMetadataItemAsColumnDefinition } from '@/object-metadata/uti
import { RecordComponentInstanceContextsWrapper } from '@/object-record/components/RecordComponentInstanceContextsWrapper';
import { RecordCreationFormProvider } from '@/object-record/record-form/components/RecordCreationFormProvider';
import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
+import { useIsObjectReadOnly } from '@/object-record/read-only/hooks/useIsObjectReadOnly';
import { currentRecordFieldsComponentState } from '@/object-record/record-field/states/currentRecordFieldsComponentState';
import { visibleRecordFieldsComponentSelector } from '@/object-record/record-field/states/visibleRecordFieldsComponentSelector';
import { RecordIndexContextProvider } from '@/object-record/record-index/contexts/RecordIndexContext';
@@ -106,6 +107,7 @@ const InternalTableContextProviders = ({
}) => {
const objectMetadataItems = useAtomStateValue(objectMetadataItemsSelector);
const { objectPermissionsByObjectMetadataId } = useObjectPermissions();
+ const isObjectReadOnly = useIsObjectReadOnly(objectMetadataItem.id);
const currentRecordFields = useAtomComponentStateValue(
currentRecordFieldsComponentState,
@@ -182,6 +184,7 @@ const InternalTableContextProviders = ({
objectPermissionsByObjectMetadataId,
objectMetadataItem.id,
),
+ isObjectReadOnly,
visibleRecordFields,
onRecordIdentifierClick: () => {},
triggerEvent,
diff --git a/packages/twenty-front/src/testing/mock-data/users.ts b/packages/twenty-front/src/testing/mock-data/users.ts
index b6849966398..1cfa112fba8 100644
--- a/packages/twenty-front/src/testing/mock-data/users.ts
+++ b/packages/twenty-front/src/testing/mock-data/users.ts
@@ -236,22 +236,21 @@ export const mockedLimitedPermissionsUserData: MockedUser = {
...mockedUserData,
currentUserWorkspace: {
...mockedUserData.currentUserWorkspace,
- objectsPermissions: getTestEnrichedObjectMetadataItemsMock()
- .filter(
- (objectMetadata) =>
- objectMetadata.nameSingular !== 'task' &&
- objectMetadata.nameSingular !== 'opportunity',
- )
- .map((item) => ({
+ objectsPermissions: getTestEnrichedObjectMetadataItemsMock().map((item) => {
+ const hasAccess =
+ item.nameSingular !== 'task' && item.nameSingular !== 'opportunity';
+
+ return {
objectMetadataId: item.id,
- canReadObjectRecords: true,
- canUpdateObjectRecords: true,
- canSoftDeleteObjectRecords: true,
- canDestroyObjectRecords: true,
+ canReadObjectRecords: hasAccess,
+ canUpdateObjectRecords: hasAccess,
+ canSoftDeleteObjectRecords: hasAccess,
+ canDestroyObjectRecords: hasAccess,
restrictedFields: {},
rowLevelPermissionPredicates: [],
rowLevelPermissionPredicateGroups: [],
- })),
+ };
+ }),
},
};
diff --git a/packages/twenty-front/src/testing/utils/getTestEnrichedObjectMetadataItemsMock.ts b/packages/twenty-front/src/testing/utils/getTestEnrichedObjectMetadataItemsMock.ts
index 56d68eccdb5..7de2e4e10ec 100644
--- a/packages/twenty-front/src/testing/utils/getTestEnrichedObjectMetadataItemsMock.ts
+++ b/packages/twenty-front/src/testing/utils/getTestEnrichedObjectMetadataItemsMock.ts
@@ -1,5 +1,6 @@
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
-import { enrichObjectMetadataItemsWithPermissions } from '@/object-metadata/utils/enrichObjectMetadataItemsWithPermissions';
+import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';
+import { getPermittedFields } from '@/object-metadata/utils/getPermittedFields';
import { mapPaginatedObjectMetadataItemsToObjectMetadataItems } from '@/object-metadata/utils/mapPaginatedObjectMetadataItemsToObjectMetadataItems';
import { mockedStandardObjectMetadataQueryResult } from '~/testing/mock-data/generated/metadata/objects/mock-objects-metadata';
@@ -9,13 +10,18 @@ let cachedItems: EnrichedObjectMetadataItem[] | undefined;
export const getTestEnrichedObjectMetadataItemsMock =
(): EnrichedObjectMetadataItem[] => {
if (cachedItems === undefined) {
- cachedItems = enrichObjectMetadataItemsWithPermissions({
- objectMetadataItems:
- mapPaginatedObjectMetadataItemsToObjectMetadataItems({
- pagedObjectMetadataItems: mockedStandardObjectMetadataQueryResult,
- }),
- objectPermissionsByObjectMetadataId: {},
- });
+ cachedItems = mapPaginatedObjectMetadataItemsToObjectMetadataItems({
+ pagedObjectMetadataItems: mockedStandardObjectMetadataQueryResult,
+ }).map((objectMetadataItem) => ({
+ ...objectMetadataItem,
+ ...getPermittedFields({
+ fields: objectMetadataItem.fields,
+ objectPermissions: getObjectPermissionsForObject(
+ {},
+ objectMetadataItem.id,
+ ),
+ }),
+ }));
}
return cachedItems;