The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix(settings): role save onSuccess, saving state and permissions fallback (#27103)
Félix Malfait88241bcfbc2b
diff --git a/packages/twenty-front/src/modules/object-metadata/states/objectMetadataItemsWithFieldsSelector.ts b/packages/twenty-front/src/modules/object-metadata/states/objectMetadataItemsWithFieldsSelector.tsindex 02072d09b27..f259e1fbde7 100644--- a/packages/twenty-front/src/modules/object-metadata/states/objectMetadataItemsWithFieldsSelector.ts+++ b/packages/twenty-front/src/modules/object-metadata/states/objectMetadataItemsWithFieldsSelector.ts@@ -5,7 +5,7 @@ import { flatObjectMetadataItemsSelector } from '@/object-metadata/states/flatObimport { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';import { getNonReadableFieldMetadataIdsFromObjectPermissions } from '@/object-metadata/utils/getNonReadableFieldMetadataIdsFromObjectPermissions';import { getNonUpdatableFieldMetadataIdsFromObjectPermissions } from '@/object-metadata/utils/getNonUpdatableFieldMetadataIdsFromObjectPermissions';-import { getObjectPermissionsFromMapByObjectMetadataId } from '@/settings/roles/role-permissions/objects-permissions/utils/getObjectPermissionsFromMapByObjectMetadataId';+import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';import { createAtomSelector } from '@/ui/utilities/state/jotai/utils/createAtomSelector';import { type ObjectPermissions } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';@@ -64,10 +64,10 @@ export const objectMetadataItemsWithFieldsSelector = createAtomSelector<const fields = fieldsByObjectId.get(flatObject.id) ?? [];const indexMetadatas = indexesByObjectId.get(flatObject.id) ?? [];- const objectPermissions = getObjectPermissionsFromMapByObjectMetadataId({+ const objectPermissions = getObjectPermissionsForObject(objectPermissionsByObjectMetadataId,- objectMetadataId: flatObject.id,- });+ flatObject.id,+ );const nonReadableFieldMetadataIds =getNonReadableFieldMetadataIdsFromObjectPermissions({diff --git a/packages/twenty-front/src/modules/object-metadata/utils/__tests__/getObjectPermissionsForObject.test.ts b/packages/twenty-front/src/modules/object-metadata/utils/__tests__/getObjectPermissionsForObject.test.tsnew file mode 100644index 00000000000..63456643fe0--- /dev/null+++ b/packages/twenty-front/src/modules/object-metadata/utils/__tests__/getObjectPermissionsForObject.test.ts@@ -0,0 +1,51 @@+import { type ObjectPermissions } from 'twenty-shared/types';++import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';++const OBJECT_METADATA_ID = 'object-metadata-id';++describe('getObjectPermissionsForObject', () => {+ it('should allow everything with the ObjectPermissions shape when the object has no permissions entry', () => {+ expect(getObjectPermissionsForObject({}, OBJECT_METADATA_ID)).toEqual({+ objectMetadataId: OBJECT_METADATA_ID,+ canReadObjectRecords: true,+ canUpdateObjectRecords: true,+ canSoftDeleteObjectRecords: true,+ canDestroyObjectRecords: true,+ restrictedFields: {},+ rowLevelPermissionPredicates: [],+ rowLevelPermissionPredicateGroups: [],+ });+ });++ it('should return the permissions of the requested object', () => {+ const restrictedObjectPermissions: ObjectPermissions & {+ objectMetadataId: string;+ } = {+ objectMetadataId: OBJECT_METADATA_ID,+ canReadObjectRecords: true,+ canUpdateObjectRecords: false,+ canSoftDeleteObjectRecords: false,+ canDestroyObjectRecords: false,+ restrictedFields: {+ 'field-metadata-id': { canRead: false, canUpdate: false },+ },+ rowLevelPermissionPredicates: [],+ rowLevelPermissionPredicateGroups: [],+ };++ expect(+ getObjectPermissionsForObject(+ {+ [OBJECT_METADATA_ID]: restrictedObjectPermissions,+ 'other-object-metadata-id': {+ ...restrictedObjectPermissions,+ objectMetadataId: 'other-object-metadata-id',+ canReadObjectRecords: false,+ },+ },+ OBJECT_METADATA_ID,+ ),+ ).toEqual(restrictedObjectPermissions);+ });+});diff --git a/packages/twenty-front/src/modules/object-metadata/utils/enrichObjectMetadataItemsWithPermissions.ts b/packages/twenty-front/src/modules/object-metadata/utils/enrichObjectMetadataItemsWithPermissions.tsindex 8b231503eed..54627137532 100644--- a/packages/twenty-front/src/modules/object-metadata/utils/enrichObjectMetadataItemsWithPermissions.ts+++ b/packages/twenty-front/src/modules/object-metadata/utils/enrichObjectMetadataItemsWithPermissions.ts@@ -1,8 +1,7 @@import { getNonReadableFieldMetadataIdsFromObjectPermissions } from '@/object-metadata/utils/getNonReadableFieldMetadataIdsFromObjectPermissions';import { getNonUpdatableFieldMetadataIdsFromObjectPermissions } from '@/object-metadata/utils/getNonUpdatableFieldMetadataIdsFromObjectPermissions';-import { getObjectPermissionsFromMapByObjectMetadataId } from '@/settings/roles/role-permissions/objects-permissions/utils/getObjectPermissionsFromMapByObjectMetadataId';+import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';import { type ObjectPermissions } from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';type enrichObjectMetadataItemsWithPermissionsArgs = {@@ -22,22 +21,20 @@ export const enrichObjectMetadataItemsWithPermissions = ({}: enrichObjectMetadataItemsWithPermissionsArgs) => {const formattedObjects: EnrichedObjectMetadataItem[] =objectMetadataItems.map((object) => {- const objectPermissions = getObjectPermissionsFromMapByObjectMetadataId({+ const objectPermissions = getObjectPermissionsForObject(objectPermissionsByObjectMetadataId,- objectMetadataId: object.id,- });+ object.id,+ );- const nonReadableFieldMetadataIds = !isDefined(objectPermissions)- ? []- : getNonReadableFieldMetadataIdsFromObjectPermissions({- objectPermissions: objectPermissions,- });+ const nonReadableFieldMetadataIds =+ getNonReadableFieldMetadataIdsFromObjectPermissions({+ objectPermissions,+ });- const nonUpdatableFieldMetadataIds = !isDefined(objectPermissions)- ? []- : getNonUpdatableFieldMetadataIdsFromObjectPermissions({- objectPermissions: objectPermissions,- });+ const nonUpdatableFieldMetadataIds =+ getNonUpdatableFieldMetadataIdsFromObjectPermissions({+ objectPermissions,+ });const { fields, ...objectWithoutFields } = object;diff --git a/packages/twenty-front/src/modules/object-metadata/utils/getObjectPermissionsForObject.ts b/packages/twenty-front/src/modules/object-metadata/utils/getObjectPermissionsForObject.tsindex 2f0c267b97d..57ed890b184 100644--- a/packages/twenty-front/src/modules/object-metadata/utils/getObjectPermissionsForObject.ts+++ b/packages/twenty-front/src/modules/object-metadata/utils/getObjectPermissionsForObject.ts@@ -1,4 +1,3 @@-import { getObjectPermissionsFromMapByObjectMetadataId } from '@/settings/roles/role-permissions/objects-permissions/utils/getObjectPermissionsFromMapByObjectMetadataId';import { type ObjectPermissions } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';@@ -9,10 +8,8 @@ export const getObjectPermissionsForObject = (>,objectMetadataId: string,): ObjectPermissions & { objectMetadataId: string } => {- const objectPermissions = getObjectPermissionsFromMapByObjectMetadataId({- objectPermissionsByObjectMetadataId,- objectMetadataId,- });+ const objectPermissions =+ objectPermissionsByObjectMetadataId[objectMetadataId];if (!isDefined(objectPermissions)) {return {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.tsxindex 536ab5843a7..0c616ad3128 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,7 @@ import { PropertyBox } from '@/object-record/record-inline-cell/property-box/comimport { 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 { getObjectPermissionsFromMapByObjectMetadataId } from '@/settings/roles/role-permissions/objects-permissions/utils/getObjectPermissionsFromMapByObjectMetadataId';+import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';import { FieldMetadataType } from 'twenty-shared/types';@@ -110,11 +110,10 @@ export const RecordFieldList = ({isDisplayModeFixHeight: true,isRecordFieldReadOnly: isRecordFieldReadOnly({isRecordReadOnly,- objectPermissions:- getObjectPermissionsFromMapByObjectMetadataId({- objectPermissionsByObjectMetadataId,- objectMetadataId: objectMetadataItem.id,- }),+ objectPermissions: getObjectPermissionsForObject(+ objectPermissionsByObjectMetadataId,+ objectMetadataItem.id,+ ),fieldMetadataItem,fieldDefinition,objectPermissionsByObjectMetadataId,@@ -181,11 +180,10 @@ export const RecordFieldList = ({isDisplayModeFixHeight: true,isRecordFieldReadOnly: isRecordFieldReadOnly({isRecordReadOnly,- objectPermissions:- getObjectPermissionsFromMapByObjectMetadataId({- objectPermissionsByObjectMetadataId,- objectMetadataId: objectMetadataItem.id,- }),+ objectPermissions: getObjectPermissionsForObject(+ objectPermissionsByObjectMetadataId,+ objectMetadataItem.id,+ ),fieldMetadataItem,fieldDefinition,objectPermissionsByObjectMetadataId,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.tsxindex 1f7aad578dd..d736e4ada83 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@@ -11,7 +11,7 @@ import { NON_STANDARD_AGGREGATE_OPERATION_OPTIONS } from '@/object-record/recordimport { 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 { getObjectPermissionsFromMapByObjectMetadataId } from '@/settings/roles/role-permissions/objects-permissions/utils/getObjectPermissionsFromMapByObjectMetadataId';+import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';import { t } from '@lingui/core/macro';export const RecordGroupAggregateDropdownContent = () => {@@ -24,10 +24,10 @@ export const RecordGroupAggregateDropdownContent = () => {const restrictedFieldMetadataIds =getNonReadableFieldMetadataIdsFromObjectPermissions({- objectPermissions: getObjectPermissionsFromMapByObjectMetadataId({+ objectPermissions: getObjectPermissionsForObject(objectPermissionsByObjectMetadataId,- objectMetadataId: objectMetadataItem.id,- }),+ objectMetadataItem.id,+ ),});const readableFields = objectMetadataItem.fields.filter(diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/hooks/useMultipleRecordPickerPerformSearch.ts b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/hooks/useMultipleRecordPickerPerformSearch.tsindex 69c1c2a1265..f2bb942ec6a 100644--- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/hooks/useMultipleRecordPickerPerformSearch.ts+++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/hooks/useMultipleRecordPickerPerformSearch.ts@@ -11,7 +11,7 @@ import { multipleRecordPickerSearchableObjectMetadataItemsComponentState } fromimport { searchRecordStoreFamilyState } from '@/object-record/record-picker/multiple-record-picker/states/searchRecordStoreComponentFamilyState';import { sortMorphItems } from '@/object-record/record-picker/multiple-record-picker/utils/sortMorphItems';import { type RecordPickerPickableMorphItem } from '@/object-record/record-picker/types/RecordPickerPickableMorphItem';-import { getObjectPermissionsFromMapByObjectMetadataId } from '@/settings/roles/role-permissions/objects-permissions/utils/getObjectPermissionsFromMapByObjectMetadataId';+import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';import { type ApolloClient } from '@apollo/client';import { isNonEmptyArray } from '@sniptt/guards';import { useStore } from 'jotai';@@ -97,10 +97,10 @@ export const useMultipleRecordPickerPerformSearch = () => {const filteredSearchableObjectMetadataItems =searchableObjectMetadataItems.filter((objectMetadataItem) =>- getObjectPermissionsFromMapByObjectMetadataId({+ getObjectPermissionsForObject(objectPermissionsByObjectMetadataId,- objectMetadataId: objectMetadataItem.id,- }).canReadObjectRecords === true,+ objectMetadataItem.id,+ ).canReadObjectRecords === true,);const [diff --git a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/hooks/useSingleRecordPickerPerformSearch.ts b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/hooks/useSingleRecordPickerPerformSearch.tsindex a02c86ceb3f..620ea7af1a4 100644--- a/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/hooks/useSingleRecordPickerPerformSearch.ts+++ b/packages/twenty-front/src/modules/object-record/record-picker/single-record-picker/hooks/useSingleRecordPickerPerformSearch.ts@@ -10,7 +10,7 @@ import { searchRecordStoreFamilyState } from '@/object-record/record-picker/multimport { SingleRecordPickerComponentInstanceContext } from '@/object-record/record-picker/single-record-picker/states/contexts/SingleRecordPickerComponentInstanceContext';import { singleRecordPickerSearchableObjectMetadataItemsComponentState } from '@/object-record/record-picker/single-record-picker/states/singleRecordPickerSearchableObjectMetadataItemsComponentState';import { type RecordPickerPickableMorphItem } from '@/object-record/record-picker/types/RecordPickerPickableMorphItem';-import { getObjectPermissionsFromMapByObjectMetadataId } from '@/settings/roles/role-permissions/objects-permissions/utils/getObjectPermissionsFromMapByObjectMetadataId';+import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { CustomError, isDefined } from 'twenty-shared/utils';@@ -52,10 +52,10 @@ export const useSingleRecordPickerPerformSearch = ({}return (- getObjectPermissionsFromMapByObjectMetadataId({+ getObjectPermissionsForObject(objectPermissionsByObjectMetadataId,- objectMetadataId: objectMetadataItem.id,- }).canReadObjectRecords === true+ objectMetadataItem.id,+ ).canReadObjectRecords === true);},);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.tsxindex 4b59221db22..df524630263 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,7 @@ import { FieldWidgetEditAction } from '@/page-layout/widgets/field/components/Fiimport { 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 { getObjectPermissionsFromMapByObjectMetadataId } from '@/settings/roles/role-permissions/objects-permissions/utils/getObjectPermissionsFromMapByObjectMetadataId';+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 +89,10 @@ export const WidgetActionFieldEdit = ({isDisplayModeFixHeight: false,isRecordFieldReadOnly: isRecordFieldReadOnly({isRecordReadOnly,- objectPermissions: getObjectPermissionsFromMapByObjectMetadataId({+ objectPermissions: getObjectPermissionsForObject(objectPermissionsByObjectMetadataId,- objectMetadataId: objectMetadataItem.id,- }),+ 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.tsxindex 41600636d7e..c2884e88560 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,7 @@ import { FieldWidgetInlineCell } from '@/page-layout/widgets/field/components/Fiimport { 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 { getObjectPermissionsFromMapByObjectMetadataId } from '@/settings/roles/role-permissions/objects-permissions/utils/getObjectPermissionsFromMapByObjectMetadataId';+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,11 +87,10 @@ export const FieldWidgetDisplay = ({isDisplayModeFixHeight: false,isRecordFieldReadOnly: isRecordFieldReadOnly({isRecordReadOnly,- objectPermissions:- getObjectPermissionsFromMapByObjectMetadataId({- objectPermissionsByObjectMetadataId,- objectMetadataId: objectMetadataItem.id,- }),+ objectPermissions: getObjectPermissionsForObject(+ objectPermissionsByObjectMetadataId,+ 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.tsindex cceb2632c13..a80a9a3e605 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,7 @@ import { useIsPageLayoutInEditMode } from '@/page-layout/hooks/useIsPageLayoutInimport { 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 { getObjectPermissionsFromMapByObjectMetadataId } from '@/settings/roles/role-permissions/objects-permissions/utils/getObjectPermissionsFromMapByObjectMetadataId';+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 +72,10 @@ export const useFieldWidgetActionVisibility = ({const isFieldReadOnly = isRecordFieldReadOnly({isRecordReadOnly,- objectPermissions: getObjectPermissionsFromMapByObjectMetadataId({+ objectPermissions: getObjectPermissionsForObject(objectPermissionsByObjectMetadataId,- objectMetadataId: objectMetadataItem.id,- }),+ 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.tsxindex f8a8a00f5ef..c4e182cfca9 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,7 @@ import { RecordFieldComponentInstanceContext } from '@/object-record/record-fielimport { 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 { getObjectPermissionsFromMapByObjectMetadataId } from '@/settings/roles/role-permissions/objects-permissions/utils/getObjectPermissionsFromMapByObjectMetadataId';+import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';import { type ObjectPermissions } from 'twenty-shared/types';type FieldsWidgetFieldItemProps = {@@ -63,10 +63,10 @@ export const FieldsWidgetFieldItem = ({isDisplayModeFixHeight: true,isRecordFieldReadOnly: isRecordFieldReadOnly({isRecordReadOnly,- objectPermissions: getObjectPermissionsFromMapByObjectMetadataId({+ objectPermissions: getObjectPermissionsForObject(objectPermissionsByObjectMetadataId,- objectMetadataId: objectMetadataItem.id,- }),+ objectMetadataItem.id,+ ),fieldMetadataItem,fieldDefinition,objectPermissionsByObjectMetadataId,diff --git a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignment.tsx b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignment.tsxindex b0fe70146d0..2ae9737a20d 100644--- a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignment.tsx+++ b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignment.tsx@@ -1,4 +1,3 @@-import { isDefined } from 'twenty-shared/utils';import { currentWorkspaceMembersState } from '@/auth/states/currentWorkspaceMembersState';import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';import { useUpdateAgentRole } from '@/settings/roles/hooks/useUpdateAgentRole';@@ -197,10 +196,6 @@ export const SettingsRoleAssignment = ({closeDialog(modalInstanceId);};- if (!isDefined(settingsDraftRole)) {- return null;- }-return (<>{Object.keys(ROLE_TARGET_CONFIG).map((roleTargetType) => (diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/objects-permissions/utils/getObjectPermissionsFromMapByObjectMetadataId.ts b/packages/twenty-front/src/modules/settings/roles/role-permissions/objects-permissions/utils/getObjectPermissionsFromMapByObjectMetadataId.tsdeleted file mode 100644index 102592e8776..00000000000--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/objects-permissions/utils/getObjectPermissionsFromMapByObjectMetadataId.ts+++ /dev/null@@ -1,26 +0,0 @@-import { type ObjectPermissions } from 'twenty-shared/types';--type GetObjectPermissionsFromMapByObjectIdArgs = {- objectPermissionsByObjectMetadataId: Record<- string,- ObjectPermissions & { objectMetadataId: string }- >;- objectMetadataId: string;-};--export const getObjectPermissionsFromMapByObjectMetadataId = ({- objectPermissionsByObjectMetadataId,- objectMetadataId,-}: GetObjectPermissionsFromMapByObjectIdArgs) => {- return (- objectPermissionsByObjectMetadataId[objectMetadataId] ?? {- canReadObjectRecords: true,- canUpdateObjectRecords: true,- canCreateObjectRecords: true,- canDeleteObjectRecords: true,- restrictedFields: {},- rowLevelPermissionPredicates: [],- rowLevelPermissionPredicateGroups: [],- }- );-};diff --git a/packages/twenty-front/src/modules/settings/roles/role/components/SettingsRole.tsx b/packages/twenty-front/src/modules/settings/roles/role/components/SettingsRole.tsxindex f933924ec14..08706cb1ff6 100644--- a/packages/twenty-front/src/modules/settings/roles/role/components/SettingsRole.tsx+++ b/packages/twenty-front/src/modules/settings/roles/role/components/SettingsRole.tsx@@ -1,3 +1,4 @@+import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';@@ -10,12 +11,10 @@ import { SETTINGS_ROLE_DETAIL_TABS } from '@/settings/roles/role/constants/Settiimport { useSaveDraftRoleToDB } from '@/settings/roles/role/hooks/useSaveDraftRoleToDB';import { settingsDraftRoleFamilyState } from '@/settings/roles/states/settingsDraftRoleFamilyState';import { settingsPersistedRoleFamilyState } from '@/settings/roles/states/settingsPersistedRoleFamilyState';-import { settingsRolesIsLoadingState } from '@/settings/roles/states/settingsRolesIsLoadingState';import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { useSetAtomFamilyState } from '@/ui/utilities/state/jotai/hooks/useSetAtomFamilyState';import { useLoadCurrentUser } from '@/users/hooks/useLoadCurrentUser';import { t } from '@lingui/core/macro';@@ -47,8 +46,6 @@ export const SettingsRole = ({ roleId, isCreateMode }: SettingsRoleProps) => {const [isSaving, setIsSaving] = useState(false);- const settingsRolesIsLoading = useAtomStateValue(settingsRolesIsLoadingState);-const settingsDraftRole = useAtomFamilyStateValue(settingsDraftRoleFamilyState,roleId,@@ -115,8 +112,6 @@ export const SettingsRole = ({ roleId, isCreateMode }: SettingsRoleProps) => {};const handleSave = async () => {- setIsSaving(true);-if (isDefined(dirtyFields.label) && dirtyFields.label === '') {enqueueToast({variant: 'error',@@ -125,18 +120,18 @@ export const SettingsRole = ({ roleId, isCreateMode }: SettingsRoleProps) => {return;}+ setIsSaving(true);+try {await saveDraftRoleToDB();await loadCurrentUser();+ } catch (error) {+ enqueueToast(getToastOptionsFromError({ error }));} finally {setIsSaving(false);}};- if (!isDefined(settingsRolesIsLoading)) {- return <></>;- }-return (<SettingsPageLayouttitle={<SettingsRoleLabelContainer roleId={roleId} />}diff --git a/packages/twenty-front/src/modules/settings/roles/role/components/__tests__/SettingsRole.test.tsx b/packages/twenty-front/src/modules/settings/roles/role/components/__tests__/SettingsRole.test.tsxnew file mode 100644index 00000000000..aa49cc70b24--- /dev/null+++ b/packages/twenty-front/src/modules/settings/roles/role/components/__tests__/SettingsRole.test.tsx@@ -0,0 +1,201 @@+import { i18n } from '@lingui/core';+import { I18nProvider } from '@lingui/react';+import { act, render, screen, waitFor } from '@testing-library/react';+import userEvent from '@testing-library/user-event';+import { createStore, Provider as JotaiProvider } from 'jotai';+import { type ReactNode } from 'react';+import { MemoryRouter } from 'react-router-dom';++import { SettingsRole } from '@/settings/roles/role/components/SettingsRole';+import { settingsDraftRoleFamilyState } from '@/settings/roles/states/settingsDraftRoleFamilyState';+import { settingsPersistedRoleFamilyState } from '@/settings/roles/states/settingsPersistedRoleFamilyState';+import { type RoleWithPartialMembers } from '@/settings/roles/types/RoleWithPartialMembers';++const mockSaveDraftRoleToDB = jest.fn();+const mockLoadCurrentUser = jest.fn();+const mockEnqueueToast = jest.fn();++jest.mock('@/settings/roles/role/hooks/useSaveDraftRoleToDB', () => ({+ useSaveDraftRoleToDB: () => ({ saveDraftRoleToDB: mockSaveDraftRoleToDB }),+}));++jest.mock('@/users/hooks/useLoadCurrentUser', () => ({+ useLoadCurrentUser: () => ({ loadCurrentUser: mockLoadCurrentUser }),+}));++jest.mock('~/hooks/useNavigateSettings', () => ({+ useNavigateSettings: () => jest.fn(),+}));++jest.mock('twenty-ui/components', () => ({+ ...jest.requireActual('twenty-ui/components'),+ useToast: () => ({ enqueueToast: mockEnqueueToast }),+}));++jest.mock('@/settings/components/layout/SettingsPageLayout', () => ({+ SettingsPageLayout: ({+ actionButton,+ children,+ }: {+ actionButton?: ReactNode;+ children: ReactNode;+ }) => (+ <>+ {actionButton}+ {children}+ </>+ ),+}));++jest.mock('@/settings/components/layout/SettingsTabBar', () => ({+ SettingsTabBar: () => null,+}));++jest.mock(+ '@/settings/roles/role/components/SettingsRoleLabelContainer',+ () => ({+ SettingsRoleLabelContainer: () => null,+ }),+);++jest.mock(+ '@/settings/roles/role-assignment/components/SettingsRoleAssignment',+ () => ({ SettingsRoleAssignment: () => null }),+);++jest.mock(+ '@/settings/roles/role-permissions/components/SettingsRolePermissions',+ () => ({ SettingsRolePermissions: () => null }),+);++jest.mock(+ '@/settings/roles/role-settings/components/SettingsRoleSettings',+ () => ({ SettingsRoleSettings: () => null }),+);++const ROLE_ID = 'role-id';++const PERSISTED_ROLE: RoleWithPartialMembers = {+ __typename: 'Role',+ id: ROLE_ID,+ label: 'Sales',+ description: '',+ icon: 'IconUser',+ canUpdateAllSettings: false,+ canAccessAllTools: false,+ canReadAllObjectRecords: true,+ canUpdateAllObjectRecords: true,+ canSoftDeleteAllObjectRecords: true,+ canDestroyAllObjectRecords: false,+ canBeAssignedToUsers: true,+ canBeAssignedToAgents: true,+ canBeAssignedToApiKeys: true,+ isEditable: true,+ workspaceMembers: [],+ agents: [],+ apiKeys: [],+ permissionFlags: [],+ objectPermissions: [],+ fieldPermissions: [],+ rowLevelPermissionPredicates: [],+ rowLevelPermissionPredicateGroups: [],+};++const renderSettingsRole = ({ draftLabel }: { draftLabel: string }) => {+ const store = createStore();++ store.set(+ settingsPersistedRoleFamilyState.atomFamily(ROLE_ID),+ PERSISTED_ROLE,+ );+ store.set(settingsDraftRoleFamilyState.atomFamily(ROLE_ID), {+ ...PERSISTED_ROLE,+ label: draftLabel,+ });++ render(+ <I18nProvider i18n={i18n}>+ <MemoryRouter>+ <JotaiProvider store={store}>+ <SettingsRole roleId={ROLE_ID} isCreateMode={false} />+ </JotaiProvider>+ </MemoryRouter>+ </I18nProvider>,+ );+};++describe('SettingsRole', () => {+ afterEach(() => {+ jest.resetAllMocks();+ });++ it('should leave the save button usable when saving is rejected because the role name is empty', async () => {+ const user = userEvent.setup();++ renderSettingsRole({ draftLabel: '' });++ const saveButton = screen.getByRole('button', { name: 'Save' });++ await user.click(saveButton);++ expect(mockEnqueueToast).toHaveBeenCalledWith(+ expect.objectContaining({+ variant: 'error',+ children: 'Role name cannot be empty',+ }),+ );+ expect(mockSaveDraftRoleToDB).not.toHaveBeenCalled();+ expect(saveButton).toBeEnabled();+ expect(saveButton).not.toHaveAttribute('aria-busy', 'true');+ });++ it('should show the save button as loading until the role is saved', async () => {+ const user = userEvent.setup();+ let resolveSave: () => void = () => {};++ mockSaveDraftRoleToDB.mockReturnValue(+ new Promise<void>((resolve) => {+ resolveSave = resolve;+ }),+ );++ renderSettingsRole({ draftLabel: 'Sales team' });++ const saveButton = screen.getByRole('button', { name: 'Save' });++ await user.click(saveButton);++ expect(saveButton).toHaveAttribute('aria-busy', 'true');++ await act(async () => {+ resolveSave();+ });++ await waitFor(() => {+ expect(saveButton).not.toHaveAttribute('aria-busy', 'true');+ });+ expect(mockSaveDraftRoleToDB).toHaveBeenCalledTimes(1);+ expect(mockLoadCurrentUser).toHaveBeenCalledTimes(1);+ });++ it('should show an error toast and leave the save button usable when the save fails', async () => {+ const user = userEvent.setup();++ mockSaveDraftRoleToDB.mockRejectedValue(new Error('Save failed'));++ renderSettingsRole({ draftLabel: 'Sales team' });++ const saveButton = screen.getByRole('button', { name: 'Save' });++ await user.click(saveButton);++ await waitFor(() => {+ expect(mockEnqueueToast).toHaveBeenCalledTimes(1);+ });+ expect(mockEnqueueToast).toHaveBeenCalledWith(+ expect.objectContaining({ variant: 'error' }),+ );+ expect(mockLoadCurrentUser).not.toHaveBeenCalled();+ expect(saveButton).not.toHaveAttribute('aria-busy', 'true');+ });+});diff --git a/packages/twenty-front/src/modules/settings/roles/role/hooks/__tests__/useSaveDraftRoleToDB.test.tsx b/packages/twenty-front/src/modules/settings/roles/role/hooks/__tests__/useSaveDraftRoleToDB.test.tsxnew file mode 100644index 00000000000..05530c2b68a--- /dev/null+++ b/packages/twenty-front/src/modules/settings/roles/role/hooks/__tests__/useSaveDraftRoleToDB.test.tsx@@ -0,0 +1,184 @@+import { act, renderHook } from '@testing-library/react';+import { createStore, Provider as JotaiProvider } from 'jotai';+import { type ReactNode } from 'react';++import { useSaveDraftRoleToDB } from '@/settings/roles/role/hooks/useSaveDraftRoleToDB';+import { settingsDraftRoleFamilyState } from '@/settings/roles/states/settingsDraftRoleFamilyState';+import { settingsPersistedRoleFamilyState } from '@/settings/roles/states/settingsPersistedRoleFamilyState';+import { type RoleWithPartialMembers } from '@/settings/roles/types/RoleWithPartialMembers';+import { CreateOneRoleDocument } from '~/generated-metadata/graphql';++const mockUseMutation = jest.fn();+const mockCreateRole = jest.fn();+const mockOtherMutation = jest.fn();++jest.mock('@apollo/client/react', () => ({+ ...jest.requireActual('@apollo/client/react'),+ useMutation: (...args: unknown[]) => mockUseMutation(...args),+}));++const ROLE_ID = 'role-id';++const ROLE_BASIC_FIELDS_INPUT = {+ description: '',+ icon: 'IconUser',+ canUpdateAllSettings: false,+ canAccessAllTools: false,+ canReadAllObjectRecords: true,+ canUpdateAllObjectRecords: true,+ canSoftDeleteAllObjectRecords: true,+ canDestroyAllObjectRecords: false,+ canBeAssignedToUsers: true,+ canBeAssignedToAgents: true,+ canBeAssignedToApiKeys: true,+};++const PERSISTED_ROLE: RoleWithPartialMembers = {+ __typename: 'Role',+ id: ROLE_ID,+ label: 'Sales',+ description: '',+ icon: 'IconUser',+ canUpdateAllSettings: false,+ canAccessAllTools: false,+ canReadAllObjectRecords: true,+ canUpdateAllObjectRecords: true,+ canSoftDeleteAllObjectRecords: true,+ canDestroyAllObjectRecords: false,+ canBeAssignedToUsers: true,+ canBeAssignedToAgents: true,+ canBeAssignedToApiKeys: true,+ isEditable: true,+ workspaceMembers: [],+ agents: [],+ apiKeys: [],+ permissionFlags: [],+ objectPermissions: [],+ fieldPermissions: [],+ rowLevelPermissionPredicates: [],+ rowLevelPermissionPredicateGroups: [],+};++const renderUseSaveDraftRoleToDB = ({+ isCreateMode,+ draftRole,+ persistedRole,+ onSuccess,+}: {+ isCreateMode: boolean;+ draftRole: RoleWithPartialMembers;+ persistedRole: RoleWithPartialMembers | undefined;+ onSuccess: (savedRoleId: string) => void;+}) => {+ const store = createStore();++ store.set(settingsDraftRoleFamilyState.atomFamily(ROLE_ID), draftRole);+ store.set(+ settingsPersistedRoleFamilyState.atomFamily(ROLE_ID),+ persistedRole,+ );++ const Wrapper = ({ children }: { children: ReactNode }) => (+ <JotaiProvider store={store}>{children}</JotaiProvider>+ );++ return renderHook(+ () => useSaveDraftRoleToDB({ roleId: ROLE_ID, isCreateMode, onSuccess }),+ { wrapper: Wrapper },+ );+};++describe('useSaveDraftRoleToDB', () => {+ beforeEach(() => {+ mockCreateRole.mockResolvedValue({+ data: { createOneRole: { id: ROLE_ID } },+ });+ mockOtherMutation.mockResolvedValue({ data: {} });+ mockUseMutation.mockImplementation((document: unknown) => [+ document === CreateOneRoleDocument ? mockCreateRole : mockOtherMutation,+ ]);+ });++ afterEach(() => {+ jest.clearAllMocks();+ });++ it('should call onSuccess once with the created role id when creating a role', async () => {+ const onSuccess = jest.fn();++ const { result } = renderUseSaveDraftRoleToDB({+ isCreateMode: true,+ draftRole: { ...PERSISTED_ROLE, label: 'New role' },+ persistedRole: undefined,+ onSuccess,+ });++ await act(async () => {+ await result.current.saveDraftRoleToDB();+ });++ expect(mockCreateRole).toHaveBeenCalledTimes(1);+ expect(mockCreateRole).toHaveBeenCalledWith(+ expect.objectContaining({+ variables: {+ createRoleInput: {+ id: ROLE_ID,+ label: 'New role',+ ...ROLE_BASIC_FIELDS_INPUT,+ },+ },+ }),+ );+ expect(onSuccess).toHaveBeenCalledTimes(1);+ expect(onSuccess).toHaveBeenCalledWith(ROLE_ID);+ });++ it('should not call onSuccess when the role creation returns no data', async () => {+ const onSuccess = jest.fn();++ mockCreateRole.mockResolvedValue({ data: undefined });++ const { result } = renderUseSaveDraftRoleToDB({+ isCreateMode: true,+ draftRole: { ...PERSISTED_ROLE, label: 'New role' },+ persistedRole: undefined,+ onSuccess,+ });++ await act(async () => {+ await result.current.saveDraftRoleToDB();+ });++ expect(onSuccess).not.toHaveBeenCalled();+ });++ it('should call onSuccess once with the role id when updating a role', async () => {+ const onSuccess = jest.fn();++ const { result } = renderUseSaveDraftRoleToDB({+ isCreateMode: false,+ draftRole: { ...PERSISTED_ROLE, label: 'Sales team' },+ persistedRole: PERSISTED_ROLE,+ onSuccess,+ });++ await act(async () => {+ await result.current.saveDraftRoleToDB();+ });++ expect(mockCreateRole).not.toHaveBeenCalled();+ expect(mockOtherMutation).toHaveBeenCalledTimes(1);+ expect(mockOtherMutation).toHaveBeenCalledWith(+ expect.objectContaining({+ variables: {+ updateRoleInput: {+ id: ROLE_ID,+ update: { label: 'Sales team', ...ROLE_BASIC_FIELDS_INPUT },+ },+ },+ }),+ );+ expect(onSuccess).toHaveBeenCalledTimes(1);+ expect(onSuccess).toHaveBeenCalledWith(ROLE_ID);+ });+});diff --git a/packages/twenty-front/src/modules/settings/roles/role/hooks/useSaveDraftRoleToDB.ts b/packages/twenty-front/src/modules/settings/roles/role/hooks/useSaveDraftRoleToDB.tsindex d9bc04c42fa..b03b230b3e2 100644--- a/packages/twenty-front/src/modules/settings/roles/role/hooks/useSaveDraftRoleToDB.ts+++ b/packages/twenty-front/src/modules/settings/roles/role/hooks/useSaveDraftRoleToDB.ts@@ -161,9 +161,7 @@ export const useSaveDraftRoleToDB = ({await upsertRolePermissions(createdRoleId);await assignEntitiesToRole(createdRoleId);- if (isDefined(onSuccess)) {- await onSuccess(createdRoleId);- }+ return createdRoleId;};const updateExistingRole = async () => {@@ -256,6 +254,8 @@ export const useSaveDraftRoleToDB = ({) {await upsertRowLevelPermissionPredicatesForRole(roleId);}++ return roleId;};const upsertRowLevelPermissionPredicatesForRole = async (@@ -458,19 +458,17 @@ export const useSaveDraftRoleToDB = ({apiKeyIds: settingsDraftRole.apiKeys.map((apiKey) => apiKey.id),});}-- if (isDefined(onSuccess)) {- await onSuccess(roleId);- }};const saveDraftRoleToDB = async () => {removeUselessFieldPermissions();- if (isCreateMode) {- await createNewRole();- } else {- await updateExistingRole();+ const savedRoleId = isCreateMode+ ? await createNewRole()+ : await updateExistingRole();++ if (isDefined(savedRoleId) && isDefined(onSuccess)) {+ await onSuccess(savedRoleId);}};diff --git a/packages/twenty-front/src/testing/decorators/RecordTableDecorator.tsx b/packages/twenty-front/src/testing/decorators/RecordTableDecorator.tsxindex 96165142e11..bba278be220 100644--- a/packages/twenty-front/src/testing/decorators/RecordTableDecorator.tsx+++ b/packages/twenty-front/src/testing/decorators/RecordTableDecorator.tsx@@ -23,7 +23,7 @@ import {import { useSetRecordTableData } from '@/object-record/record-table/hooks/internal/useSetRecordTableData';import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext';import { getRecordIndexIdFromObjectNamePluralAndViewId } from '@/object-record/utils/getRecordIndexIdFromObjectNamePluralAndViewId';-import { getObjectPermissionsFromMapByObjectMetadataId } from '@/settings/roles/role-permissions/objects-permissions/utils/getObjectPermissionsFromMapByObjectMetadataId';+import { getObjectPermissionsForObject } from '@/object-metadata/utils/getObjectPermissionsForObject';import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';@@ -178,10 +178,10 @@ const InternalTableContextProviders = ({objectMetadataItems: objectMetadataItems,recordTableId: objectMetadataItem.namePlural,viewBarId: 'view-bar',- objectPermissions: getObjectPermissionsFromMapByObjectMetadataId({+ objectPermissions: getObjectPermissionsForObject(objectPermissionsByObjectMetadataId,- objectMetadataId: objectMetadataItem.id,- }),+ objectMetadataItem.id,+ ),visibleRecordFields,onRecordIdentifierClick: () => {},triggerEvent,