Skip to content

The open alternative to Salesforce, designed for AI.

Show the workflows permission message on the workflows index (#28189)

Thomas Trompetteb108a15fd0fa
diff --git a/packages/twenty-front/src/modules/object-core/workflows/components/CoreWorkflowsPermissionGate.tsx b/packages/twenty-front/src/modules/object-core/workflows/components/CoreWorkflowsPermissionGate.tsx
new file mode 100644
index 00000000000..37357ae5ba1
--- /dev/null
+++ b/packages/twenty-front/src/modules/object-core/workflows/components/CoreWorkflowsPermissionGate.tsx
@@ -0,0 +1,24 @@
+import { t } from '@lingui/core/macro';
+import { type ReactNode } from 'react';
+import { PermissionFlagType } from 'twenty-shared/constants';
+
+import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
+import { WorkspaceRouteUnavailable } from '@/ui/layout/page/components/WorkspaceRouteUnavailable';
+
+type CoreWorkflowsPermissionGateProps = {
+ children: ReactNode;
+};
+
+export const CoreWorkflowsPermissionGate = ({
+ children,
+}: CoreWorkflowsPermissionGateProps) => {
+ const canManageWorkflows = useHasPermissionFlag(PermissionFlagType.WORKFLOWS);
+
+ if (!canManageWorkflows) {
+ return (
+ <WorkspaceRouteUnavailable>{t`You do not have permission to access workflows.`}</WorkspaceRouteUnavailable>
+ );
+ }
+
+ return <>{children}</>;
+};
diff --git a/packages/twenty-front/src/pages/object-core/WorkflowCoreIndexPage.tsx b/packages/twenty-front/src/pages/object-core/WorkflowCoreIndexPage.tsx
index a8f3ae20ade..1f2b4df38db 100644
--- a/packages/twenty-front/src/pages/object-core/WorkflowCoreIndexPage.tsx
+++ b/packages/twenty-front/src/pages/object-core/WorkflowCoreIndexPage.tsx
@@ -26,6 +26,7 @@ import {
useCoreWorkflows,
} from '@/object-core/workflows/hooks/useCoreWorkflows';
import { type CoreWorkflow } from '@/object-core/workflows/types/CoreWorkflow';
+import { CoreWorkflowsPermissionGate } from '@/object-core/workflows/components/CoreWorkflowsPermissionGate';
import { SidePanelToggleButton } from '@/side-panel/components/SidePanelToggleButton';
import { ColoredIcon } from '@/ui/icon/components/ColoredIcon';
import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/useWorkspaceSurfaceScopedComponentInstanceId';
@@ -33,7 +34,7 @@ import { useWorkspaceSurfaceScopedComponentInstanceId } from '@/ui/layout/hooks/
const getCoreWorkflowLink = (workflow: CoreWorkflow) =>
getAppPath(AppPath.WorkflowCoreShowPage, { coreWorkflowId: workflow.id });
-export const WorkflowCoreIndexPage = () => {
+const WorkflowCoreIndexContent = () => {
const tableId = useWorkspaceSurfaceScopedComponentInstanceId(
CORE_WORKFLOWS_TABLE_ID,
);
@@ -146,3 +147,9 @@ export const WorkflowCoreIndexPage = () => {
</CoreObjectIndexPageLayout>
);
};
+
+export const WorkflowCoreIndexPage = () => (
+ <CoreWorkflowsPermissionGate>
+ <WorkflowCoreIndexContent />
+ </CoreWorkflowsPermissionGate>
+);
diff --git a/packages/twenty-front/src/pages/object-core/WorkflowCoreShowPage.tsx b/packages/twenty-front/src/pages/object-core/WorkflowCoreShowPage.tsx
index 1638d0df6f8..2f3682d72d8 100644
--- a/packages/twenty-front/src/pages/object-core/WorkflowCoreShowPage.tsx
+++ b/packages/twenty-front/src/pages/object-core/WorkflowCoreShowPage.tsx
@@ -1,5 +1,6 @@
import { useIsThirdPartyApplication } from '@/applications/hooks/useIsThirdPartyApplication';
import { CoreWorkflowEditor } from '@/object-core/workflows/components/CoreWorkflowEditor';
+import { CoreWorkflowsPermissionGate } from '@/object-core/workflows/components/CoreWorkflowsPermissionGate';
import { CoreObjectIdentifierBar } from '@/object-core/components/CoreObjectIdentifierBar';
import { useRenameCoreWorkflow } from '@/object-core/workflows/hooks/useRenameCoreWorkflow';
import { styled } from '@linaria/react';
@@ -8,7 +9,6 @@ import { t } from '@lingui/core/macro';
import { useCallback } from 'react';
import { useParams, useSearchParams } from 'react-router-dom';
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';
import { themeCssVariables } from 'twenty-ui/theme';
@@ -24,7 +24,6 @@ import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient
import { CoreObjectNamePlural } from '@/object-metadata/types/CoreObjectNamePlural';
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';
import { SidePanelToggleButton } from '@/side-panel/components/SidePanelToggleButton';
import { PageCardHeader } from '@/ui/layout/page/components/PageCardHeader';
import { PageCardLayout } from '@/ui/layout/page/components/PageCardLayout';
@@ -191,19 +190,16 @@ const CoreWorkflowShowContent = ({
export const WorkflowCoreShowPage = () => {
const { coreWorkflowId } = useParams<{ coreWorkflowId: string }>();
- const canManageWorkflows = useHasPermissionFlag(PermissionFlagType.WORKFLOWS);
- if (!canManageWorkflows) {
- return (
- <WorkspaceRouteUnavailable>{t`You do not have permission to access workflows.`}</WorkspaceRouteUnavailable>
- );
- }
- if (!isDefined(coreWorkflowId)) {
- return <WorkspaceRouteUnavailable />;
- }
return (
- <CoreWorkflowShowContent
- key={coreWorkflowId}
- coreWorkflowId={coreWorkflowId}
- />
+ <CoreWorkflowsPermissionGate>
+ {isDefined(coreWorkflowId) ? (
+ <CoreWorkflowShowContent
+ key={coreWorkflowId}
+ coreWorkflowId={coreWorkflowId}
+ />
+ ) : (
+ <WorkspaceRouteUnavailable />
+ )}
+ </CoreWorkflowsPermissionGate>
);
};
diff --git a/packages/twenty-front/src/pages/object-record/__tests__/RecordIndexPage.surface.test.tsx b/packages/twenty-front/src/pages/object-record/__tests__/RecordIndexPage.surface.test.tsx
index c7059b0fcda..0223e943657 100644
--- a/packages/twenty-front/src/pages/object-record/__tests__/RecordIndexPage.surface.test.tsx
+++ b/packages/twenty-front/src/pages/object-record/__tests__/RecordIndexPage.surface.test.tsx
@@ -42,6 +42,10 @@ jest.mock('@/workspace/hooks/useIsFeatureEnabled', () => ({
useIsFeatureEnabled: () => false,
}));
+jest.mock('@/settings/roles/hooks/useHasPermissionFlag', () => ({
+ useHasPermissionFlag: () => true,
+}));
+
jest.mock(
'@/object-record/record-index/components/RecordIndexContainerGater',
() => ({