Skip to content

The open alternative to Salesforce, designed for AI.

Hide private workflows' trigger items by core version id (#27474)

Thomas Trompettea55d0a63da9d
diff --git a/packages/twenty-server/src/engine/core-modules/workflow/services/core-workflow-access.service.ts b/packages/twenty-server/src/engine/core-modules/workflow/services/core-workflow-access.service.ts
index d901926d395..5f89d5bf47b 100644
--- a/packages/twenty-server/src/engine/core-modules/workflow/services/core-workflow-access.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/workflow/services/core-workflow-access.service.ts
@@ -294,23 +294,31 @@ export class CoreWorkflowAccessService {
}
// The command menu lists every member's manual triggers in one read, so the rule comes back as a filter.
- async findInaccessibleWorkspaceWorkflowVersionIds({
+ async findInaccessibleWorkflowVersionIds({
workspaceId,
userWorkspaceId,
+ coreWorkflowVersionIds,
workspaceWorkflowVersionIds,
}: {
workspaceId: string;
userWorkspaceId: string | undefined;
+ coreWorkflowVersionIds: string[];
workspaceWorkflowVersionIds: string[];
}): Promise<Set<string>> {
- if (workspaceWorkflowVersionIds.length === 0) {
+ if (
+ coreWorkflowVersionIds.length === 0 &&
+ workspaceWorkflowVersionIds.length === 0
+ ) {
return new Set();
}
const coreWorkflowVersions = await this.coreWorkflowVersionRepository.find(
workspaceId,
{
- where: { workspaceWorkflowVersionId: In(workspaceWorkflowVersionIds) },
+ where: [
+ { id: In(coreWorkflowVersionIds) },
+ { workspaceWorkflowVersionId: In(workspaceWorkflowVersionIds) },
+ ],
select: {
id: true,
coreWorkflowId: true,
@@ -337,11 +345,10 @@ export class CoreWorkflowAccessService {
return new Set(
coreWorkflowVersions.flatMap(
- ({ coreWorkflowId, workspaceWorkflowVersionId }) =>
+ ({ id, coreWorkflowId, workspaceWorkflowVersionId }) =>
isDefined(coreWorkflowId) &&
- isDefined(workspaceWorkflowVersionId) &&
inaccessibleCoreWorkflowIds.has(coreWorkflowId)
- ? [workspaceWorkflowVersionId]
+ ? [id, workspaceWorkflowVersionId].filter(isDefined)
: [],
),
);
diff --git a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/command-menu-item.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/command-menu-item.resolver.ts
index f4200864528..1096dbb3b63 100644
--- a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/command-menu-item.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/command-menu-item.resolver.ts
@@ -212,21 +212,25 @@ export class CommandMenuItemResolver {
workspaceId: string;
userWorkspaceId: string | undefined;
}): Promise<CommandMenuItemDTO[]> {
- const inaccessibleWorkspaceWorkflowVersionIds =
- await this.coreWorkflowAccessService.findInaccessibleWorkspaceWorkflowVersionIds(
- {
- workspaceId,
- userWorkspaceId,
- workspaceWorkflowVersionIds: commandMenuItems
- .map(({ workflowVersionId }) => workflowVersionId)
- .filter(isDefined),
- },
- );
+ const inaccessibleWorkflowVersionIds =
+ await this.coreWorkflowAccessService.findInaccessibleWorkflowVersionIds({
+ workspaceId,
+ userWorkspaceId,
+ coreWorkflowVersionIds: commandMenuItems
+ .map(({ coreWorkflowVersionId }) => coreWorkflowVersionId)
+ .filter(isDefined),
+ workspaceWorkflowVersionIds: commandMenuItems
+ .map(({ workflowVersionId }) => workflowVersionId)
+ .filter(isDefined),
+ });
return commandMenuItems.filter(
- ({ workflowVersionId }) =>
- !isDefined(workflowVersionId) ||
- !inaccessibleWorkspaceWorkflowVersionIds.has(workflowVersionId),
+ ({ coreWorkflowVersionId, workflowVersionId }) =>
+ ![coreWorkflowVersionId, workflowVersionId].some(
+ (workflowVersionIdToCheck) =>
+ isDefined(workflowVersionIdToCheck) &&
+ inaccessibleWorkflowVersionIds.has(workflowVersionIdToCheck),
+ ),
);
}
}
diff --git a/packages/twenty-server/test/integration/graphql/suites/workflow/core-workflow-visibility.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/workflow/core-workflow-visibility.integration-spec.ts
index 339c64c8bb1..e10ab405aad 100644
--- a/packages/twenty-server/test/integration/graphql/suites/workflow/core-workflow-visibility.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/workflow/core-workflow-visibility.integration-spec.ts
@@ -11,6 +11,8 @@ import { deleteOneRole } from 'test/integration/metadata/suites/role/utils/delet
import { findOneRoleByLabel } from 'test/integration/metadata/suites/role/utils/find-one-role-by-label.util';
import { updateWorkspaceMemberRole } from 'test/integration/metadata/suites/role/utils/update-workspace-member-role.util';
import { upsertPermissionFlags } from 'test/integration/metadata/suites/role-permission-flag/utils/upsert-permission-flags.util';
+import { createCommandMenuItem } from 'test/integration/metadata/suites/command-menu-item/utils/create-command-menu-item.util';
+import { deleteCommandMenuItem } from 'test/integration/metadata/suites/command-menu-item/utils/delete-command-menu-item.util';
import { findCommandMenuItems } from 'test/integration/metadata/suites/command-menu-item/utils/find-command-menu-items.util';
import { pollWorkflowGraphqlRequest } from 'test/integration/graphql/suites/workflow/utils/poll-workflow-graphql-request.util';
import { updateWorkflowVersionTrigger } from 'test/integration/graphql/suites/workflow/utils/update-workflow-version-trigger.util';
@@ -18,6 +20,7 @@ import { workflowGraphqlRequest } from 'test/integration/graphql/suites/workflow
import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';
import { type AgentExecutionResult } from 'src/engine/metadata-modules/ai/ai-agent-execution/types/agent-execution-result.type';
+import { EngineComponentKey } from 'src/engine/metadata-modules/command-menu-item/enums/engine-component-key.enum';
import { type UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';
import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';
import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
@@ -614,7 +617,10 @@ describe('core workflow visibility (e2e)', () => {
let manualCoreWorkflowId: string;
let manualWorkspaceWorkflowVersionId: string;
- const listCommandMenuItemWorkflowVersionIds = async (token: string) => {
+ const listCommandMenuItemValues = async (
+ token: string,
+ field: 'id' | 'workflowVersionId' = 'workflowVersionId',
+ ) => {
const { data } = await findCommandMenuItems({
expectToFail: false,
gqlFields: 'id workflowVersionId',
@@ -623,7 +629,7 @@ describe('core workflow visibility (e2e)', () => {
});
return data.commandMenuItems.map(
- ({ workflowVersionId }) => workflowVersionId,
+ (commandMenuItem) => commandMenuItem[field],
);
};
@@ -653,9 +659,7 @@ describe('core workflow visibility (e2e)', () => {
it('puts its command menu item in every member command menu', async () => {
expect(
- await listCommandMenuItemWorkflowVersionIds(
- APPLE_JONY_MEMBER_ACCESS_TOKEN,
- ),
+ await listCommandMenuItemValues(APPLE_JONY_MEMBER_ACCESS_TOKEN),
).toContain(manualWorkspaceWorkflowVersionId);
});
@@ -668,16 +672,48 @@ describe('core workflow visibility (e2e)', () => {
expect(response.body.errors).toBeUndefined();
expect(
- await listCommandMenuItemWorkflowVersionIds(
- APPLE_JONY_MEMBER_ACCESS_TOKEN,
- ),
+ await listCommandMenuItemValues(APPLE_JONY_MEMBER_ACCESS_TOKEN),
).not.toContain(manualWorkspaceWorkflowVersionId);
expect(
- await listCommandMenuItemWorkflowVersionIds(
- APPLE_JANE_ADMIN_ACCESS_TOKEN,
- ),
+ await listCommandMenuItemValues(APPLE_JANE_ADMIN_ACCESS_TOKEN),
).toContain(manualWorkspaceWorkflowVersionId);
});
+
+ it('takes out an item that only carries the core version id', async () => {
+ await setVisibility(manualCoreWorkflowId, WorkflowVisibility.PRIVATE);
+
+ const versionResponse = await workflowGraphqlRequest(
+ CORE_WORKFLOW_VERSION_QUERY,
+ { workspaceWorkflowVersionId: manualWorkspaceWorkflowVersionId },
+ );
+ const coreWorkflowVersionId: string =
+ versionResponse.body.data.coreWorkflowVersion.id;
+
+ const { data } = await createCommandMenuItem({
+ expectToFail: false,
+ input: {
+ coreWorkflowVersionId,
+ engineComponentKey: EngineComponentKey.TRIGGER_WORKFLOW_VERSION,
+ label: 'Core-only manual trigger',
+ },
+ gqlFields: 'id',
+ });
+ const coreOnlyCommandMenuItemId = data.createCommandMenuItem.id;
+
+ try {
+ expect(
+ await listCommandMenuItemValues(APPLE_JONY_MEMBER_ACCESS_TOKEN, 'id'),
+ ).not.toContain(coreOnlyCommandMenuItemId);
+ expect(
+ await listCommandMenuItemValues(APPLE_JANE_ADMIN_ACCESS_TOKEN, 'id'),
+ ).toContain(coreOnlyCommandMenuItemId);
+ } finally {
+ await deleteCommandMenuItem({
+ expectToFail: false,
+ input: { id: coreOnlyCommandMenuItemId },
+ });
+ }
+ });
});
describe('the runs of a workflow', () => {