The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Require only the WORKFLOWS permission on the core workflow pages (#27545)
Thomas Trompetteddf208670152
diff --git a/packages/twenty-front/src/modules/object-core/commands/hooks/__tests__/useCoreObjectsCommands.test.tsx b/packages/twenty-front/src/modules/object-core/commands/hooks/__tests__/useCoreObjectsCommands.test.tsxindex 8bd5365c0cb..10b8c84b0b3 100644--- a/packages/twenty-front/src/modules/object-core/commands/hooks/__tests__/useCoreObjectsCommands.test.tsx+++ b/packages/twenty-front/src/modules/object-core/commands/hooks/__tests__/useCoreObjectsCommands.test.tsx@@ -20,7 +20,6 @@ i18n.activate(SOURCE_LOCALE);const mockIsCoreEnabled = jest.fn();const mockHasPermission = jest.fn();-const mockCanSoftDeleteWorkflow = jest.fn();jest.mock('@/workspace/hooks/useIsFeatureEnabled', () => ({useIsFeatureEnabled: () => mockIsCoreEnabled(),@@ -35,11 +34,6 @@ jest.mock('@/object-metadata/hooks/useObjectMetadataItem', () => ({},}),}));-jest.mock('@/object-record/hooks/useObjectPermissionsForObject', () => ({- useObjectPermissionsForObject: () => ({- canSoftDeleteObjectRecords: mockCanSoftDeleteWorkflow(),- }),-}));const Wrapper = ({ children }: { children: React.ReactNode }) => (<JotaiProvider store={jotaiStore}>@@ -81,7 +75,6 @@ describe('useCoreObjectsCommands', () => {beforeEach(() => {mockIsCoreEnabled.mockReturnValue(true);mockHasPermission.mockReturnValue(true);- mockCanSoftDeleteWorkflow.mockReturnValue(true);jotaiStore.set(coreWorkflowsFilterSettingsState.atom, {});});@@ -104,12 +97,6 @@ describe('useCoreObjectsCommands', () => {expect(result.current.shouldDisplayCoreWorkflowsDeleteCommand).toBe(false);});- it('does not expose core deletion without object delete permission', () => {- mockCanSoftDeleteWorkflow.mockReturnValue(false);- const { result } = renderCommands();- expect(result.current.shouldDisplayCoreWorkflowsDeleteCommand).toBe(false);- });-it('keeps core commands hidden with the flag off', () => {mockIsCoreEnabled.mockReturnValue(false);const { result } = renderCommands();diff --git a/packages/twenty-front/src/modules/object-core/commands/hooks/useCoreObjectsCommands.ts b/packages/twenty-front/src/modules/object-core/commands/hooks/useCoreObjectsCommands.tsindex cf46b02f305..9f601ae278d 100644--- a/packages/twenty-front/src/modules/object-core/commands/hooks/useCoreObjectsCommands.ts+++ b/packages/twenty-front/src/modules/object-core/commands/hooks/useCoreObjectsCommands.ts@@ -15,7 +15,6 @@ import { coreWorkflowsFilterSettingsState } from '@/object-core/workflows/statesimport { coreWorkflowsSelectionState } from '@/object-core/workflows/states/coreWorkflowsSelectionState';import { getSelectedCoreWorkflowRowIds } from '@/object-core/workflows/utils/getSelectedCoreWorkflowRowIds';import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';-import { useObjectPermissionsForObject } from '@/object-record/hooks/useObjectPermissionsForObject';import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';import { PermissionFlagType } from 'twenty-shared/constants';import { sidePanelSearchState } from '@/side-panel/states/sidePanelSearchState';@@ -38,9 +37,6 @@ export const useCoreObjectsCommands = () => {useObjectMetadataItem({objectNameSingular: CoreObjectNameSingular.Workflow,});- const workflowObjectPermissions = useObjectPermissionsForObject(- workflowObjectMetadataItem.id,- );const coreWorkflowsSelection = useAtomStateValue(coreWorkflowsSelectionState);const coreWorkflowsFilterSettings = useAtomStateValue(@@ -80,7 +76,6 @@ export const useCoreObjectsCommands = () => {!isInPreviewMode &&isNonEmptyArray(selectedCoreWorkflowIds) &&canManageWorkflows &&- workflowObjectPermissions.canSoftDeleteObjectRecords &&matchesSidePanelSearch(coreWorkflowsDeleteCommandLabel);const coreObjectCommandIds = shouldDisplayCoreWorkflowFiltersCommanddiff --git a/packages/twenty-front/src/modules/object-core/workflows/hooks/useCreateCoreWorkflow.ts b/packages/twenty-front/src/modules/object-core/workflows/hooks/useCreateCoreWorkflow.tsindex 77586bf31eb..b792d9ed4ef 100644--- a/packages/twenty-front/src/modules/object-core/workflows/hooks/useCreateCoreWorkflow.ts+++ b/packages/twenty-front/src/modules/object-core/workflows/hooks/useCreateCoreWorkflow.ts@@ -2,15 +2,12 @@ import { useMutation } from '@apollo/client/react';import { t } from '@lingui/core/macro';import { useCallback, useState } from 'react';import { PermissionFlagType } from 'twenty-shared/constants';-import { AppPath, CoreObjectNameSingular } from 'twenty-shared/types';+import { AppPath } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { CREATE_CORE_WORKFLOW } from '@/object-core/workflows/graphql/mutations/createCoreWorkflow';import { invalidateCoreWorkflowQueries } from '@/object-core/workflows/utils/invalidateCoreWorkflowQueries';import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';-import { useObjectPermissionsForObject } from '@/object-record/hooks/useObjectPermissionsForObject';-import { canCreateRecordsForObjectMetadataItem } from '@/object-record/utils/canCreateRecordsForObjectMetadataItem';import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';import { useToast } from 'twenty-ui/components/feedback';import {@@ -23,19 +20,9 @@ import { logError } from '~/utils/logError';export const useCreateCoreWorkflow = () => {const apolloCoreClient = useApolloCoreClient();- const canManageWorkflows = useHasPermissionFlag(PermissionFlagType.WORKFLOWS);- const { objectMetadataItem } = useObjectMetadataItem({- objectNameSingular: CoreObjectNameSingular.Workflow,- });- const objectPermissions = useObjectPermissionsForObject(- objectMetadataItem.id,+ const canCreateCoreWorkflow = useHasPermissionFlag(+ PermissionFlagType.WORKFLOWS,);- const canCreateCoreWorkflow =- canManageWorkflows &&- canCreateRecordsForObjectMetadataItem({- objectPermissions,- objectMetadataItem,- });const [createCoreWorkflowMutation] = useMutation<CreateCoreWorkflowMutation,diff --git a/packages/twenty-front/src/pages/object-core/WorkflowCoreShowPage.tsx b/packages/twenty-front/src/pages/object-core/WorkflowCoreShowPage.tsxindex 5b83eec3e9c..f48625a31e3 100644--- a/packages/twenty-front/src/pages/object-core/WorkflowCoreShowPage.tsx+++ b/packages/twenty-front/src/pages/object-core/WorkflowCoreShowPage.tsx@@ -8,7 +8,7 @@ import { isNonEmptyString } from '@sniptt/guards';import { t } from '@lingui/core/macro';import { useCallback } from 'react';import { useParams, useSearchParams } from 'react-router-dom';-import { AppPath, CoreObjectNameSingular } from 'twenty-shared/types';+import { AppPath } from 'twenty-shared/types';import { PermissionFlagType } from 'twenty-shared/constants';import { getAppPath, isDefined } from 'twenty-shared/utils';import { Button } from 'twenty-ui/primitives/input';@@ -23,8 +23,6 @@ import { useCoreWorkflowVersions } from '@/object-core/workflows/versions/hooks/import { invalidateCoreWorkflowVersions } from '@/object-core/workflows/versions/utils/invalidateCoreWorkflowVersions';import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';import { CoreObjectNamePlural } from '@/object-metadata/types/CoreObjectNamePlural';-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';-import { useObjectPermissionsForObject } from '@/object-record/hooks/useObjectPermissionsForObject';import { RecordShowPageResourceEffect } from '@/object-record/record-show/components/RecordShowPageResourceEffect';import { RecordShowContainerContextStoreTargetedRecordsEffect } from '@/object-record/record-show/components/RecordShowContainerContextStoreTargetedRecordsEffect';import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';@@ -197,16 +195,7 @@ export const WorkflowCoreShowPage = () => {const { coreWorkflowId } = useParams<{ coreWorkflowId: string }>();const isCore = useIsWorkflowCoreEnabled();const canManageWorkflows = useHasPermissionFlag(PermissionFlagType.WORKFLOWS);- const { objectMetadataItem } = useObjectMetadataItem({- objectNameSingular: CoreObjectNameSingular.Workflow,- });- const workflowObjectPermissions = useObjectPermissionsForObject(- objectMetadataItem.id,- );- if (- !workflowObjectPermissions.canReadObjectRecords ||- (isCore && !canManageWorkflows)- ) {+ if (!canManageWorkflows) {return (<WorkspaceRouteUnavailable>{t`You do not have permission to access workflows.`}</WorkspaceRouteUnavailable>);