Skip to content

The open alternative to Salesforce, designed for AI.

Make workflow commands, navigation and pages core-only (#27853)

Thomas Trompette24a2d2a86a18
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
index ac32c4a6d3a..42216398e84 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
@@ -2097,7 +2097,6 @@ enum FeatureFlagKey {
IS_RECORD_SHARE_VISIBILITY_GATING_ENABLED
IS_REST_METADATA_API_NEW_FORMAT_DIRECT
IS_VALIDATION_RULES_ENABLED
- IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED
}
type Field {
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.ts
index 82db05849b8..3c6c0c48b80 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts
+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts
@@ -1336,7 +1336,7 @@ export interface FeatureFlag {
__typename: 'FeatureFlag'
}
-export type FeatureFlagKey = 'IS_AI_CHAT_INBOX_ENABLED' | 'IS_AI_CHAT_SHARING_DROPDOWN_ENABLED' | 'IS_APPLICATION_WORKFLOWS_ENABLED' | 'IS_APP_PREFERENCES_ENABLED' | 'IS_ASYNC_CSV_EXPORT_ENABLED' | 'IS_CALENDAR_SYNC_SKIP_UNCHANGED_RECORDS_ENABLED' | 'IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED' | 'IS_DEFERRED_WORKSPACE_MIGRATION_ACTIONS_ENABLED' | 'IS_INITIAL_OBJECT_VIEW_ENABLED' | 'IS_JSON_FILTER_ENABLED' | 'IS_LOGS_SETTINGS_SECTION_ENABLED' | 'IS_MESSAGE_CAMPAIGN_ENABLED' | 'IS_RECORD_CREATION_FORM_ENABLED' | 'IS_RECORD_LEVEL_SHARING_ENABLED' | 'IS_RECORD_SHARE_VISIBILITY_GATING_ENABLED' | 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT' | 'IS_VALIDATION_RULES_ENABLED' | 'IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED'
+export type FeatureFlagKey = 'IS_AI_CHAT_INBOX_ENABLED' | 'IS_AI_CHAT_SHARING_DROPDOWN_ENABLED' | 'IS_APPLICATION_WORKFLOWS_ENABLED' | 'IS_APP_PREFERENCES_ENABLED' | 'IS_ASYNC_CSV_EXPORT_ENABLED' | 'IS_CALENDAR_SYNC_SKIP_UNCHANGED_RECORDS_ENABLED' | 'IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED' | 'IS_DEFERRED_WORKSPACE_MIGRATION_ACTIONS_ENABLED' | 'IS_INITIAL_OBJECT_VIEW_ENABLED' | 'IS_JSON_FILTER_ENABLED' | 'IS_LOGS_SETTINGS_SECTION_ENABLED' | 'IS_MESSAGE_CAMPAIGN_ENABLED' | 'IS_RECORD_CREATION_FORM_ENABLED' | 'IS_RECORD_LEVEL_SHARING_ENABLED' | 'IS_RECORD_SHARE_VISIBILITY_GATING_ENABLED' | 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT' | 'IS_VALIDATION_RULES_ENABLED'
export interface Field {
applicationId: Scalars['UUID']
@@ -11496,8 +11496,7 @@ export const enumFeatureFlagKey = {
IS_RECORD_LEVEL_SHARING_ENABLED: 'IS_RECORD_LEVEL_SHARING_ENABLED' as const,
IS_RECORD_SHARE_VISIBILITY_GATING_ENABLED: 'IS_RECORD_SHARE_VISIBILITY_GATING_ENABLED' as const,
IS_REST_METADATA_API_NEW_FORMAT_DIRECT: 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT' as const,
- IS_VALIDATION_RULES_ENABLED: 'IS_VALIDATION_RULES_ENABLED' as const,
- IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED: 'IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED' as const
+ IS_VALIDATION_RULES_ENABLED: 'IS_VALIDATION_RULES_ENABLED' as const
}
export const enumFieldDisplayMode = {
diff --git a/packages/twenty-e2e-testing/lib/fixtures/blank-workflow.ts b/packages/twenty-e2e-testing/lib/fixtures/blank-workflow.ts
index 5926c205162..f5feeb137d0 100644
--- a/packages/twenty-e2e-testing/lib/fixtures/blank-workflow.ts
+++ b/packages/twenty-e2e-testing/lib/fixtures/blank-workflow.ts
@@ -1,8 +1,6 @@
import { test as base, expect, Locator, Page } from '@playwright/test';
-import { randomUUID } from 'node:crypto';
-import { createWorkflow } from '../requests/create-workflow';
-import { deleteWorkflow } from '../requests/delete-workflow';
-import { destroyWorkflow } from '../requests/destroy-workflow';
+import { createCoreWorkflow } from '../requests/create-core-workflow';
+import { deleteCoreWorkflows } from '../requests/delete-core-workflows';
import { WorkflowActionType, WorkflowTriggerType } from '../types/workflows';
export class WorkflowVisualizerPage {
@@ -95,20 +93,17 @@ export class WorkflowVisualizerPage {
}
async createOneWorkflow() {
- const id = randomUUID();
-
await this.#page.goto('/');
- const response = await createWorkflow({
+ const response = await createCoreWorkflow({
page: this.#page,
- workflowId: id,
workflowName: this.workflowName,
});
expect(response.status).toBe(200);
- expect(response.body.data?.createWorkflow.id).toBe(id);
+ expect(response.body.errors).toBeUndefined();
- this.workflowId = id;
+ this.workflowId = response.body.data!.createCoreWorkflow.id;
}
async waitForWorkflowVisualizerLoad() {
@@ -116,17 +111,7 @@ export class WorkflowVisualizerPage {
}
async goToWorkflowVisualizerPage() {
- await this.#page.goto(`/`);
-
- const workflowsLink = this.#page.getByRole('link', { name: 'Workflows' });
-
- await workflowsLink.click();
-
- const workflowLink = this.#page
- .getByTestId(`row-id-${this.workflowId}`)
- .getByRole('link', { name: this.workflowName });
-
- await workflowLink.click({ force: true });
+ await this.#page.goto(`/workflow/${this.workflowId}`);
await this.waitForWorkflowVisualizerLoad();
}
@@ -162,14 +147,12 @@ export class WorkflowVisualizerPage {
const requestBody = response.request().postDataJSON();
- return requestBody.operationName === 'CreateWorkflowVersionStep';
+ return requestBody.operationName === 'CreateCoreWorkflowVersionStep';
},
);
- const createWorkflowStepResponseBody =
- await createWorkflowStepResponse.json();
- const createdStepId =
- createWorkflowStepResponseBody.data.createWorkflowVersionStep.id;
+ const createdStepId = createWorkflowStepResponse.request().postDataJSON()
+ .variables.input.id;
const createdActionNode = this.#page
.locator('.react-flow__node.selected')
@@ -218,7 +201,7 @@ export class WorkflowVisualizerPage {
const requestBody = response.request().postDataJSON();
return (
- requestBody.operationName === 'DeleteWorkflowVersionStep' &&
+ requestBody.operationName === 'DeleteCoreWorkflowVersionStep' &&
requestBody.variables.input.stepId === stepId
);
}),
@@ -240,7 +223,7 @@ export class WorkflowVisualizerPage {
const requestBody = response.request().postDataJSON();
return (
- requestBody.operationName === 'UpdateOneWorkflowVersion' &&
+ requestBody.operationName === 'UpdateCoreWorkflowVersionTrigger' &&
requestBody.variables.input.trigger === null
);
}),
@@ -258,37 +241,6 @@ export class WorkflowVisualizerPage {
await expect(this.#page.getByTestId('command-menu')).not.toBeVisible();
}
-
- async goToWorkflowsIndexPage() {
- await this.#page.goto('/objects/workflows');
- }
-
- async setWorkflowsOpenInMode(mode: 'side-panel' | 'record-page') {
- const recordTableOptionsButton = this.#page.getByText('Options');
- await recordTableOptionsButton.click();
-
- const layoutButton = this.#page.getByText('Layout');
- await layoutButton.click();
-
- const openInButton = this.#page.getByText('Open in');
- await openInButton.click();
-
- if (mode === 'side-panel') {
- const openInSidePanelOption = this.#page.getByRole('option', {
- name: 'Side Panel',
- });
-
- await openInSidePanelOption.click();
- } else {
- const openInRecordPageOption = this.#page.getByRole('option', {
- name: 'Record Page',
- });
-
- await openInRecordPageOption.click();
- }
-
- await recordTableOptionsButton.click();
- }
}
export const test = base.extend<{
@@ -305,16 +257,9 @@ export const test = base.extend<{
await use(workflowVisualizer);
- await deleteWorkflow({
- page,
- workflowId: workflowVisualizer.workflowId,
- });
- await destroyWorkflow({
+ await deleteCoreWorkflows({
page,
- workflowId: workflowVisualizer.workflowId,
+ coreWorkflowIds: [workflowVisualizer.workflowId],
});
-
- await workflowVisualizer.goToWorkflowsIndexPage();
- await workflowVisualizer.setWorkflowsOpenInMode('record-page');
},
});
diff --git a/packages/twenty-e2e-testing/lib/requests/create-core-workflow.ts b/packages/twenty-e2e-testing/lib/requests/create-core-workflow.ts
new file mode 100644
index 00000000000..57cc8663872
--- /dev/null
+++ b/packages/twenty-e2e-testing/lib/requests/create-core-workflow.ts
@@ -0,0 +1,24 @@
+import { type Page } from '@playwright/test';
+import { postBackendGraphQL } from './post-backend-graphql';
+
+export const createCoreWorkflow = async ({
+ page,
+ workflowName,
+}: {
+ page: Page;
+ workflowName: string;
+}) => {
+ return postBackendGraphQL<{ createCoreWorkflow: { id: string } }>({
+ page,
+ data: {
+ operationName: 'CreateCoreWorkflow',
+ query:
+ 'mutation CreateCoreWorkflow($input: CreateCoreWorkflowInput!) {\n createCoreWorkflow(input: $input) {\n id\n }\n}',
+ variables: {
+ input: {
+ name: workflowName,
+ },
+ },
+ },
+ });
+};
diff --git a/packages/twenty-e2e-testing/lib/requests/create-workflow.ts b/packages/twenty-e2e-testing/lib/requests/create-workflow.ts
deleted file mode 100644
index 45ff290f58f..00000000000
--- a/packages/twenty-e2e-testing/lib/requests/create-workflow.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { type Page } from '@playwright/test';
-import { postBackendGraphQL } from './post-backend-graphql';
-
-export const createWorkflow = async ({
- page,
- workflowId,
- workflowName,
-}: {
- page: Page;
- workflowId: string;
- workflowName: string;
-}) => {
- return postBackendGraphQL<{ createWorkflow: { id: string } }>({
- page,
- data: {
- operationName: 'CreateOneWorkflow',
- query:
- 'mutation CreateOneWorkflow($input: WorkflowCreateInput!) { createWorkflow(data: $input) { __typename id } }',
- variables: {
- input: {
- id: workflowId,
- name: workflowName,
- },
- },
- },
- });
-};
diff --git a/packages/twenty-e2e-testing/lib/requests/delete-core-workflows.ts b/packages/twenty-e2e-testing/lib/requests/delete-core-workflows.ts
new file mode 100644
index 00000000000..6c61ca57956
--- /dev/null
+++ b/packages/twenty-e2e-testing/lib/requests/delete-core-workflows.ts
@@ -0,0 +1,20 @@
+import { type Page } from '@playwright/test';
+import { postBackendGraphQL } from './post-backend-graphql';
+
+export const deleteCoreWorkflows = async ({
+ page,
+ coreWorkflowIds,
+}: {
+ page: Page;
+ coreWorkflowIds: string[];
+}) => {
+ return postBackendGraphQL({
+ page,
+ data: {
+ operationName: 'DeleteCoreWorkflows',
+ variables: { input: { coreWorkflowIds } },
+ query:
+ 'mutation DeleteCoreWorkflows($input: DeleteCoreWorkflowsInput!) {\n deleteCoreWorkflows(input: $input) {\n id\n }\n}',
+ },
+ });
+};
diff --git a/packages/twenty-e2e-testing/lib/requests/delete-workflow.ts b/packages/twenty-e2e-testing/lib/requests/delete-workflow.ts
deleted file mode 100644
index a374bee8a4e..00000000000
--- a/packages/twenty-e2e-testing/lib/requests/delete-workflow.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { type Page } from '@playwright/test';
-import { postBackendGraphQL } from './post-backend-graphql';
-
-export const deleteWorkflow = async ({
- page,
- workflowId,
-}: {
- page: Page;
- workflowId: string;
-}) => {
- return postBackendGraphQL({
- page,
- data: {
- operationName: 'DeleteOneWorkflow',
- variables: { idToDelete: workflowId },
- query:
- 'mutation DeleteOneWorkflow($idToDelete: UUID!) {\n deleteWorkflow(id: $idToDelete) {\n __typename\n deletedAt\n id\n }\n}',
- },
- });
-};
diff --git a/packages/twenty-e2e-testing/lib/requests/destroy-workflow.ts b/packages/twenty-e2e-testing/lib/requests/destroy-workflow.ts
deleted file mode 100644
index fbe1a062f70..00000000000
--- a/packages/twenty-e2e-testing/lib/requests/destroy-workflow.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { type Page } from '@playwright/test';
-import { postBackendGraphQL } from './post-backend-graphql';
-
-export const destroyWorkflow = async ({
- page,
- workflowId,
-}: {
- page: Page;
- workflowId: string;
-}) => {
- return postBackendGraphQL({
- page,
- data: {
- operationName: 'DestroyOneWorkflow',
- variables: { idToDestroy: workflowId },
- query:
- 'mutation DestroyOneWorkflow($idToDestroy: UUID!) {\n destroyWorkflow(id: $idToDestroy) {\n id\n __typename\n }\n}',
- },
- });
-};
diff --git a/packages/twenty-e2e-testing/tests/workflow-creation.spec.ts b/packages/twenty-e2e-testing/tests/workflow-creation.spec.ts
index de42abbb7da..51f00e1cdb6 100644
--- a/packages/twenty-e2e-testing/tests/workflow-creation.spec.ts
+++ b/packages/twenty-e2e-testing/tests/workflow-creation.spec.ts
@@ -1,10 +1,7 @@
import { expect, test } from '../lib/fixtures/screenshot';
-import { deleteWorkflow } from '../lib/requests/delete-workflow';
-import { destroyWorkflow } from '../lib/requests/destroy-workflow';
+import { deleteCoreWorkflows } from '../lib/requests/delete-core-workflows';
test('Create workflow', async ({ page }) => {
- const NEW_WORKFLOW_NAME = 'Test Workflow';
-
await page.goto(process.env.LINK);
const workflowsFolder = page.getByRole('button', { name: 'Workflows' });
@@ -13,13 +10,6 @@ test('Create workflow', async ({ page }) => {
const workflowsLink = page.getByRole('link', { name: 'Workflows' });
await workflowsLink.click();
- await page.getByRole('button', { name: 'Create Workflow' }).click();
-
- const recordCreationForm = page.getByRole('complementary');
- await recordCreationForm
- .getByRole('textbox', { name: 'Name' })
- .fill(NEW_WORKFLOW_NAME);
-
const [createWorkflowResponse] = await Promise.all([
page.waitForResponse(async (response) => {
if (!response.url().endsWith('/graphql')) {
@@ -28,33 +18,22 @@ test('Create workflow', async ({ page }) => {
const requestBody = response.request().postDataJSON();
- return requestBody.operationName === 'CreateOneWorkflow';
+ return requestBody.operationName === 'CreateCoreWorkflow';
}),
- recordCreationForm.getByRole('button', { name: 'Create' }).click(),
+ page.getByText('New Workflow').click(),
]);
const body = await createWorkflowResponse.json();
expect(body.errors).toBeUndefined();
- const newWorkflowId = body.data.createWorkflow.id;
+ const newCoreWorkflowId = body.data.createCoreWorkflow.id;
try {
- const workflowName = page
- .getByTestId('top-bar-title')
- .getByText(NEW_WORKFLOW_NAME);
-
- await workflowName.waitFor({ state: 'visible' });
- await expect(workflowName).toBeVisible();
-
- await expect(page).toHaveURL(`/object/workflow/${newWorkflowId}`);
+ await expect(page).toHaveURL(`/workflow/${newCoreWorkflowId}`);
} finally {
- await deleteWorkflow({
- page,
- workflowId: newWorkflowId,
- });
- await destroyWorkflow({
+ await deleteCoreWorkflows({
page,
- workflowId: newWorkflowId,
+ coreWorkflowIds: [newCoreWorkflowId],
});
}
});
diff --git a/packages/twenty-front/src/generated-admin/graphql.ts b/packages/twenty-front/src/generated-admin/graphql.ts
index d092ec51c5f..6ff571e7e7b 100644
--- a/packages/twenty-front/src/generated-admin/graphql.ts
+++ b/packages/twenty-front/src/generated-admin/graphql.ts
@@ -491,8 +491,7 @@ export enum FeatureFlagKey {
IS_RECORD_LEVEL_SHARING_ENABLED = 'IS_RECORD_LEVEL_SHARING_ENABLED',
IS_RECORD_SHARE_VISIBILITY_GATING_ENABLED = 'IS_RECORD_SHARE_VISIBILITY_GATING_ENABLED',
IS_REST_METADATA_API_NEW_FORMAT_DIRECT = 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT',
- IS_VALIDATION_RULES_ENABLED = 'IS_VALIDATION_RULES_ENABLED',
- IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED = 'IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED'
+ IS_VALIDATION_RULES_ENABLED = 'IS_VALIDATION_RULES_ENABLED'
}
export type FindApplicationRegistrationInstalledWorkspacesInput = {
diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.ts
index d387ec35168..c5bf5d99194 100644
--- a/packages/twenty-front/src/generated-metadata/graphql.ts
+++ b/packages/twenty-front/src/generated-metadata/graphql.ts
@@ -2214,8 +2214,7 @@ export enum FeatureFlagKey {
IS_RECORD_LEVEL_SHARING_ENABLED = 'IS_RECORD_LEVEL_SHARING_ENABLED',
IS_RECORD_SHARE_VISIBILITY_GATING_ENABLED = 'IS_RECORD_SHARE_VISIBILITY_GATING_ENABLED',
IS_REST_METADATA_API_NEW_FORMAT_DIRECT = 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT',
- IS_VALIDATION_RULES_ENABLED = 'IS_VALIDATION_RULES_ENABLED',
- IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED = 'IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED'
+ IS_VALIDATION_RULES_ENABLED = 'IS_VALIDATION_RULES_ENABLED'
}
export type Field = {
diff --git a/packages/twenty-front/src/generated/graphql.ts b/packages/twenty-front/src/generated/graphql.ts
index 3a3d24f946f..2ff11b4dbed 100644
--- a/packages/twenty-front/src/generated/graphql.ts
+++ b/packages/twenty-front/src/generated/graphql.ts
@@ -1471,20 +1471,6 @@ export type TestHttpRequestMutationVariables = Exact<{
export type TestHttpRequestMutation = { __typename?: 'Mutation', testHttpRequest: { __typename?: 'TestHttpRequest', success: boolean, message: string, result?: any | null, error?: any | null, status?: number | null, statusText?: string | null, headers?: any | null } };
-export type UpdateWorkflowVersionPositionsMutationVariables = Exact<{
- input: UpdateWorkflowVersionPositionsInput;
-}>;
-
-
-export type UpdateWorkflowVersionPositionsMutation = { __typename?: 'Mutation', updateWorkflowVersionPositions: boolean };
-
-export type GetWorkflowVersionContentQueryVariables = Exact<{
- workflowVersionId: Scalars['UUID']['input'];
-}>;
-
-
-export type GetWorkflowVersionContentQuery = { __typename?: 'Query', workflowVersionContent: { __typename?: 'WorkflowVersionContent', workflowVersionId: any, trigger?: any | null, steps?: any | null } };
-
export const TimelineCalendarEventParticipantFragmentFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"TimelineCalendarEventParticipantFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"TimelineCalendarEventParticipant"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"personId"}},{"kind":"Field","name":{"kind":"Name","value":"workspaceMemberId"}},{"kind":"Field","name":{"kind":"Name","value":"firstName"}},{"kind":"Field","name":{"kind":"Name","value":"lastName"}},{"kind":"Field","name":{"kind":"Name","value":"displayName"}},{"kind":"Field","name":{"kind":"Name","value":"avatarUrl"}},{"kind":"Field","name":{"kind":"Name","value":"handle"}}]}}]} as unknown as DocumentNode<TimelineCalendarEventParticipantFragmentFragment, unknown>;
export const TimelineCalendarEventCallRecordingFragmentFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"TimelineCalendarEventCallRecordingFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"TimelineCalendarEventCallRecording"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"applicationId"}}]}}]} as unknown as DocumentNode<TimelineCalendarEventCallRecordingFragmentFragment, unknown>;
export const TimelineCalendarEventFragmentFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"TimelineCalendarEventFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"TimelineCalendarEvent"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"location"}},{"kind":"Field","name":{"kind":"Name","value":"startsAt"}},{"kind":"Field","name":{"kind":"Name","value":"endsAt"}},{"kind":"Field","name":{"kind":"Name","value":"isFullDay"}},{"kind":"Field","name":{"kind":"Name","value":"visibility"}},{"kind":"Field","name":{"kind":"Name","value":"participants"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"TimelineCalendarEventParticipantFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"callRecordings"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"TimelineCalendarEventCallRecordingFragment"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"TimelineCalendarEventParticipantFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"TimelineCalendarEventParticipant"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"personId"}},{"kind":"Field","name":{"kind":"Name","value":"workspaceMemberId"}},{"kind":"Field","name":{"kind":"Name","value":"firstName"}},{"kind":"Field","name":{"kind":"Name","value":"lastName"}},{"kind":"Field","name":{"kind":"Name","value":"displayName"}},{"kind":"Field","name":{"kind":"Name","value":"avatarUrl"}},{"kind":"Field","name":{"kind":"Name","value":"handle"}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"TimelineCalendarEventCallRecordingFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"TimelineCalendarEventCallRecording"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"applicationId"}}]}}]} as unknown as DocumentNode<TimelineCalendarEventFragmentFragment, unknown>;
@@ -1528,6 +1514,4 @@ export const StopWorkflowRunDocument = {"kind":"Document","definitions":[{"kind"
export const SubmitFormStepDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SubmitFormStep"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"SubmitFormStepInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"submitFormStep"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}]}]}}]} as unknown as DocumentNode<SubmitFormStepMutation, SubmitFormStepMutationVariables>;
export const UpdateWorkflowRunStepDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateWorkflowRunStep"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateWorkflowRunStepInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateWorkflowRunStep"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"settings"}},{"kind":"Field","name":{"kind":"Name","value":"valid"}},{"kind":"Field","name":{"kind":"Name","value":"nextStepIds"}},{"kind":"Field","name":{"kind":"Name","value":"position"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"x"}},{"kind":"Field","name":{"kind":"Name","value":"y"}}]}}]}}]}}]} as unknown as DocumentNode<UpdateWorkflowRunStepMutation, UpdateWorkflowRunStepMutationVariables>;
export const WorkflowStepConnectedAccountHandleDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"WorkflowStepConnectedAccountHandle"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"connectedAccountId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"workflowStepConnectedAccountHandle"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"connectedAccountId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"connectedAccountId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"handle"}},{"kind":"Field","name":{"kind":"Name","value":"provider"}},{"kind":"Field","name":{"kind":"Name","value":"handleAliases"}}]}}]}}]} as unknown as DocumentNode<WorkflowStepConnectedAccountHandleQuery, WorkflowStepConnectedAccountHandleQueryVariables>;
-export const TestHttpRequestDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"TestHttpRequest"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"TestHttpRequestInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"testHttpRequest"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"success"}},{"kind":"Field","name":{"kind":"Name","value":"message"}},{"kind":"Field","name":{"kind":"Name","value":"result"}},{"kind":"Field","name":{"kind":"Name","value":"error"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"statusText"}},{"kind":"Field","name":{"kind":"Name","value":"headers"}}]}}]}}]} as unknown as DocumentNode<TestHttpRequestMutation, TestHttpRequestMutationVariables>;
-export const UpdateWorkflowVersionPositionsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateWorkflowVersionPositions"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateWorkflowVersionPositionsInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateWorkflowVersionPositions"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}]}]}}]} as unknown as DocumentNode<UpdateWorkflowVersionPositionsMutation, UpdateWorkflowVersionPositionsMutationVariables>;
-export const GetWorkflowVersionContentDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetWorkflowVersionContent"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"workflowVersionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"workflowVersionContent"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"workflowVersionId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"workflowVersionId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"workflowVersionId"}},{"kind":"Field","name":{"kind":"Name","value":"trigger"}},{"kind":"Field","name":{"kind":"Name","value":"steps"}}]}}]}}]} as unknown as DocumentNode<GetWorkflowVersionContentQuery, GetWorkflowVersionContentQueryVariables>;
\ No newline at end of file
+export const TestHttpRequestDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"TestHttpRequest"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"TestHttpRequestInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"testHttpRequest"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"success"}},{"kind":"Field","name":{"kind":"Name","value":"message"}},{"kind":"Field","name":{"kind":"Name","value":"result"}},{"kind":"Field","name":{"kind":"Name","value":"error"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"statusText"}},{"kind":"Field","name":{"kind":"Name","value":"headers"}}]}}]}}]} as unknown as DocumentNode<TestHttpRequestMutation, TestHttpRequestMutationVariables>;
\ No newline at end of file
diff --git a/packages/twenty-front/src/modules/command-menu-item/contexts/CommandMenuContextProviderContent.tsx b/packages/twenty-front/src/modules/command-menu-item/contexts/CommandMenuContextProviderContent.tsx
index 29669c2ef6b..5a53f13a461 100644
--- a/packages/twenty-front/src/modules/command-menu-item/contexts/CommandMenuContextProviderContent.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/contexts/CommandMenuContextProviderContent.tsx
@@ -1,6 +1,5 @@
import { useGlobalRecordCreationCommandMenuItems } from '@/command-menu-item/hooks/useGlobalRecordCreationCommandMenuItems';
import { CommandMenuItemContainerType } from '@/command-menu-item/types/CommandMenuItemContainerType';
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
import {
CommandMenuContext,
type CommandMenuContextType,
@@ -63,11 +62,9 @@ export const CommandMenuContextProviderContent = ({
commandMenuContextApi,
isInPreviewMode,
}: CommandMenuContextProviderContentProps) => {
- const isCore = useIsWorkflowCoreEnabled();
const isCoreWorkflow =
- isCore &&
commandMenuContextApi.objectMetadataItem.nameSingular ===
- CoreObjectNameSingular.Workflow;
+ CoreObjectNameSingular.Workflow;
const isCoreWorkflowIndex =
isCoreWorkflow &&
commandMenuContextApi.pageType === ContextStorePageType.Index;
@@ -120,9 +117,8 @@ export const CommandMenuContextProviderContent = ({
)
.filter(
(item) =>
- !isCore ||
item.engineComponentKey !==
- EngineComponentKey.SEE_VERSION_WORKFLOW_RUN,
+ EngineComponentKey.SEE_VERSION_WORKFLOW_RUN,
)
.filter(
(item) =>
@@ -162,7 +158,6 @@ export const CommandMenuContextProviderContent = ({
commandMenuContextApiForAvailability,
globalRecordCreationCommandMenuItems,
shouldDisplayGlobalRecordCreationCommands,
- isCore,
isCoreWorkflow,
commandMenuItems,
commandMenuItemsDraft,
diff --git a/packages/twenty-front/src/modules/command-menu-item/contexts/CommandMenuContextProviderWithWorkflowEnrichment.tsx b/packages/twenty-front/src/modules/command-menu-item/contexts/CommandMenuContextProviderWithWorkflowEnrichment.tsx
index 6881debfc47..0c6537f4d88 100644
--- a/packages/twenty-front/src/modules/command-menu-item/contexts/CommandMenuContextProviderWithWorkflowEnrichment.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/contexts/CommandMenuContextProviderWithWorkflowEnrichment.tsx
@@ -6,8 +6,6 @@ import { isDefined } from 'twenty-shared/utils';
import { type CommandMenuContextType } from '@/command-menu-item/contexts/CommandMenuContext';
import { useCoreWorkflowsWithCurrentVersions } from '@/command-menu-item/hooks/useCoreWorkflowsWithCurrentVersions';
-import { useWorkflowsWithCurrentVersions } from '@/command-menu-item/hooks/useWorkflowsWithCurrentVersions';
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
import { CommandMenuContextProviderContent } from './CommandMenuContextProviderContent';
@@ -28,19 +26,11 @@ export const CommandMenuContextProviderWithWorkflowEnrichment = ({
selectedWorkflowRecordIds,
isInPreviewMode,
}: CommandMenuContextProviderWithWorkflowEnrichmentProps) => {
- const isCore = useIsWorkflowCoreEnabled();
const currentWorkspace = useAtomStateValue(currentWorkspaceState);
- const workflowsWithCurrentVersions = useWorkflowsWithCurrentVersions(
- isCore ? [] : selectedWorkflowRecordIds,
- );
const coreWorkflowsWithCurrentVersions = useCoreWorkflowsWithCurrentVersions(
- isCore ? selectedWorkflowRecordIds : [],
+ selectedWorkflowRecordIds,
);
- const workflows = isCore
- ? coreWorkflowsWithCurrentVersions
- : workflowsWithCurrentVersions;
-
const applicationManagedWorkflowIds = new Set(
coreWorkflowsWithCurrentVersions
.filter((workflow) =>
@@ -57,7 +47,7 @@ export const CommandMenuContextProviderWithWorkflowEnrichment = ({
const enrichedSelectedRecords = commandMenuContextApi.selectedRecords.map(
(record) => {
- const workflowWithCurrentVersion = workflows.find(
+ const workflowWithCurrentVersion = coreWorkflowsWithCurrentVersions.find(
(workflow) => workflow.id === record.id,
);
diff --git a/packages/twenty-front/src/modules/command-menu-item/contexts/__tests__/CommandMenuContextProviderWithWorkflowEnrichment.test.tsx b/packages/twenty-front/src/modules/command-menu-item/contexts/__tests__/CommandMenuContextProviderWithWorkflowEnrichment.test.tsx
index 10d315ee417..af4145d8e56 100644
--- a/packages/twenty-front/src/modules/command-menu-item/contexts/__tests__/CommandMenuContextProviderWithWorkflowEnrichment.test.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/contexts/__tests__/CommandMenuContextProviderWithWorkflowEnrichment.test.tsx
@@ -28,12 +28,6 @@ jest.mock(
}),
}),
);
-jest.mock('@/workflow/hooks/useIsWorkflowCoreEnabled', () => ({
- useIsWorkflowCoreEnabled: () => true,
-}));
-jest.mock('@/command-menu-item/hooks/useWorkflowsWithCurrentVersions', () => ({
- useWorkflowsWithCurrentVersions: () => [],
-}));
jest.mock('@/command-menu-item/hooks/useCoreWorkflowsWithCurrentVersions');
jest.mock(
'@/layout-customization/hooks/useIsLayoutCustomizationAllowedOnCurrentPage',
diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/hooks/__tests__/useEnrichHeadlessCommandContextApiWithWorkflowVersionTriggerInformation.test.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/hooks/__tests__/useEnrichHeadlessCommandContextApiWithWorkflowVersionTriggerInformation.test.tsx
index 2f437221ac3..a5457bc9c71 100644
--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/hooks/__tests__/useEnrichHeadlessCommandContextApiWithWorkflowVersionTriggerInformation.test.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/hooks/__tests__/useEnrichHeadlessCommandContextApiWithWorkflowVersionTriggerInformation.test.tsx
@@ -12,18 +12,7 @@ import {
EngineComponentKey,
} from '~/generated-metadata/graphql';
-const mockFindOneWorkflowVersion = jest.fn();
const mockCoreQuery = jest.fn();
-let mockIsCore = false;
-jest.mock('@/workflow/hooks/useIsWorkflowCoreEnabled', () => ({
- useIsWorkflowCoreEnabled: () => mockIsCore,
-}));
-
-jest.mock('@/object-record/hooks/useLazyFindOneRecord', () => ({
- useLazyFindOneRecord: () => ({
- findOneRecord: mockFindOneWorkflowVersion,
- }),
-}));
const getWrapper =
(store = createStore()) =>
@@ -54,71 +43,16 @@ jest.mock('@/object-metadata/hooks/useApolloCoreClient', () => ({
describe('useEnrichHeadlessCommandContextApiWithWorkflowVersionTriggerInformation', () => {
beforeEach(() => {
jest.clearAllMocks();
- mockIsCore = false;
- mockCoreQuery.mockReset().mockResolvedValue({
- data: { workflowVersionContent: { trigger: { type: 'MANUAL' } } },
- });
- });
-
- it('should return enriched context with workflow metadata', async () => {
- const store = createStore();
- const wrapper = getWrapper(store);
-
- const workflowVersionRecord = {
- id: 'wf-version-1',
- workflowId: 'workflow-1',
- trigger: { type: 'MANUAL' },
- __typename: 'WorkflowVersion' as const,
- };
-
- mockFindOneWorkflowVersion.mockImplementation(
- async ({ onCompleted }: { onCompleted: (data: unknown) => void }) => {
- onCompleted(workflowVersionRecord);
- },
- );
-
- const { result } = renderHook(
- () =>
- useEnrichHeadlessCommandContextApiWithWorkflowVersionTriggerInformation(),
- { wrapper },
- );
-
- const headlessEngineCommandContextApi = buildBaseContextApi();
-
- let enrichedResult: unknown;
-
- await act(async () => {
- enrichedResult =
- await result.current.enrichHeadlessCommandContextApiWithWorkflowVersionTriggerInformation(
- {
- headlessEngineCommandContextApi,
- workflowVersionId: 'wf-version-1',
- availabilityType: CommandMenuItemAvailabilityType.RECORD_SELECTION,
- availabilityObjectMetadataId: 'obj-1',
- },
- );
- });
-
- expect(enrichedResult).toEqual({
- ...headlessEngineCommandContextApi,
- workflowId: 'workflow-1',
- workflowVersionId: 'wf-version-1',
- trigger: { type: 'MANUAL' },
- availabilityType: CommandMenuItemAvailabilityType.RECORD_SELECTION,
- availabilityObjectMetadataId: 'obj-1',
- });
+ mockCoreQuery.mockReset();
});
- it('should return undefined when workflow version is not found', async () => {
- const store = createStore();
- const wrapper = getWrapper(store);
-
- mockFindOneWorkflowVersion.mockImplementation(async () => {});
+ it('should return undefined when the core workflow version is not found', async () => {
+ mockCoreQuery.mockResolvedValue({ data: { coreWorkflowVersion: null } });
const { result } = renderHook(
() =>
useEnrichHeadlessCommandContextApiWithWorkflowVersionTriggerInformation(),
- { wrapper },
+ { wrapper: getWrapper() },
);
let enrichedResult: unknown;
@@ -128,7 +62,7 @@ describe('useEnrichHeadlessCommandContextApiWithWorkflowVersionTriggerInformatio
await result.current.enrichHeadlessCommandContextApiWithWorkflowVersionTriggerInformation(
{
headlessEngineCommandContextApi: buildBaseContextApi(),
- workflowVersionId: 'nonexistent',
+ coreWorkflowVersionId: 'nonexistent',
availabilityType: CommandMenuItemAvailabilityType.GLOBAL,
},
);
@@ -136,8 +70,8 @@ describe('useEnrichHeadlessCommandContextApiWithWorkflowVersionTriggerInformatio
expect(enrichedResult).toBeUndefined();
});
- it('uses the core pointer without loading workspace definitions', async () => {
- mockIsCore = true;
+
+ it('uses the core pointer', async () => {
mockCoreQuery.mockResolvedValue({
data: {
coreWorkflowVersion: {
@@ -172,11 +106,9 @@ describe('useEnrichHeadlessCommandContextApiWithWorkflowVersionTriggerInformatio
workflowVersionId: 'core-version',
workflowId: 'core-workflow',
});
- expect(mockFindOneWorkflowVersion).not.toHaveBeenCalled();
});
it('resolves legacy command items before reading the core definition', async () => {
- mockIsCore = true;
mockCoreQuery
.mockResolvedValueOnce({
data: { coreWorkflowVersion: { id: 'core-version' } },
@@ -210,11 +142,9 @@ describe('useEnrichHeadlessCommandContextApiWithWorkflowVersionTriggerInformatio
}),
);
expect(context).toMatchObject({ coreWorkflowVersionId: 'core-version' });
- expect(mockFindOneWorkflowVersion).not.toHaveBeenCalled();
});
- it('does not fall back to workspace definitions after a core query fails', async () => {
- mockIsCore = true;
+ it('propagates a failing core query', async () => {
mockCoreQuery.mockRejectedValue(new Error('core unavailable'));
const { result } = renderHook(
() =>
@@ -231,39 +161,5 @@ describe('useEnrichHeadlessCommandContextApiWithWorkflowVersionTriggerInformatio
},
),
).rejects.toThrow('core unavailable');
- expect(mockFindOneWorkflowVersion).not.toHaveBeenCalled();
- });
-
- it('keeps workspace IDs when the flag is off even when a core pointer exists', async () => {
- mockFindOneWorkflowVersion.mockImplementation(
- async ({ onCompleted }: { onCompleted: (value: unknown) => void }) =>
- onCompleted({
- id: 'workspace-version',
- workflowId: 'workspace-workflow',
- }),
- );
- const { result } = renderHook(
- () =>
- useEnrichHeadlessCommandContextApiWithWorkflowVersionTriggerInformation(),
- { wrapper: getWrapper() },
- );
- const context =
- await result.current.enrichHeadlessCommandContextApiWithWorkflowVersionTriggerInformation(
- {
- headlessEngineCommandContextApi: buildBaseContextApi(),
- coreWorkflowVersionId: 'core-version',
- workflowVersionId: 'workspace-version',
- availabilityType: CommandMenuItemAvailabilityType.GLOBAL,
- },
- );
- expect(context).toMatchObject({
- workflowVersionId: 'workspace-version',
- workflowId: 'workspace-workflow',
- });
- expect(mockCoreQuery).toHaveBeenCalledWith(
- expect.objectContaining({
- variables: { workflowVersionId: 'workspace-version' },
- }),
- );
});
});
diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/hooks/useEnrichHeadlessCommandContextApiWithWorkflowVersionTriggerInformation.ts b/packages/twenty-front/src/modules/command-menu-item/engine-command/hooks/useEnrichHeadlessCommandContextApiWithWorkflowVersionTriggerInformation.ts
index c19d2721d20..618b71d5ed6 100644
--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/hooks/useEnrichHeadlessCommandContextApiWithWorkflowVersionTriggerInformation.ts
+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/hooks/useEnrichHeadlessCommandContextApiWithWorkflowVersionTriggerInformation.ts
@@ -1,4 +1,3 @@
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
import {
GetCoreWorkflowVersionDocument,
GetCoreWorkflowVersionLegacyMappingDocument,
@@ -10,19 +9,9 @@ import {
type HeadlessEngineCommandContextApi,
} from '@/command-menu-item/engine-command/types/HeadlessCommandContextApi';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
-import { useLazyFindOneRecord } from '@/object-record/hooks/useLazyFindOneRecord';
-import { type WorkflowVersion } from '@/workflow/types/Workflow';
-import { GET_WORKFLOW_VERSION_CONTENT } from '@/workflow/workflow-version/graphql/queries/getWorkflowVersionContent';
-import { type WorkflowVersionContent } from '@/workflow/workflow-version/hooks/useWorkflowVersionContent';
-import { CoreObjectNameSingular } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { type CommandMenuItemAvailabilityType } from '~/generated-metadata/graphql';
-type WorkflowVersionRecord = Pick<
- WorkflowVersion,
- 'id' | 'workflowId' | '__typename'
->;
-
type EnrichParams = {
headlessEngineCommandContextApi: HeadlessEngineCommandContextApi;
workflowVersionId?: string;
@@ -33,43 +22,7 @@ type EnrichParams = {
export const useEnrichHeadlessCommandContextApiWithWorkflowVersionTriggerInformation =
() => {
- const isCore = useIsWorkflowCoreEnabled();
const apolloCoreClient = useApolloCoreClient();
- const { findOneRecord: findOneWorkflowVersion } =
- useLazyFindOneRecord<WorkflowVersionRecord>({
- objectNameSingular: CoreObjectNameSingular.WorkflowVersion,
- recordGqlFields: { id: true, workflowId: true },
- });
-
- const fetchTriggerFromCore = useCallback(
- async (versionId: string) => {
- const { data } = await apolloCoreClient.query<{
- workflowVersionContent: WorkflowVersionContent;
- }>({
- query: GET_WORKFLOW_VERSION_CONTENT,
- variables: { workflowVersionId: versionId },
- });
-
- return data?.workflowVersionContent.trigger ?? null;
- },
- [apolloCoreClient],
- );
-
- const fetchWorkflowVersion = useCallback(
- async (versionId: string): Promise<WorkflowVersionRecord | undefined> => {
- let record: WorkflowVersionRecord | undefined;
-
- await findOneWorkflowVersion({
- objectRecordId: versionId,
- onCompleted: (data) => {
- record = data;
- },
- });
-
- return record;
- },
- [findOneWorkflowVersion],
- );
const enrichHeadlessCommandContextApiWithWorkflowVersionTriggerInformation =
useCallback(
@@ -81,10 +34,8 @@ export const useEnrichHeadlessCommandContextApiWithWorkflowVersionTriggerInforma
availabilityObjectMetadataId,
}: EnrichParams): Promise<HeadlessCommandContextApi | undefined> => {
let resolvedCoreVersionId = coreWorkflowVersionId;
- let resolvedWorkspaceVersionId = workflowVersionId;
if (
- isCore &&
!isDefined(resolvedCoreVersionId) &&
isDefined(workflowVersionId)
) {
@@ -96,63 +47,33 @@ export const useEnrichHeadlessCommandContextApiWithWorkflowVersionTriggerInforma
resolvedCoreVersionId = data?.coreWorkflowVersion?.id;
}
- if (
- isDefined(resolvedCoreVersionId) &&
- (isCore || !isDefined(resolvedWorkspaceVersionId))
- ) {
- const { data } = await apolloCoreClient.query({
- query: GetCoreWorkflowVersionDocument,
- variables: { coreWorkflowVersionId: resolvedCoreVersionId },
- fetchPolicy: 'network-only',
- });
- const version = data?.coreWorkflowVersion;
- if (!isDefined(version)) {
- return undefined;
- }
- if (isCore) {
- if (!isDefined(version.coreWorkflowId)) {
- return undefined;
- }
- return {
- ...headlessEngineCommandContextApi,
- workflowId: version.coreWorkflowId,
- workflowVersionId: version.id,
- coreWorkflowId: version.coreWorkflowId,
- coreWorkflowVersionId: version.id,
- trigger: version.trigger ?? null,
- availabilityType,
- availabilityObjectMetadataId,
- };
- }
- resolvedWorkspaceVersionId =
- version.workspaceWorkflowVersionId ?? undefined;
- }
-
- if (isCore || !isDefined(resolvedWorkspaceVersionId)) {
+ if (!isDefined(resolvedCoreVersionId)) {
return undefined;
}
- const workflowVersion = await fetchWorkflowVersion(
- resolvedWorkspaceVersionId,
- );
- if (!isDefined(workflowVersion)) {
+ const { data } = await apolloCoreClient.query({
+ query: GetCoreWorkflowVersionDocument,
+ variables: { coreWorkflowVersionId: resolvedCoreVersionId },
+ fetchPolicy: 'network-only',
+ });
+ const version = data?.coreWorkflowVersion;
+
+ if (!isDefined(version) || !isDefined(version.coreWorkflowId)) {
return undefined;
}
- const trigger = await fetchTriggerFromCore(
- resolvedWorkspaceVersionId,
- );
-
return {
...headlessEngineCommandContextApi,
- workflowId: workflowVersion.workflowId,
- workflowVersionId: workflowVersion.id,
- trigger,
+ workflowId: version.coreWorkflowId,
+ workflowVersionId: version.id,
+ coreWorkflowId: version.coreWorkflowId,
+ coreWorkflowVersionId: version.id,
+ trigger: version.trigger ?? null,
availabilityType,
availabilityObjectMetadataId,
};
},
- [fetchWorkflowVersion, fetchTriggerFromCore, apolloCoreClient, isCore],
+ [apolloCoreClient],
);
return {
diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/components/DeleteRecordsCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/components/DeleteRecordsCommand.tsx
index fbaf0415de0..3b87cbe2f17 100644
--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/components/DeleteRecordsCommand.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/components/DeleteRecordsCommand.tsx
@@ -1,5 +1,4 @@
import { DeleteCoreWorkflowsCommand } from '@/object-core/workflows/components/DeleteCoreWorkflowsCommand';
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
import {
CoreObjectNameSingular,
type RecordGqlOperationFilter,
@@ -81,10 +80,9 @@ const DeleteWorkspaceRecordsCommand = () => {
};
export const DeleteRecordsCommand = () => {
- const isCore = useIsWorkflowCoreEnabled();
const { objectMetadataItem } = useHeadlessCommandContextApi();
- return isCore &&
- objectMetadataItem?.nameSingular === CoreObjectNameSingular.Workflow ? (
+ return objectMetadataItem?.nameSingular ===
+ CoreObjectNameSingular.Workflow ? (
<DeleteCoreWorkflowsCommand />
) : (
<DeleteWorkspaceRecordsCommand />
diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/no-selection/components/CreateNewRecordCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/no-selection/components/CreateNewRecordCommand.tsx
index 29ee2b561a9..d57d37e6310 100644
--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/no-selection/components/CreateNewRecordCommand.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/no-selection/components/CreateNewRecordCommand.tsx
@@ -6,8 +6,6 @@ import { getRecordCreationCommandType } from '@/command-menu-item/engine-command
import { useCreateCoreWorkflow } from '@/object-core/workflows/hooks/useCreateCoreWorkflow';
import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
-import { FeatureFlagKey } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
export const CreateNewRecordCommand = () => {
@@ -23,9 +21,6 @@ export const CreateNewRecordCommand = () => {
(item) => item.id === creationTargetObjectMetadataId,
)
: contextObjectMetadataItem;
- const isWorkflowCoreIndexPageEnabled = useIsFeatureEnabled(
- FeatureFlagKey.IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED,
- );
const { createCoreWorkflow } = useCreateCoreWorkflow();
if (!isDefined(objectMetadataItem)) {
@@ -38,7 +33,6 @@ export const CreateNewRecordCommand = () => {
recordIndexId,
hasAnySoftDeleteFilterOnView,
creationTargetObjectMetadataId,
- isWorkflowCoreIndexPageEnabled,
});
if (commandType === 'workflow') {
diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/no-selection/utils/__tests__/getRecordCreationCommandType.test.ts b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/no-selection/utils/__tests__/getRecordCreationCommandType.test.ts
index d6a5de50fa1..2eade2f167a 100644
--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/no-selection/utils/__tests__/getRecordCreationCommandType.test.ts
+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/no-selection/utils/__tests__/getRecordCreationCommandType.test.ts
@@ -5,51 +5,33 @@ it.each([
{
objectNameSingular: 'company',
creationTargetObjectMetadataId: 'company-id',
- isWorkflowCoreIndexPageEnabled: false,
expected: 'global',
},
{
objectNameSingular: 'task',
creationTargetObjectMetadataId: 'task-id',
- isWorkflowCoreIndexPageEnabled: true,
expected: 'global',
},
{
objectNameSingular: 'company',
creationTargetObjectMetadataId: null,
- isWorkflowCoreIndexPageEnabled: true,
expected: 'index',
},
{
objectNameSingular: 'task',
creationTargetObjectMetadataId: undefined,
- isWorkflowCoreIndexPageEnabled: false,
expected: 'index',
},
{
objectNameSingular: 'workflow',
creationTargetObjectMetadataId: 'workflow-id',
- isWorkflowCoreIndexPageEnabled: true,
expected: 'workflow',
},
{
objectNameSingular: 'workflow',
creationTargetObjectMetadataId: null,
- isWorkflowCoreIndexPageEnabled: true,
expected: 'workflow',
},
- {
- objectNameSingular: 'workflow',
- creationTargetObjectMetadataId: 'workflow-id',
- isWorkflowCoreIndexPageEnabled: false,
- expected: 'global',
- },
- {
- objectNameSingular: 'workflow',
- creationTargetObjectMetadataId: null,
- isWorkflowCoreIndexPageEnabled: false,
- expected: 'index',
- },
])('dispatches record creation to $expected: %j', ({ expected, ...params }) => {
expect(getRecordCreationCommandType(params)).toBe(expected);
});
@@ -78,7 +60,6 @@ it.each([
getRecordCreationCommandType({
objectNameSingular: 'company',
creationTargetObjectMetadataId: 'company-id',
- isWorkflowCoreIndexPageEnabled: false,
...context,
}),
).toBe(expected);
@@ -93,7 +74,6 @@ it('uses global creation for the current object in a trash view', () => {
creationTargetObjectMetadataId: 'company-id',
recordIndexId: 'company-index',
hasAnySoftDeleteFilterOnView: true,
- isWorkflowCoreIndexPageEnabled: false,
}),
).toBe('global');
});
diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/no-selection/utils/getRecordCreationCommandType.ts b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/no-selection/utils/getRecordCreationCommandType.ts
index f3c5f324350..66e6bc9483e 100644
--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/no-selection/utils/getRecordCreationCommandType.ts
+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/no-selection/utils/getRecordCreationCommandType.ts
@@ -4,7 +4,6 @@ import { isDefined } from 'twenty-shared/utils';
export const getRecordCreationCommandType = ({
objectNameSingular,
creationTargetObjectMetadataId,
- isWorkflowCoreIndexPageEnabled,
contextObjectMetadataId,
recordIndexId,
hasAnySoftDeleteFilterOnView = false,
@@ -14,12 +13,8 @@ export const getRecordCreationCommandType = ({
contextObjectMetadataId?: string | null;
recordIndexId?: string | null;
creationTargetObjectMetadataId?: string | null;
- isWorkflowCoreIndexPageEnabled: boolean;
}): 'workflow' | 'global' | 'index' => {
- if (
- isWorkflowCoreIndexPageEnabled &&
- objectNameSingular === CoreObjectNameSingular.Workflow
- ) {
+ if (objectNameSingular === CoreObjectNameSingular.Workflow) {
return 'workflow';
}
diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow-runs/components/SeeWorkflowWorkflowRunSingleRecordCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow-runs/components/SeeWorkflowWorkflowRunSingleRecordCommand.tsx
index 597ab223899..9fda83fac73 100644
--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow-runs/components/SeeWorkflowWorkflowRunSingleRecordCommand.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow-runs/components/SeeWorkflowWorkflowRunSingleRecordCommand.tsx
@@ -1,6 +1,4 @@
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
import { HeadlessEngineCommandWrapperEffect } from '@/command-menu-item/engine-command/components/HeadlessEngineCommandWrapperEffect';
-import { HeadlessNavigateEngineCommand } from '@/command-menu-item/engine-command/components/HeadlessNavigateEngineCommand';
import { useHeadlessCommandContextApi } from '@/command-menu-item/engine-command/hooks/useHeadlessCommandContextApi';
import { useLazyFindOneRecord } from '@/object-record/hooks/useLazyFindOneRecord';
import { AppPath, CoreObjectNameSingular } from 'twenty-shared/types';
@@ -8,7 +6,6 @@ import { isDefined } from 'twenty-shared/utils';
import { useNavigateApp } from '~/hooks/useNavigateApp';
export const SeeWorkflowWorkflowRunSingleRecordCommand = () => {
- const isCore = useIsWorkflowCoreEnabled();
const { selectedRecords } = useHeadlessCommandContextApi();
const selectedRecord = selectedRecords[0];
const navigateApp = useNavigateApp();
@@ -39,32 +36,16 @@ export const SeeWorkflowWorkflowRunSingleRecordCommand = () => {
return coreWorkflowId;
};
- if (isCore) {
- return (
- <HeadlessEngineCommandWrapperEffect
- execute={async () => {
- const coreWorkflowId = await findCoreWorkflowId();
-
- if (!isDefined(coreWorkflowId)) {
- return;
- }
-
- navigateApp(AppPath.WorkflowCoreShowPage, { coreWorkflowId });
- }}
- />
- );
- }
+ return (
+ <HeadlessEngineCommandWrapperEffect
+ execute={async () => {
+ const coreWorkflowId = await findCoreWorkflowId();
- if (!isDefined(selectedRecord) || !isDefined(selectedRecord?.workflow?.id)) {
- return null;
- }
+ if (!isDefined(coreWorkflowId)) {
+ return;
+ }
- return (
- <HeadlessNavigateEngineCommand
- to={AppPath.RecordShowPage}
- params={{
- objectNameSingular: CoreObjectNameSingular.Workflow,
- objectRecordId: selectedRecord.workflow.id,
+ navigateApp(AppPath.WorkflowCoreShowPage, { coreWorkflowId });
}}
/>
);
diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow-versions/components/SeeRunsWorkflowVersionSingleRecordCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow-versions/components/SeeRunsWorkflowVersionSingleRecordCommand.tsx
index 3aefedd4ae4..958b2e23725 100644
--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow-versions/components/SeeRunsWorkflowVersionSingleRecordCommand.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow-versions/components/SeeRunsWorkflowVersionSingleRecordCommand.tsx
@@ -1,10 +1,8 @@
import { useQuery } from '@apollo/client/react';
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
import { HeadlessNavigateEngineCommand } from '@/command-menu-item/engine-command/components/HeadlessNavigateEngineCommand';
import { useHeadlessCommandContextApi } from '@/command-menu-item/engine-command/hooks/useHeadlessCommandContextApi';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
import { CoreObjectNamePlural } from '@/object-metadata/types/CoreObjectNamePlural';
-import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion';
import { useCoreWorkflowVersion } from '@/object-core/workflows/versions/hooks/useCoreWorkflowVersion';
import { AppPath, ViewFilterOperand } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
@@ -12,23 +10,19 @@ import { GetCoreWorkflowDocument } from '~/generated/graphql';
const SeeRunsWorkflowVersionSingleRecordCommandContent = ({
workflowId,
- recordId,
+ workflowVersionId,
+ workflowVersionLabel,
}: {
workflowId: string;
- recordId: string;
+ workflowVersionId: string;
+ workflowVersionLabel: string | undefined;
}) => {
- const isCore = useIsWorkflowCoreEnabled();
const apolloCoreClient = useApolloCoreClient();
- const workflowWithCurrentVersion = useWorkflowWithCurrentVersion(workflowId);
- const { coreWorkflowVersion } = useCoreWorkflowVersion(
- isCore ? recordId : undefined,
- );
const { data: coreWorkflowData, loading: coreWorkflowLoading } = useQuery(
GetCoreWorkflowDocument,
{
client: apolloCoreClient,
variables: { coreWorkflowId: workflowId },
- skip: !isCore,
},
);
@@ -41,61 +35,35 @@ const SeeRunsWorkflowVersionSingleRecordCommandContent = ({
to={AppPath.RecordIndexPage}
params={{ objectNamePlural: CoreObjectNamePlural.WorkflowRun }}
queryParams={{
- filter: isCore
- ? {
- coreWorkflowId: { [ViewFilterOperand.IS]: workflowId },
- coreWorkflowVersionId: { [ViewFilterOperand.IS]: recordId },
- }
- : {
- workflow: {
- [ViewFilterOperand.IS]: {
- selectedRecordIds: [workflowWithCurrentVersion?.id],
- },
- },
- recordStore: {
- [ViewFilterOperand.IS]: {
- selectedRecordIds: [recordId],
- },
- },
- },
- filterDisplayValue: isCore
- ? {
- coreWorkflowId: {
- [ViewFilterOperand.IS]: coreWorkflowData?.coreWorkflow?.name,
- },
- coreWorkflowVersionId: {
- [ViewFilterOperand.IS]: coreWorkflowVersion?.label,
- },
- }
- : undefined,
+ filter: {
+ coreWorkflowId: { [ViewFilterOperand.IS]: workflowId },
+ coreWorkflowVersionId: { [ViewFilterOperand.IS]: workflowVersionId },
+ },
+ filterDisplayValue: {
+ coreWorkflowId: {
+ [ViewFilterOperand.IS]: coreWorkflowData?.coreWorkflow?.name,
+ },
+ coreWorkflowVersionId: {
+ [ViewFilterOperand.IS]: workflowVersionLabel,
+ },
+ },
}}
/>
);
};
export const SeeRunsWorkflowVersionSingleRecordCommand = () => {
- const isCore = useIsWorkflowCoreEnabled();
const { selectedRecords } = useHeadlessCommandContextApi();
- const selectedRecord = selectedRecords[0];
- const workspaceWorkflowVersionId = selectedRecord?.id;
- const workspaceWorkflowId = selectedRecord?.workflow?.id;
const { coreWorkflowVersion, loading } = useCoreWorkflowVersion(
- isCore ? selectedRecord?.coreWorkflowVersionId : undefined,
+ selectedRecords[0]?.coreWorkflowVersionId,
);
- if (isCore && (loading || !isDefined(coreWorkflowVersion))) {
+ if (loading || !isDefined(coreWorkflowVersion)) {
return null;
}
- const workflowId = isCore
- ? coreWorkflowVersion?.coreWorkflowId
- : workspaceWorkflowId;
- const workflowVersionId = isCore
- ? coreWorkflowVersion?.id
- : workspaceWorkflowVersionId;
-
- if (!isDefined(workflowVersionId) || !isDefined(workflowId)) {
+ if (!isDefined(coreWorkflowVersion.coreWorkflowId)) {
throw new Error(
'Record ID and workflow ID are required to see runs workflow version',
);
@@ -103,8 +71,9 @@ export const SeeRunsWorkflowVersionSingleRecordCommand = () => {
return (
<SeeRunsWorkflowVersionSingleRecordCommandContent
- workflowId={workflowId}
- recordId={workflowVersionId}
+ workflowId={coreWorkflowVersion.coreWorkflowId}
+ workflowVersionId={coreWorkflowVersion.id}
+ workflowVersionLabel={coreWorkflowVersion.label}
/>
);
};
diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow-versions/components/SeeVersionsWorkflowVersionSingleRecordCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow-versions/components/SeeVersionsWorkflowVersionSingleRecordCommand.tsx
index 0559670df9a..72af89e9b06 100644
--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow-versions/components/SeeVersionsWorkflowVersionSingleRecordCommand.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow-versions/components/SeeVersionsWorkflowVersionSingleRecordCommand.tsx
@@ -1,71 +1,21 @@
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
import { HeadlessEngineCommandWrapperEffect } from '@/command-menu-item/engine-command/components/HeadlessEngineCommandWrapperEffect';
import { useOpenCoreWorkflowVersionsSidePanel } from '@/object-core/workflows/versions/hooks/useOpenCoreWorkflowVersionsSidePanel';
-import { HeadlessNavigateEngineCommand } from '@/command-menu-item/engine-command/components/HeadlessNavigateEngineCommand';
import { useHeadlessCommandContextApi } from '@/command-menu-item/engine-command/hooks/useHeadlessCommandContextApi';
-import { CoreObjectNamePlural } from '@/object-metadata/types/CoreObjectNamePlural';
-import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion';
import { useCoreWorkflowVersion } from '@/object-core/workflows/versions/hooks/useCoreWorkflowVersion';
-import { AppPath, ViewFilterOperand } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-const SeeVersionsWorkflowVersionSingleRecordCommandContent = ({
- workspaceWorkflowId,
- coreWorkflowVersionId,
-}: {
- workspaceWorkflowId: string;
- coreWorkflowVersionId: string | undefined;
-}) => {
- const isCore = useIsWorkflowCoreEnabled();
+export const SeeVersionsWorkflowVersionSingleRecordCommand = () => {
+ const { selectedRecords } = useHeadlessCommandContextApi();
const { openCoreWorkflowVersionsSidePanel } =
useOpenCoreWorkflowVersionsSidePanel();
const { coreWorkflowVersion } = useCoreWorkflowVersion(
- isCore ? coreWorkflowVersionId : undefined,
- );
- const workflowId = isCore
- ? coreWorkflowVersion?.coreWorkflowId
- : workspaceWorkflowId;
- const workflowWithCurrentVersion = useWorkflowWithCurrentVersion(workflowId);
-
- if (isCore) {
- return isDefined(workflowId) ? (
- <HeadlessEngineCommandWrapperEffect
- execute={() => openCoreWorkflowVersionsSidePanel(workflowId)}
- />
- ) : null;
- }
-
- return (
- <HeadlessNavigateEngineCommand
- to={AppPath.RecordIndexPage}
- params={{ objectNamePlural: CoreObjectNamePlural.WorkflowVersion }}
- queryParams={{
- filter: {
- workflow: {
- [ViewFilterOperand.IS]: {
- selectedRecordIds: [workflowWithCurrentVersion?.id],
- },
- },
- },
- }}
- />
+ selectedRecords[0]?.coreWorkflowVersionId,
);
-};
-
-export const SeeVersionsWorkflowVersionSingleRecordCommand = () => {
- const { selectedRecords } = useHeadlessCommandContextApi();
- const selectedRecord = selectedRecords[0];
-
- if (!isDefined(selectedRecord) || !isDefined(selectedRecord.workflowId)) {
- throw new Error(
- 'Selected record and workflow ID are required to see versions workflow version',
- );
- }
+ const workflowId = coreWorkflowVersion?.coreWorkflowId;
- return (
- <SeeVersionsWorkflowVersionSingleRecordCommandContent
- workspaceWorkflowId={selectedRecord.workflowId}
- coreWorkflowVersionId={selectedRecord.coreWorkflowVersionId}
+ return isDefined(workflowId) ? (
+ <HeadlessEngineCommandWrapperEffect
+ execute={() => openCoreWorkflowVersionsSidePanel(workflowId)}
/>
- );
+ ) : null;
};
diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow-versions/components/SeeWorkflowWorkflowVersionSingleRecordCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow-versions/components/SeeWorkflowWorkflowVersionSingleRecordCommand.tsx
index df7a1ec2c8d..7f1a9ce7a97 100644
--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow-versions/components/SeeWorkflowWorkflowVersionSingleRecordCommand.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow-versions/components/SeeWorkflowWorkflowVersionSingleRecordCommand.tsx
@@ -1,41 +1,20 @@
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
import { HeadlessNavigateEngineCommand } from '@/command-menu-item/engine-command/components/HeadlessNavigateEngineCommand';
import { useHeadlessCommandContextApi } from '@/command-menu-item/engine-command/hooks/useHeadlessCommandContextApi';
import { useCoreWorkflowVersion } from '@/object-core/workflows/versions/hooks/useCoreWorkflowVersion';
-import { AppPath, CoreObjectNameSingular } from 'twenty-shared/types';
+import { AppPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
export const SeeWorkflowWorkflowVersionSingleRecordCommand = () => {
- const isCore = useIsWorkflowCoreEnabled();
const { selectedRecords } = useHeadlessCommandContextApi();
- const selectedRecord = selectedRecords[0];
const { coreWorkflowVersion } = useCoreWorkflowVersion(
- isCore ? selectedRecord?.coreWorkflowVersionId : undefined,
+ selectedRecords[0]?.coreWorkflowVersionId,
);
+ const coreWorkflowId = coreWorkflowVersion?.coreWorkflowId;
- if (isCore) {
- const coreWorkflowId = coreWorkflowVersion?.coreWorkflowId;
- return isDefined(coreWorkflowId) ? (
- <HeadlessNavigateEngineCommand
- to={AppPath.WorkflowCoreShowPage}
- params={{ coreWorkflowId }}
- />
- ) : null;
- }
-
- if (!isDefined(selectedRecord) || !isDefined(selectedRecord?.workflow?.id)) {
- throw new Error(
- 'Selected record and workflow ID are required to see workflow workflow version',
- );
- }
-
- return (
+ return isDefined(coreWorkflowId) ? (
<HeadlessNavigateEngineCommand
- to={AppPath.RecordShowPage}
- params={{
- objectNameSingular: CoreObjectNameSingular.Workflow,
- objectRecordId: selectedRecord.workflow.id,
- }}
+ to={AppPath.WorkflowCoreShowPage}
+ params={{ coreWorkflowId }}
/>
- );
+ ) : null;
};
diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow/components/SeeRunsWorkflowSingleRecordCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow/components/SeeRunsWorkflowSingleRecordCommand.tsx
index 34955a5b048..9c920d2c867 100644
--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow/components/SeeRunsWorkflowSingleRecordCommand.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow/components/SeeRunsWorkflowSingleRecordCommand.tsx
@@ -1,20 +1,14 @@
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
import { HeadlessNavigateEngineCommand } from '@/command-menu-item/engine-command/components/HeadlessNavigateEngineCommand';
import { useHeadlessCommandContextApi } from '@/command-menu-item/engine-command/hooks/useHeadlessCommandContextApi';
import { CoreObjectNamePlural } from '@/object-metadata/types/CoreObjectNamePlural';
-import { useWorkflowWithCurrentVersion } from '@/workflow/hooks/useWorkflowWithCurrentVersion';
import { AppPath, ViewFilterOperand } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
export const SeeRunsWorkflowSingleRecordCommand = () => {
- const isCore = useIsWorkflowCoreEnabled();
const { selectedRecords } = useHeadlessCommandContextApi();
const recordId = selectedRecords[0]?.id;
const workflowName = selectedRecords[0]?.name;
- const workflowWithCurrentVersion = useWorkflowWithCurrentVersion(
- recordId ?? '',
- );
if (!isDefined(recordId)) {
throw new Error('Record ID is required to see runs workflow');
@@ -25,18 +19,10 @@ export const SeeRunsWorkflowSingleRecordCommand = () => {
to={AppPath.RecordIndexPage}
params={{ objectNamePlural: CoreObjectNamePlural.WorkflowRun }}
queryParams={{
- filter: isCore
- ? { coreWorkflowId: { [ViewFilterOperand.IS]: recordId } }
- : {
- workflow: {
- [ViewFilterOperand.IS]: {
- selectedRecordIds: [workflowWithCurrentVersion?.id],
- },
- },
- },
- filterDisplayValue: isCore
- ? { coreWorkflowId: { [ViewFilterOperand.IS]: workflowName } }
- : undefined,
+ filter: { coreWorkflowId: { [ViewFilterOperand.IS]: recordId } },
+ filterDisplayValue: {
+ coreWorkflowId: { [ViewFilterOperand.IS]: workflowName },
+ },
}}
/>
);
diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow/components/SeeVersionsWorkflowSingleRecordCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow/components/SeeVersionsWorkflowSingleRecordCommand.tsx
index bf5dcf29d85..87188225982 100644
--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow/components/SeeVersionsWorkflowSingleRecordCommand.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/workflow/components/SeeVersionsWorkflowSingleRecordCommand.tsx
@@ -1,24 +1,13 @@
-import {
- AppPath,
- FeatureFlagKey,
- ViewFilterOperand,
-} from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { HeadlessEngineCommandWrapperEffect } from '@/command-menu-item/engine-command/components/HeadlessEngineCommandWrapperEffect';
-import { HeadlessNavigateEngineCommand } from '@/command-menu-item/engine-command/components/HeadlessNavigateEngineCommand';
import { useHeadlessCommandContextApi } from '@/command-menu-item/engine-command/hooks/useHeadlessCommandContextApi';
-import { CoreObjectNamePlural } from '@/object-metadata/types/CoreObjectNamePlural';
import { useOpenCoreWorkflowVersionsSidePanel } from '@/object-core/workflows/versions/hooks/useOpenCoreWorkflowVersionsSidePanel';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
export const SeeVersionsWorkflowSingleRecordCommand = () => {
const { selectedRecords } = useHeadlessCommandContextApi();
const { openCoreWorkflowVersionsSidePanel } =
useOpenCoreWorkflowVersionsSidePanel();
- const isWorkflowCoreIndexPageEnabled = useIsFeatureEnabled(
- FeatureFlagKey.IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED,
- );
const recordId = selectedRecords[0]?.id;
@@ -26,27 +15,9 @@ export const SeeVersionsWorkflowSingleRecordCommand = () => {
throw new Error('Record ID is required to see versions workflow');
}
- if (isWorkflowCoreIndexPageEnabled) {
- return (
- <HeadlessEngineCommandWrapperEffect
- execute={() => openCoreWorkflowVersionsSidePanel(recordId)}
- />
- );
- }
-
return (
- <HeadlessNavigateEngineCommand
- to={AppPath.RecordIndexPage}
- params={{ objectNamePlural: CoreObjectNamePlural.WorkflowVersion }}
- queryParams={{
- filter: {
- workflow: {
- [ViewFilterOperand.IS]: {
- selectedRecordIds: [recordId],
- },
- },
- },
- }}
+ <HeadlessEngineCommandWrapperEffect
+ execute={() => openCoreWorkflowVersionsSidePanel(recordId)}
/>
);
};
diff --git a/packages/twenty-front/src/modules/command-menu-item/hooks/useWorkflowsWithCurrentVersions.ts b/packages/twenty-front/src/modules/command-menu-item/hooks/useWorkflowsWithCurrentVersions.ts
deleted file mode 100644
index ab77ec02d4c..00000000000
--- a/packages/twenty-front/src/modules/command-menu-item/hooks/useWorkflowsWithCurrentVersions.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import { CoreObjectNameSingular } from 'twenty-shared/types';
-import { isDefined } from 'twenty-shared/utils';
-
-import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
-import {
- type Workflow,
- type WorkflowVersion,
- type WorkflowWithCurrentVersion,
-} from '@/workflow/types/Workflow';
-
-const getCurrentVersionId = (workflow: Workflow): string | undefined => {
- const draftVersion = workflow.versions.find(
- (version) => version.status === 'DRAFT',
- );
-
- const sortedVersions = workflow.versions.toSorted((a, b) =>
- a.createdAt > b.createdAt ? -1 : 1,
- );
-
- const latestVersion = sortedVersions[0];
-
- return (draftVersion ?? latestVersion)?.id;
-};
-
-export const useWorkflowsWithCurrentVersions = (
- workflowIds: string[],
-): WorkflowWithCurrentVersion[] => {
- const { records: workflows } = useFindManyRecords<Workflow>({
- objectNameSingular: CoreObjectNameSingular.Workflow,
- filter: { id: { in: workflowIds } },
- recordGqlFields: {
- id: true,
- name: true,
- statuses: true,
- lastPublishedVersionId: true,
- versions: {
- id: true,
- status: true,
- name: true,
- createdAt: true,
- },
- },
- skip: workflowIds.length === 0,
- });
-
- const currentVersionIds = workflows
- .map(getCurrentVersionId)
- .filter(isDefined);
-
- const { records: currentVersions } = useFindManyRecords<WorkflowVersion>({
- objectNameSingular: CoreObjectNameSingular.WorkflowVersion,
- filter: { id: { in: currentVersionIds } },
- skip: currentVersionIds.length === 0,
- });
-
- return workflows
- .map((workflow) => {
- const currentVersionId = getCurrentVersionId(workflow);
- const currentVersion = currentVersions.find(
- (version) => version.id === currentVersionId,
- );
-
- if (!isDefined(currentVersion)) {
- return undefined;
- }
-
- return {
- ...workflow,
- currentVersion,
- };
- })
- .filter(isDefined);
-};
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/hooks/useNavigationObjectMetadataItems.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/hooks/useNavigationObjectMetadataItems.ts
index 1aa600638c6..edeecd8043e 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/common/hooks/useNavigationObjectMetadataItems.ts
+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/hooks/useNavigationObjectMetadataItems.ts
@@ -1,18 +1,10 @@
-import { CoreObjectNameSingular, FeatureFlagKey } from 'twenty-shared/types';
+import { CoreObjectNameSingular } from 'twenty-shared/types';
import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
export const useNavigationObjectMetadataItems = () => {
const objectMetadataItems = useAtomStateValue(objectMetadataItemsSelector);
- const isWorkflowCoreIndexPageEnabled = useIsFeatureEnabled(
- FeatureFlagKey.IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED,
- );
-
- if (!isWorkflowCoreIndexPageEnabled) {
- return objectMetadataItems;
- }
return objectMetadataItems.filter(
(objectMetadataItem) =>
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/buildOptimisticNavigationMenuItem.test.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/buildOptimisticNavigationMenuItem.test.ts
index 8258f236b23..167b918bdc2 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/buildOptimisticNavigationMenuItem.test.ts
+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/buildOptimisticNavigationMenuItem.test.ts
@@ -14,8 +14,8 @@ describe('buildOptimisticNavigationMenuItem', () => {
expect(optimisticItem.pageLayoutId).toBe(
'0a0be2ee-2f5f-4a5a-b1e5-1b5c8e3a4f21',
);
- expect(
- filterAndSortNavigationMenuItems([optimisticItem], [], [], false),
- ).toEqual([optimisticItem]);
+ expect(filterAndSortNavigationMenuItems([optimisticItem], [], [])).toEqual([
+ optimisticItem,
+ ]);
});
});
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/filterAndSortNavigationMenuItems.test.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/filterAndSortNavigationMenuItems.test.ts
index 157ff32bb2d..8d99cf703bc 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/filterAndSortNavigationMenuItems.test.ts
+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/__tests__/filterAndSortNavigationMenuItems.test.ts
@@ -40,28 +40,16 @@ describe('filterAndSortNavigationMenuItems', () => {
targetRecordIdentifier: { id: 'workflow-record-id', name: 'My workflow' },
} as unknown as NavigationMenuItem;
- it('hides workflow record items when the workflow core index page is enabled', () => {
+ it('hides workflow record items', () => {
expect(
filterAndSortNavigationMenuItems(
[workflowRecordItem],
[],
[mockWorkflowObjectMetadataItem],
- true,
),
).toEqual([]);
});
- it('keeps workflow record items when the workflow core index page is disabled', () => {
- expect(
- filterAndSortNavigationMenuItems(
- [workflowRecordItem],
- [],
- [mockWorkflowObjectMetadataItem],
- false,
- ),
- ).toEqual([workflowRecordItem]);
- });
-
it('hides chat record items, which the chat menu lists', () => {
const chatObjectMetadataItem = {
id: 'chat-metadata-id',
@@ -81,12 +69,11 @@ describe('filterAndSortNavigationMenuItems', () => {
[chatRecordItem],
[],
[chatObjectMetadataItem],
- false,
),
).toEqual([]);
});
- it('keeps other objects record items when the workflow core index page is enabled', () => {
+ it('keeps other objects record items', () => {
const personRecordItem = {
id: 'person-favorite-id',
type: NavigationMenuItemType.RECORD,
@@ -101,13 +88,12 @@ describe('filterAndSortNavigationMenuItems', () => {
[personRecordItem],
[],
[mockObjectMetadataItem],
- true,
),
).toEqual([personRecordItem]);
});
it('should return empty array when navigationMenuItems is empty', () => {
- const result = filterAndSortNavigationMenuItems([], [], [], false);
+ const result = filterAndSortNavigationMenuItems([], [], []);
expect(result).toEqual([]);
});
@@ -123,7 +109,6 @@ describe('filterAndSortNavigationMenuItems', () => {
[navigationMenuItem],
[mockView],
[mockObjectMetadataItem],
- false,
);
expect(result).toHaveLength(1);
@@ -142,7 +127,6 @@ describe('filterAndSortNavigationMenuItems', () => {
[navigationMenuItem],
[],
[mockObjectMetadataItem],
- false,
);
expect(result).toEqual([]);
@@ -165,7 +149,6 @@ describe('filterAndSortNavigationMenuItems', () => {
[navigationMenuItem],
[],
[mockObjectMetadataItem],
- false,
);
expect(result).toHaveLength(1);
@@ -184,7 +167,6 @@ describe('filterAndSortNavigationMenuItems', () => {
[navigationMenuItem],
[],
[mockObjectMetadataItem],
- false,
);
expect(result).toEqual([]);
@@ -207,7 +189,6 @@ describe('filterAndSortNavigationMenuItems', () => {
[navigationMenuItem],
[],
[mockObjectMetadataItem],
- false,
);
expect(result).toEqual([]);
@@ -254,7 +235,6 @@ describe('filterAndSortNavigationMenuItems', () => {
navigationMenuItems,
[],
[mockObjectMetadataItem],
- false,
);
expect(result).toHaveLength(3);
@@ -276,7 +256,6 @@ describe('filterAndSortNavigationMenuItems', () => {
],
[],
[],
- false,
);
expect(result).toHaveLength(1);
expect(result[0].id).toBe('link-1');
@@ -294,7 +273,6 @@ describe('filterAndSortNavigationMenuItems', () => {
],
[],
[mockObjectMetadataItem],
- false,
);
expect(result).toHaveLength(1);
expect(result[0].id).toBe('obj-1');
@@ -312,7 +290,6 @@ describe('filterAndSortNavigationMenuItems', () => {
],
[],
[mockObjectMetadataItem],
- false,
);
expect(result).toEqual([]);
});
@@ -335,7 +312,6 @@ describe('filterAndSortNavigationMenuItems', () => {
],
[],
[inactiveObjectMetadataItem],
- false,
);
expect(result).toEqual([]);
});
@@ -365,7 +341,6 @@ describe('filterAndSortNavigationMenuItems', () => {
],
[viewForInactiveObject],
[inactiveObjectMetadataItem],
- false,
);
expect(result).toEqual([]);
});
@@ -382,7 +357,6 @@ describe('filterAndSortNavigationMenuItems', () => {
],
[],
[],
- false,
);
expect(result).toHaveLength(1);
expect(result[0].id).toBe('folder-1');
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/filterAndSortNavigationMenuItems.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/filterAndSortNavigationMenuItems.ts
index c9cae0bd3e7..8ca30d22e3b 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/filterAndSortNavigationMenuItems.ts
+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/filterAndSortNavigationMenuItems.ts
@@ -14,7 +14,6 @@ export const filterAndSortNavigationMenuItems = (
EnrichedObjectMetadataItem,
'id' | 'isActive' | 'nameSingular'
>[],
- isWorkflowCoreIndexPageEnabled: boolean,
): NavigationMenuItem[] => {
const activeObjectMetadataItems = objectMetadataItems.filter(
(meta) => meta.isActive,
@@ -23,9 +22,7 @@ export const filterAndSortNavigationMenuItems = (
// Chat favorites are listed in the chat menu instead
const hiddenRecordObjectNames: string[] = [
CoreObjectNameSingular.AgentChatThread,
- ...(isWorkflowCoreIndexPageEnabled
- ? [CoreObjectNameSingular.Workflow]
- : []),
+ CoreObjectNameSingular.Workflow,
];
const hiddenRecordObjectMetadataIds = new Set(
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderSubItem.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderSubItem.tsx
index 92e8e82a971..231c63d9b8b 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderSubItem.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderSubItem.tsx
@@ -53,9 +53,6 @@ export const NavigationMenuItemFolderSubItem = ({
const { t } = useLingui();
const isEditHighlightedInNavigationMenu =
useIsNavigationMenuItemEditHighlighted(navigationMenuItem);
- const isWorkflowCoreIndexPageEnabled = useIsFeatureEnabled(
- FeatureFlagKey.IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED,
- );
const objectMetadataItems = useAtomStateValue(objectMetadataItemsSelector);
const views = useAtomStateValue(viewsSelector);
const isInitialObjectViewEnabled = useIsFeatureEnabled(
@@ -125,7 +122,6 @@ export const NavigationMenuItemFolderSubItem = ({
const isCoreWorkflowsIndexItem = isCoreWorkflowsObjectNavigationMenuItem({
navigationMenuItemType: navigationMenuItem.type,
objectNameSingular,
- isWorkflowCoreIndexPageEnabled,
});
const viewSecondaryLabel =
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/hooks/useNavigationMenuItemsByFolder.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/hooks/useNavigationMenuItemsByFolder.ts
index b7bb821bf6d..a1a013c36f4 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/hooks/useNavigationMenuItemsByFolder.ts
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/hooks/useNavigationMenuItemsByFolder.ts
@@ -4,7 +4,6 @@ import { type NavigationMenuItem } from '~/generated-metadata/graphql';
import { filterAndSortNavigationMenuItems } from '@/navigation-menu-item/common/utils/filterAndSortNavigationMenuItems';
import { isNavigationMenuItemFolder } from '@/navigation-menu-item/common/utils/isNavigationMenuItemFolder';
import { useNavigationObjectMetadataItems } from '@/navigation-menu-item/common/hooks/useNavigationObjectMetadataItems';
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
import { viewsSelector } from '@/views/states/selectors/viewsSelector';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
@@ -26,7 +25,6 @@ type NavigationMenuItemFolderEntry = Pick<
export const useNavigationMenuItemsByFolder = () => {
const views = useAtomStateValue(viewsSelector);
const objectMetadataItems = useNavigationObjectMetadataItems();
- const isWorkflowCoreEnabled = useIsWorkflowCoreEnabled();
const { navigationMenuItems, workspaceNavigationMenuItems } =
useNavigationMenuItemsData();
@@ -89,7 +87,6 @@ export const useNavigationMenuItemsByFolder = () => {
itemsInFolder,
views,
objectMetadataItems,
- isWorkflowCoreEnabled,
);
acc.push({
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/hooks/useSortedNavigationMenuItems.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/hooks/useSortedNavigationMenuItems.ts
index 79558665c47..a10c795725f 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/hooks/useSortedNavigationMenuItems.ts
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/hooks/useSortedNavigationMenuItems.ts
@@ -2,7 +2,6 @@ import { useMemo } from 'react';
import { filterAndSortNavigationMenuItems } from '@/navigation-menu-item/common/utils/filterAndSortNavigationMenuItems';
import { useNavigationObjectMetadataItems } from '@/navigation-menu-item/common/hooks/useNavigationObjectMetadataItems';
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
import { viewsSelector } from '@/views/states/selectors/viewsSelector';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
@@ -13,30 +12,22 @@ export const useSortedNavigationMenuItems = () => {
useNavigationMenuItemsData();
const views = useAtomStateValue(viewsSelector);
const objectMetadataItems = useNavigationObjectMetadataItems();
- const isWorkflowCoreEnabled = useIsWorkflowCoreEnabled();
const navigationMenuItemsSorted = useMemo(() => {
return filterAndSortNavigationMenuItems(
navigationMenuItems,
views,
objectMetadataItems,
- isWorkflowCoreEnabled,
);
- }, [navigationMenuItems, views, objectMetadataItems, isWorkflowCoreEnabled]);
+ }, [navigationMenuItems, views, objectMetadataItems]);
const workspaceNavigationMenuItemsSorted = useMemo(() => {
return filterAndSortNavigationMenuItems(
workspaceNavigationMenuItems,
views,
objectMetadataItems,
- isWorkflowCoreEnabled,
);
- }, [
- workspaceNavigationMenuItems,
- views,
- objectMetadataItems,
- isWorkflowCoreEnabled,
- ]);
+ }, [workspaceNavigationMenuItems, views, objectMetadataItems]);
return {
navigationMenuItemsSorted,
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/object/components/NavigationDrawerItemForObjectMetadataItem.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/object/components/NavigationDrawerItemForObjectMetadataItem.tsx
index 3f7578785b3..0c53848ee2b 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/object/components/NavigationDrawerItemForObjectMetadataItem.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/object/components/NavigationDrawerItemForObjectMetadataItem.tsx
@@ -165,14 +165,9 @@ export const NavigationDrawerItemForObjectMetadataItem = ({
)
: () => <ObjectMetadataIcon objectMetadataItem={objectMetadataItem} />;
- const isWorkflowCoreIndexPageEnabled = useIsFeatureEnabled(
- FeatureFlagKey.IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED,
- );
-
const isCoreWorkflowsIndexItem = isCoreWorkflowsObjectNavigationMenuItem({
navigationMenuItemType: navigationMenuItem?.type,
objectNameSingular: objectMetadataItem.nameSingular,
- isWorkflowCoreIndexPageEnabled,
});
const objectSecondaryLabel = isViewWithResolvedView
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/utils/__tests__/isCoreWorkflowsObjectNavigationMenuItem.test.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/utils/__tests__/isCoreWorkflowsObjectNavigationMenuItem.test.ts
index 75dbcdfd4fe..fdd0eb0ca22 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/utils/__tests__/isCoreWorkflowsObjectNavigationMenuItem.test.ts
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/utils/__tests__/isCoreWorkflowsObjectNavigationMenuItem.test.ts
@@ -3,32 +3,20 @@ import { NavigationMenuItemType } from 'twenty-shared/types';
import { isCoreWorkflowsObjectNavigationMenuItem } from '@/navigation-menu-item/display/utils/isCoreWorkflowsObjectNavigationMenuItem';
describe('isCoreWorkflowsObjectNavigationMenuItem', () => {
- it('should match an OBJECT item on the workflow object when the flag is on', () => {
+ it('should match an OBJECT item on the workflow object', () => {
expect(
isCoreWorkflowsObjectNavigationMenuItem({
navigationMenuItemType: NavigationMenuItemType.OBJECT,
objectNameSingular: 'workflow',
- isWorkflowCoreIndexPageEnabled: true,
}),
).toBe(true);
});
- it('should not match when the flag is off', () => {
- expect(
- isCoreWorkflowsObjectNavigationMenuItem({
- navigationMenuItemType: NavigationMenuItemType.OBJECT,
- objectNameSingular: 'workflow',
- isWorkflowCoreIndexPageEnabled: false,
- }),
- ).toBe(false);
- });
-
it('should not match VIEW items on the workflow object', () => {
expect(
isCoreWorkflowsObjectNavigationMenuItem({
navigationMenuItemType: NavigationMenuItemType.VIEW,
objectNameSingular: 'workflow',
- isWorkflowCoreIndexPageEnabled: true,
}),
).toBe(false);
});
@@ -38,7 +26,6 @@ describe('isCoreWorkflowsObjectNavigationMenuItem', () => {
isCoreWorkflowsObjectNavigationMenuItem({
navigationMenuItemType: NavigationMenuItemType.OBJECT,
objectNameSingular: 'company',
- isWorkflowCoreIndexPageEnabled: true,
}),
).toBe(false);
});
@@ -47,7 +34,6 @@ describe('isCoreWorkflowsObjectNavigationMenuItem', () => {
expect(
isCoreWorkflowsObjectNavigationMenuItem({
objectNameSingular: 'workflow',
- isWorkflowCoreIndexPageEnabled: true,
}),
).toBe(false);
});
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/utils/isCoreWorkflowsObjectNavigationMenuItem.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/utils/isCoreWorkflowsObjectNavigationMenuItem.ts
index 2f931bff7ed..623db7edfb0 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/utils/isCoreWorkflowsObjectNavigationMenuItem.ts
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/utils/isCoreWorkflowsObjectNavigationMenuItem.ts
@@ -1,18 +1,14 @@
-import { NavigationMenuItemType } from 'twenty-shared/types';
-
-import { isCoreWorkflowsIndexEnabled } from '@/object-core/workflows/utils/isCoreWorkflowsIndexEnabled';
+import {
+ CoreObjectNameSingular,
+ NavigationMenuItemType,
+} from 'twenty-shared/types';
export const isCoreWorkflowsObjectNavigationMenuItem = ({
navigationMenuItemType,
objectNameSingular,
- isWorkflowCoreIndexPageEnabled,
}: {
navigationMenuItemType?: NavigationMenuItemType;
objectNameSingular?: string | null;
- isWorkflowCoreIndexPageEnabled: boolean;
}) =>
navigationMenuItemType === NavigationMenuItemType.OBJECT &&
- isCoreWorkflowsIndexEnabled({
- objectNameSingular,
- isWorkflowCoreIndexPageEnabled,
- });
+ objectNameSingular === CoreObjectNameSingular.Workflow;
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.tsx
index 3ccd31c755d..0ce9d3349db 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
@@ -18,12 +18,8 @@ import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
i18n.load({ [SOURCE_LOCALE]: messages });
i18n.activate(SOURCE_LOCALE);
-const mockIsCoreEnabled = jest.fn();
const mockHasPermission = jest.fn();
-jest.mock('@/workspace/hooks/useIsFeatureEnabled', () => ({
- useIsFeatureEnabled: () => mockIsCoreEnabled(),
-}));
jest.mock('@/settings/roles/hooks/useHasPermissionFlag', () => ({
useHasPermissionFlag: () => mockHasPermission(),
}));
@@ -66,7 +62,6 @@ const renderCommands = () => {
describe('useCoreObjectsCommands', () => {
beforeEach(() => {
- mockIsCoreEnabled.mockReturnValue(true);
mockHasPermission.mockReturnValue(true);
jotaiStore.set(coreWorkflowsFilterSettingsState.atom, {});
});
@@ -89,12 +84,4 @@ describe('useCoreObjectsCommands', () => {
const { result } = renderCommands();
expect(result.current.shouldDisplayCoreWorkflowsDeleteCommand).toBe(false);
});
-
- it('keeps core commands hidden with the flag off', () => {
- mockIsCoreEnabled.mockReturnValue(false);
- const { result } = renderCommands();
- expect(result.current.coreObjectCommandIds).toEqual([]);
- expect(result.current.coreSelectionCommandIds).toEqual([]);
- expect(result.current.coreSelectionSectionContext).toBeUndefined();
- });
});
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.ts
index fd4080fb112..f27426d6ac9 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
@@ -3,7 +3,6 @@ import { useContext } from 'react';
import {
ContextStorePageType,
CoreObjectNameSingular,
- FeatureFlagKey,
} from 'twenty-shared/types';
import { isNonEmptyArray } from 'twenty-shared/utils';
@@ -18,7 +17,6 @@ import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFla
import { PermissionFlagType } from 'twenty-shared/constants';
import { sidePanelSearchState } from '@/side-panel/states/sidePanelSearchState';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
import { normalizeSearchText } from 'twenty-ui/utilities';
export const useCoreObjectsCommands = () => {
@@ -27,10 +25,6 @@ export const useCoreObjectsCommands = () => {
useContext(CommandMenuContext);
const sidePanelSearch = useAtomStateValue(sidePanelSearchState);
- const isWorkflowCoreIndexPageEnabled = useIsFeatureEnabled(
- FeatureFlagKey.IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED,
- );
-
const canManageWorkflows = useHasPermissionFlag(PermissionFlagType.WORKFLOWS);
const coreWorkflowsSelection = useAtomStateValue(coreWorkflowsSelectionState);
@@ -44,7 +38,6 @@ export const useCoreObjectsCommands = () => {
});
const isOnCoreWorkflowsIndex =
- isWorkflowCoreIndexPageEnabled &&
commandMenuContextApi.pageType === ContextStorePageType.Index &&
commandMenuContextApi.objectMetadataItem.nameSingular ===
CoreObjectNameSingular.Workflow;
diff --git a/packages/twenty-front/src/modules/object-core/workflows/components/CoreWorkflowToWorkspaceRedirect.tsx b/packages/twenty-front/src/modules/object-core/workflows/components/CoreWorkflowToWorkspaceRedirect.tsx
deleted file mode 100644
index 149b4574a39..00000000000
--- a/packages/twenty-front/src/modules/object-core/workflows/components/CoreWorkflowToWorkspaceRedirect.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import { Navigate } from 'react-router-dom';
-import { AppPath, CoreObjectNameSingular } from 'twenty-shared/types';
-import { getAppPath, isDefined } from 'twenty-shared/utils';
-import { Loader } from 'twenty-ui/primitives/feedback';
-
-import { WorkspaceRouteUnavailable } from '@/ui/layout/page/components/WorkspaceRouteUnavailable';
-import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
-import { type Workflow } from '@/workflow/types/Workflow';
-
-export const CoreWorkflowToWorkspaceRedirect = ({
- coreWorkflowId,
-}: {
- coreWorkflowId: string;
-}) => {
- const { records, loading } = useFindManyRecords<
- Pick<Workflow, 'id' | '__typename'> & { coreWorkflowId: string | null }
- >({
- objectNameSingular: CoreObjectNameSingular.Workflow,
- filter: { coreWorkflowId: { eq: coreWorkflowId } },
- recordGqlFields: { id: true, coreWorkflowId: true },
- });
-
- if (loading) {
- return <Loader />;
- }
-
- const workspaceWorkflowId = records[0]?.id;
-
- if (!isDefined(workspaceWorkflowId)) {
- return <WorkspaceRouteUnavailable />;
- }
-
- return (
- <Navigate
- replace
- to={getAppPath(AppPath.RecordShowPage, {
- objectNameSingular: CoreObjectNameSingular.Workflow,
- objectRecordId: workspaceWorkflowId,
- })}
- />
- );
-};
diff --git a/packages/twenty-front/src/modules/object-core/workflows/docs/rollout.md b/packages/twenty-front/src/modules/object-core/workflows/docs/rollout.md
deleted file mode 100644
index 5e3117b1bf3..00000000000
--- a/packages/twenty-front/src/modules/object-core/workflows/docs/rollout.md
+++ /dev/null
@@ -1,78 +0,0 @@
-# Core workflow frontend rollout
-
-This frontend uses the core-ID API merged through #26068, and this branch is rebased onto that merge. Keep `IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED` disabled for general rollout until the dependencies below are satisfied. This change does not switch the background execution engine.
-
-## Definition ownership and rollback
-
-With the flag enabled, the workflow show page uses `/workflow/:coreWorkflowId` and the index stays at `/objects/workflows`. Version selectors, diagrams, draft editing, output-schema keys, command-menu actions and definition mutations use core IDs. The existing workspace route resolves its mirror's core ID and redirects. A failed core query shows an error; it never loads a workspace definition as a fallback.
-
-With the flag disabled, the workspace index, show page and mutation paths remain available. A core direct link resolves its workspace mirror and redirects. The backend's core-authoritative writes and rollback mirrors must remain deployed, including the legacy-write-to-core synchronization provided by #26068. Disabling the UI flag does not roll back database migrations.
-
-Workflow runs remain workspace records. Run navigation, subscriptions, retry and stop continue to use the workspace run ID. The core UI uses the run's `coreWorkflowId` and `coreWorkflowVersionId` to inspect definitions. Business record IDs inside trigger payloads and step inputs are not translated.
-
-Existing command-menu items with only `workflowVersionId` resolve the core version before executing with the flag enabled. Items containing both references prefer the core reference when enabled and the workspace reference when disabled. Apply the inherited pointer backfill and this PR's command-menu check-constraint migration before creating core-only items.
-
-## Blocking live-update contract
-
-The available SSE stream has workspace `objectRecordEventsWithQueryIds`, metadata events and queue events. Its record operation signatures accept workspace object metadata and workspace record IDs. There is no core workflow/version subscription contract. Core mirror writes emitting workspace events do not constitute a core event contract.
-
-Before rollout, the SSE dependency must provide:
-
-- Workspace-scoped, permission-checked subscriptions for core workflows and their versions, authorized by the workflow permission.
-- Created, updated and deleted events carrying `coreWorkflowId` and, for version events, `coreWorkflowVersionId`.
-- An ordering/revision mechanism and reconnect resynchronization, including missed deletions and draft replacement.
-- Lifecycle coverage for every writer: core mutations, legacy mirror writes, activation/deactivation, draft creation/discard, duplication and deletion.
-
-Deliver the backend contract and frontend consumer together in a separate follow-up PR, which may be stacked on this frontend PR. The consumer must invalidate `coreWorkflows`, `coreWorkflowById`, `coreWorkflowVersionsByCoreWorkflowId` and `coreWorkflowVersionById`, reconcile removed selections and update open diagrams. It must not subscribe using workspace definition IDs. Local mutation refetches are implemented; remote live updates are not complete. Keep general rollout blocked until that contract and consumer land and multi-session/reconnect tests pass.
-
-## Execution integration
-
-B-async (#26098) is merged. The shared execution engine, automated triggers and webhook resolution now consume core definitions independently of the UI flag. Core webhook URLs contain a core workflow ID, while existing workspace-ID URLs remain supported.
-
-This frontend PR is rebased and retargeted onto `main` after #26068 and #26098 merged. Their overlapping core-version UI/context, generated GraphQL, workflow lifecycle/list services and instance-command registrations are reconciled on this branch. Before enabling the flag, rerun the complete create → edit → activate → run → inspect flow, command-menu lifecycle after the core-only rename/deletion cleanup, connected If/Else duplication, and ON → OFF → ON rollback behavior against the integrated backend.
-
-## Integrated duplication verification
-
-Browser acceptance exposed a failure in the earlier #26068 implementation: connected If/Else branch destinations were left pointing at the original steps during workflow duplication. The merged API now remaps those destinations through `remapDuplicatedStepDestinations`.
-
-The upstream regression suite covering regular, iterator and If/Else destinations passes on this rebased branch. Browser re-verification of manual trigger → iterator → If/Else → form duplication remains part of final-stack acceptance with the reconciled B-async branch.
-
-MCP rekeying and the A1bis constraints remain separate follow-up work. They are not prerequisites for completing this flag-gated frontend PR, but the full migration must not claim them as covered here.
-
-## Acceptance before enabling
-
-Exercise create, rename, step/trigger/edge/position editing, activation, run inspection, duplication, version switching, draft replacement/discard and deletion with unequal core/workspace IDs. Include manual and webhook triggers, iterator, If/Else, form and code actions, and iterator schema recomputation using `coreWorkflowVersionId`.
-
-Exercise ON → OFF → ON with edits on each UI, direct links and browser history; verify permission denial, missing records and failed queries. Verify multi-session edits, remote deletion, dropped events and SSE reconnect. Search, favorites and workspace-object teardown remain separate migrations.
-
-
-## Browser acceptance on twenty-2 (2026-09-17)
-
-Tested this branch on `apple.localhost:4001` against its server/worker and local `default_2` database, after applying instance migrations and inherited pointer backfills. Only the local Apple workspace flag was toggled. Core/workspace workflow and version IDs were different throughout.
-
-| Area | Observed result |
-| --- | --- |
-| Create, rename and navigation | Index creation redirected to the new core workflow; names persisted across refetch. Legacy direct links redirected to core when enabled. |
-| Editing | Manual and webhook trigger editing, POST body editing, code source editing, iterator items, If/Else conditions using iterator output, and form fields persisted. Step duplication/deletion, edge deletion/reconnection and node movement persisted. |
-| Drafts and versions | First edit of an active version created a core draft. Later edits stayed on that returned draft; the active version was unchanged. Version switching and browser Back restored the selected content. Discard returned to the published version. Restoring a historical version over an existing draft selected the replacement draft; subsequent editing saved to that replacement. |
-| Validation and lifecycle | Validate, activate and deactivate succeeded. Manual/form workflow duplication succeeded. Index deletion removed the selected duplicate and cleared selection; its direct link showed Workflow not found. |
-| Run and inspection | A manual/form run completed, its submitted value appeared in step output, and See Version opened its core version. Immediate submission no longer races the pending form autosave. |
-| Rollback | ON → OFF → ON preserved the complex draft. Flag-off core links redirected to the workspace mirror, the workspace index/show paths worked, and a name edit through the old UI appeared in core after re-enabling. Read-only SQL confirmed matching step, trigger and status content in all four tested core/mirror version pairs. |
-| Errors and permissions | A Guest without workflow permission saw explicit denial. A malformed core ID showed an error/retry state. A deleted workflow showed missing-record state. Neither used workspace fallback. Stopping the local server left a failed rename in the input; after restarting, retrying without retyping saved that name. |
-| ID boundaries | Completed workspace run `de3f9855-6c0a-4820-bee1-1407afb6b572` retained its ID and referenced core workflow `c3546f66-d16f-465f-93ca-a82f3db536b6` / version `13f37ddc-3620-49a4-b92d-a2e9b4ca6225`. A business-record UUID in the webhook payload was preserved unchanged. |
-
-Incomplete acceptance is explicit: the merged backend If/Else duplication regression passes, while browser verification on the final combined frontend/API/B-async stack remains pending. Code source persisted, but executing its Lambda build failed because the local AWS SSO session had expired. Actual webhook/automated execution remains B-async acceptance. Core definition remote updates, remote deletion and reconnect remain blocked on the missing SSE contract and consumer; workspace run SSE was observed updating the completed run.
-
-### Screenshots
-
-If/Else editing using iterator output:
-
-![Core conditional editor](acceptance-images/core-conditional-editor.png)
-
-Completed workspace run inspected beside its core definition:
-
-![Completed form run](acceptance-images/core-completed-run.png)
-
-Editing the replacement draft after restoring a historical version:
-
-![Restored draft editor](acceptance-images/core-restored-draft.png)
diff --git a/packages/twenty-front/src/modules/object-core/workflows/hooks/useHiddenWorkspaceWorkflowRunRelationFields.ts b/packages/twenty-front/src/modules/object-core/workflows/hooks/useHiddenWorkspaceWorkflowRunRelationFields.ts
index 24eca6bab59..78a78be5068 100644
--- a/packages/twenty-front/src/modules/object-core/workflows/hooks/useHiddenWorkspaceWorkflowRunRelationFields.ts
+++ b/packages/twenty-front/src/modules/object-core/workflows/hooks/useHiddenWorkspaceWorkflowRunRelationFields.ts
@@ -1,9 +1,7 @@
import { useMemo } from 'react';
-import { FeatureFlagKey } from 'twenty-shared/types';
import { isHiddenWorkspaceWorkflowRunRelationField } from '@/object-core/workflows/utils/isHiddenWorkspaceWorkflowRunRelationField';
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
// Remove with the workspace workflow and workflowVersion objects, once the
// core migration owns them.
@@ -12,10 +10,6 @@ export const useHiddenWorkspaceWorkflowRunRelationFields = (
) => {
const { objectMetadataItems } = useObjectMetadataItems();
- const isWorkflowCoreIndexPageEnabled = useIsFeatureEnabled(
- FeatureFlagKey.IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED,
- );
-
return useMemo(
() =>
(
@@ -28,10 +22,9 @@ export const useHiddenWorkspaceWorkflowRunRelationFields = (
isHiddenWorkspaceWorkflowRunRelationField({
objectNameSingular,
fieldName: field.name,
- isWorkflowCoreIndexPageEnabled,
}),
)
.flatMap((field) => [field.id, field.name]),
- [objectMetadataItems, objectNameSingular, isWorkflowCoreIndexPageEnabled],
+ [objectMetadataItems, objectNameSingular],
);
};
diff --git a/packages/twenty-front/src/modules/object-core/workflows/utils/__tests__/isHiddenWorkspaceWorkflowRunRelationField.test.ts b/packages/twenty-front/src/modules/object-core/workflows/utils/__tests__/isHiddenWorkspaceWorkflowRunRelationField.test.ts
index b30afe6bad2..b41ea210fe1 100644
--- a/packages/twenty-front/src/modules/object-core/workflows/utils/__tests__/isHiddenWorkspaceWorkflowRunRelationField.test.ts
+++ b/packages/twenty-front/src/modules/object-core/workflows/utils/__tests__/isHiddenWorkspaceWorkflowRunRelationField.test.ts
@@ -4,44 +4,31 @@ import { isHiddenWorkspaceWorkflowRunRelationField } from '@/object-core/workflo
describe('isHiddenWorkspaceWorkflowRunRelationField', () => {
it.each(['workflow', 'workflowVersion'])(
- 'should hide the %s relation field on a workflow run when the flag is on',
+ 'should hide the %s relation field on a workflow run',
(fieldName) => {
expect(
isHiddenWorkspaceWorkflowRunRelationField({
objectNameSingular: CoreObjectNameSingular.WorkflowRun,
fieldName,
- isWorkflowCoreIndexPageEnabled: true,
}),
).toBe(true);
},
);
- it('should keep the workspace relation fields when the flag is off', () => {
- expect(
- isHiddenWorkspaceWorkflowRunRelationField({
- objectNameSingular: CoreObjectNameSingular.WorkflowRun,
- fieldName: 'workflow',
- isWorkflowCoreIndexPageEnabled: false,
- }),
- ).toBe(false);
- });
-
- it('should keep the other workflow run fields when the flag is on', () => {
+ it('should keep the other workflow run fields', () => {
expect(
isHiddenWorkspaceWorkflowRunRelationField({
objectNameSingular: CoreObjectNameSingular.WorkflowRun,
fieldName: 'status',
- isWorkflowCoreIndexPageEnabled: true,
}),
).toBe(false);
});
- it('should keep the workflow relation of other objects when the flag is on', () => {
+ it('should keep the workflow relation of other objects', () => {
expect(
isHiddenWorkspaceWorkflowRunRelationField({
objectNameSingular: CoreObjectNameSingular.WorkflowVersion,
fieldName: 'workflow',
- isWorkflowCoreIndexPageEnabled: true,
}),
).toBe(false);
});
@@ -51,7 +38,6 @@ describe('isHiddenWorkspaceWorkflowRunRelationField', () => {
isHiddenWorkspaceWorkflowRunRelationField({
objectNameSingular: undefined,
fieldName: 'workflow',
- isWorkflowCoreIndexPageEnabled: true,
}),
).toBe(false);
});
diff --git a/packages/twenty-front/src/modules/object-core/workflows/utils/__tests__/isWorkspaceWorkflowVersionRouteHidden.test.ts b/packages/twenty-front/src/modules/object-core/workflows/utils/__tests__/isWorkspaceWorkflowVersionRouteHidden.test.ts
index 5936c31bc58..856867eb974 100644
--- a/packages/twenty-front/src/modules/object-core/workflows/utils/__tests__/isWorkspaceWorkflowVersionRouteHidden.test.ts
+++ b/packages/twenty-front/src/modules/object-core/workflows/utils/__tests__/isWorkspaceWorkflowVersionRouteHidden.test.ts
@@ -3,36 +3,24 @@ import { CoreObjectNameSingular } from 'twenty-shared/types';
import { isWorkspaceWorkflowVersionRouteHidden } from '@/object-core/workflows/utils/isWorkspaceWorkflowVersionRouteHidden';
describe('isWorkspaceWorkflowVersionRouteHidden', () => {
- it('should hide the workflow version route when the flag is on', () => {
+ it('should hide the workflow version route', () => {
expect(
isWorkspaceWorkflowVersionRouteHidden({
objectNameSingular: CoreObjectNameSingular.WorkflowVersion,
- isWorkflowCoreIndexPageEnabled: true,
}),
).toBe(true);
});
- it('should keep the workflow version route when the flag is off', () => {
- expect(
- isWorkspaceWorkflowVersionRouteHidden({
- objectNameSingular: CoreObjectNameSingular.WorkflowVersion,
- isWorkflowCoreIndexPageEnabled: false,
- }),
- ).toBe(false);
- });
-
- it('should not hide other objects when the flag is on', () => {
+ it('should not hide other objects', () => {
expect(
isWorkspaceWorkflowVersionRouteHidden({
objectNameSingular: CoreObjectNameSingular.Workflow,
- isWorkflowCoreIndexPageEnabled: true,
}),
).toBe(false);
expect(
isWorkspaceWorkflowVersionRouteHidden({
objectNameSingular: CoreObjectNameSingular.WorkflowRun,
- isWorkflowCoreIndexPageEnabled: true,
}),
).toBe(false);
});
@@ -41,7 +29,6 @@ describe('isWorkspaceWorkflowVersionRouteHidden', () => {
expect(
isWorkspaceWorkflowVersionRouteHidden({
objectNameSingular: undefined,
- isWorkflowCoreIndexPageEnabled: true,
}),
).toBe(false);
});
diff --git a/packages/twenty-front/src/modules/object-core/workflows/utils/invalidateCoreWorkflowQueries.ts b/packages/twenty-front/src/modules/object-core/workflows/utils/invalidateCoreWorkflowQueries.ts
index 6f9bfbf5687..2e3ba6cda51 100644
--- a/packages/twenty-front/src/modules/object-core/workflows/utils/invalidateCoreWorkflowQueries.ts
+++ b/packages/twenty-front/src/modules/object-core/workflows/utils/invalidateCoreWorkflowQueries.ts
@@ -1,6 +1,5 @@
import { type ApolloClient } from '@apollo/client';
-import { GET_WORKFLOW_VERSION_CONTENT } from '@/workflow/workflow-version/graphql/queries/getWorkflowVersionContent';
import {
GetCoreWorkflowDocument,
GetCoreWorkflowsDocument,
@@ -19,7 +18,6 @@ export const invalidateCoreWorkflowQueries = async (
'coreWorkflowById',
'coreWorkflowVersionById',
'coreWorkflowVersionsByCoreWorkflowId',
- 'workflowVersionContent',
// The command menu reads this one to decide which workflow actions to offer,
// so a version change has to refresh it even when the list is left alone.
'coreWorkflowsWithCurrentVersions',
@@ -35,7 +33,6 @@ export const invalidateCoreWorkflowQueries = async (
GetCoreWorkflowVersionsDocument,
GetCoreWorkflowVersionDocument,
GetCoreWorkflowDocument,
- GET_WORKFLOW_VERSION_CONTENT,
GetCoreWorkflowsWithCurrentVersionsDocument,
...(shouldInvalidateWorkflowList ? [GetCoreWorkflowsDocument] : []),
],
diff --git a/packages/twenty-front/src/modules/object-core/workflows/utils/isCoreWorkflowsIndexEnabled.ts b/packages/twenty-front/src/modules/object-core/workflows/utils/isCoreWorkflowsIndexEnabled.ts
deleted file mode 100644
index 0afe4069269..00000000000
--- a/packages/twenty-front/src/modules/object-core/workflows/utils/isCoreWorkflowsIndexEnabled.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { CoreObjectNameSingular } from 'twenty-shared/types';
-
-export const isCoreWorkflowsIndexEnabled = ({
- objectNameSingular,
- isWorkflowCoreIndexPageEnabled,
-}: {
- objectNameSingular?: string | null;
- isWorkflowCoreIndexPageEnabled: boolean;
-}) =>
- isWorkflowCoreIndexPageEnabled &&
- objectNameSingular === CoreObjectNameSingular.Workflow;
diff --git a/packages/twenty-front/src/modules/object-core/workflows/utils/isHiddenWorkspaceWorkflowRunRelationField.ts b/packages/twenty-front/src/modules/object-core/workflows/utils/isHiddenWorkspaceWorkflowRunRelationField.ts
index 443e9d99ff8..2bf12dd553d 100644
--- a/packages/twenty-front/src/modules/object-core/workflows/utils/isHiddenWorkspaceWorkflowRunRelationField.ts
+++ b/packages/twenty-front/src/modules/object-core/workflows/utils/isHiddenWorkspaceWorkflowRunRelationField.ts
@@ -10,12 +10,9 @@ const HIDDEN_WORKSPACE_WORKFLOW_RUN_RELATION_FIELD_NAMES = [
export const isHiddenWorkspaceWorkflowRunRelationField = ({
objectNameSingular,
fieldName,
- isWorkflowCoreIndexPageEnabled,
}: {
objectNameSingular?: string | null;
fieldName: string;
- isWorkflowCoreIndexPageEnabled: boolean;
}) =>
- isWorkflowCoreIndexPageEnabled &&
objectNameSingular === CoreObjectNameSingular.WorkflowRun &&
HIDDEN_WORKSPACE_WORKFLOW_RUN_RELATION_FIELD_NAMES.includes(fieldName);
diff --git a/packages/twenty-front/src/modules/object-core/workflows/utils/isWorkspaceWorkflowVersionRouteHidden.ts b/packages/twenty-front/src/modules/object-core/workflows/utils/isWorkspaceWorkflowVersionRouteHidden.ts
index 7d5827061d0..370a2612768 100644
--- a/packages/twenty-front/src/modules/object-core/workflows/utils/isWorkspaceWorkflowVersionRouteHidden.ts
+++ b/packages/twenty-front/src/modules/object-core/workflows/utils/isWorkspaceWorkflowVersionRouteHidden.ts
@@ -2,10 +2,6 @@ import { CoreObjectNameSingular } from 'twenty-shared/types';
export const isWorkspaceWorkflowVersionRouteHidden = ({
objectNameSingular,
- isWorkflowCoreIndexPageEnabled,
}: {
objectNameSingular?: string | null;
- isWorkflowCoreIndexPageEnabled: boolean;
-}) =>
- isWorkflowCoreIndexPageEnabled &&
- objectNameSingular === CoreObjectNameSingular.WorkflowVersion;
+}) => objectNameSingular === CoreObjectNameSingular.WorkflowVersion;
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminFeatureFlagMetadata.ts b/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminFeatureFlagMetadata.ts
index 167197f59c6..5a432b390aa 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminFeatureFlagMetadata.ts
+++ b/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminFeatureFlagMetadata.ts
@@ -32,10 +32,6 @@ export const SETTINGS_ADMIN_FEATURE_FLAG_METADATA: Record<
label: msg`Application workflows`,
description: msg`Allow applications to install workflows and start new workflow runs.`,
},
- [FeatureFlagKey.IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED]: {
- label: msg`Workflow index page`,
- description: msg`Use the dedicated workflow index page to browse workflows and their versions.`,
- },
[FeatureFlagKey.IS_AI_CHAT_SHARING_DROPDOWN_ENABLED]: {
label: msg`AI chat sharing dropdown`,
description: msg`Show the sharing dropdown on AI conversations when record sharing is enabled.`,
diff --git a/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useSearchableObjectNameSingulars.test.tsx b/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useSearchableObjectNameSingulars.test.tsx
index bda7ffc9ba9..bbdc69bb26d 100644
--- a/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useSearchableObjectNameSingulars.test.tsx
+++ b/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useSearchableObjectNameSingulars.test.tsx
@@ -6,8 +6,6 @@ import { useSearchableObjectNameSingulars } from '@/side-panel/hooks/useSearchab
import { sidePanelShowHiddenObjectsState } from '@/side-panel/states/sidePanelShowHiddenObjectsState';
import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
-let isWorkflowCoreEnabled = false;
-
jest.mock('@/object-metadata/hooks/useReadableObjectMetadataItems', () => ({
useReadableObjectMetadataItems: () => ({
readableObjectMetadataItems: [
@@ -18,10 +16,6 @@ jest.mock('@/object-metadata/hooks/useReadableObjectMetadataItems', () => ({
}),
}));
-jest.mock('@/workflow/hooks/useIsWorkflowCoreEnabled', () => ({
- useIsWorkflowCoreEnabled: () => isWorkflowCoreEnabled,
-}));
-
const Wrapper = ({ children }: { children: ReactNode }) => (
<JotaiProvider store={jotaiStore}>{children}</JotaiProvider>
);
@@ -36,36 +30,21 @@ const renderSearchableObjectNameSingulars = (
describe('useSearchableObjectNameSingulars', () => {
beforeEach(() => {
- isWorkflowCoreEnabled = false;
jotaiStore.set(sidePanelShowHiddenObjectsState.atom, false);
});
- it('excludes workflows when the workflow core index page is enabled', () => {
- isWorkflowCoreEnabled = true;
-
- expect(renderSearchableObjectNameSingulars()).toEqual([
- 'company',
- 'person',
- ]);
- });
-
- it('keeps workflows when the workflow core index page is disabled', () => {
+ it('excludes workflows', () => {
expect(renderSearchableObjectNameSingulars()).toEqual([
'company',
- 'workflow',
'person',
]);
});
- it('searches nothing when workflows are explicitly selected under the flag', () => {
- isWorkflowCoreEnabled = true;
-
+ it('searches nothing when workflows are explicitly selected', () => {
expect(renderSearchableObjectNameSingulars('workflow')).toEqual([]);
});
it('keeps an explicitly selected object that is not a workflow', () => {
- isWorkflowCoreEnabled = true;
-
expect(renderSearchableObjectNameSingulars('company')).toEqual(['company']);
});
});
diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useSearchableObjectNameSingulars.ts b/packages/twenty-front/src/modules/side-panel/hooks/useSearchableObjectNameSingulars.ts
index e902441f371..1214ab9cbf7 100644
--- a/packages/twenty-front/src/modules/side-panel/hooks/useSearchableObjectNameSingulars.ts
+++ b/packages/twenty-front/src/modules/side-panel/hooks/useSearchableObjectNameSingulars.ts
@@ -5,7 +5,6 @@ import { isDefined } from 'twenty-shared/utils';
import { useReadableObjectMetadataItems } from '@/object-metadata/hooks/useReadableObjectMetadataItems';
import { sidePanelShowHiddenObjectsState } from '@/side-panel/states/sidePanelShowHiddenObjectsState';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
type UseSearchableObjectNameSingularsParams = {
selectedObjectNameSingular?: string | null;
@@ -18,11 +17,9 @@ export const useSearchableObjectNameSingulars = ({
const sidePanelShowHiddenObjects = useAtomStateValue(
sidePanelShowHiddenObjectsState,
);
- const isWorkflowCoreEnabled = useIsWorkflowCoreEnabled();
return useMemo(() => {
const isSearchableObjectNameSingular = (objectNameSingular: string) =>
- !isWorkflowCoreEnabled ||
objectNameSingular !== CoreObjectNameSingular.Workflow;
if (isDefined(selectedObjectNameSingular)) {
@@ -39,6 +36,5 @@ export const useSearchableObjectNameSingulars = ({
readableObjectMetadataItems,
selectedObjectNameSingular,
sidePanelShowHiddenObjects,
- isWorkflowCoreEnabled,
]);
};
diff --git a/packages/twenty-front/src/modules/workflow/hooks/useIsWorkflowCoreEnabled.ts b/packages/twenty-front/src/modules/workflow/hooks/useIsWorkflowCoreEnabled.ts
deleted file mode 100644
index 348343d53d1..00000000000
--- a/packages/twenty-front/src/modules/workflow/hooks/useIsWorkflowCoreEnabled.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
-import { FeatureFlagKey } from 'twenty-shared/types';
-
-export const useIsWorkflowCoreEnabled = () =>
- useIsFeatureEnabled(FeatureFlagKey.IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED);
diff --git a/packages/twenty-front/src/modules/workflow/workflow-version/graphql/mutations/updateWorkflowVersionPositions.ts b/packages/twenty-front/src/modules/workflow/workflow-version/graphql/mutations/updateWorkflowVersionPositions.ts
deleted file mode 100644
index 55d9dfbe36d..00000000000
--- a/packages/twenty-front/src/modules/workflow/workflow-version/graphql/mutations/updateWorkflowVersionPositions.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { gql } from '@apollo/client';
-
-export const UPDATE_WORKFLOW_VERSION_POSITIONS = gql`
- mutation UpdateWorkflowVersionPositions(
- $input: UpdateWorkflowVersionPositionsInput!
- ) {
- updateWorkflowVersionPositions(input: $input)
- }
-`;
diff --git a/packages/twenty-front/src/modules/workflow/workflow-version/graphql/queries/getWorkflowVersionContent.ts b/packages/twenty-front/src/modules/workflow/workflow-version/graphql/queries/getWorkflowVersionContent.ts
deleted file mode 100644
index 952f258f7c2..00000000000
--- a/packages/twenty-front/src/modules/workflow/workflow-version/graphql/queries/getWorkflowVersionContent.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { gql } from '@apollo/client';
-
-export const GET_WORKFLOW_VERSION_CONTENT = gql`
- query GetWorkflowVersionContent($workflowVersionId: UUID!) {
- workflowVersionContent(workflowVersionId: $workflowVersionId) {
- workflowVersionId
- trigger
- steps
- }
- }
-`;
diff --git a/packages/twenty-front/src/modules/workflow/workflow-version/hooks/useTidyUpWorkflowVersion.ts b/packages/twenty-front/src/modules/workflow/workflow-version/hooks/useTidyUpWorkflowVersion.ts
index 06cd162b71c..a6f73e0b04d 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-version/hooks/useTidyUpWorkflowVersion.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-version/hooks/useTidyUpWorkflowVersion.ts
@@ -1,67 +1,31 @@
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
import { invalidateCoreWorkflowVersions } from '@/object-core/workflows/versions/utils/invalidateCoreWorkflowVersions';
-import {
- UpdateCoreWorkflowVersionPositionsDocument,
- type UpdateWorkflowVersionPositionsMutation,
- type UpdateWorkflowVersionPositionsMutationVariables,
-} from '~/generated/graphql';
-import { type WorkflowVersion } from '@/workflow/types/Workflow';
+import { UpdateCoreWorkflowVersionPositionsDocument } from '~/generated/graphql';
import { type WorkflowDiagram } from '@/workflow/workflow-diagram/types/WorkflowDiagram';
import { useMutation } from '@apollo/client/react';
import { isDefined } from 'twenty-shared/utils';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
-import {
- CoreObjectNameSingular,
- type RecordGqlFields,
-} from 'twenty-shared/types';
-import { useGetRecordFromCache } from '@/object-record/cache/hooks/useGetRecordFromCache';
-import { updateRecordFromCache } from '@/object-record/cache/utils/updateRecordFromCache';
-import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { flowComponentState } from '@/workflow/states/flowComponentState';
import { getOrganizedDiagram } from '@/workflow/workflow-diagram/utils/getOrganizedDiagram';
-import { UPDATE_WORKFLOW_VERSION_POSITIONS } from '@/workflow/workflow-version/graphql/mutations/updateWorkflowVersionPositions';
export const useTidyUpWorkflowVersion = (instanceId?: string) => {
const apolloCoreClient = useApolloCoreClient();
- const isCore = useIsWorkflowCoreEnabled();
const [mutateCore] = useMutation(UpdateCoreWorkflowVersionPositionsDocument, {
client: apolloCoreClient,
});
- const { objectMetadataItems } = useObjectMetadataItems();
- const { objectPermissionsByObjectMetadataId } = useObjectPermissions();
-
- const { objectMetadataItem } = useObjectMetadataItem({
- objectNameSingular: CoreObjectNameSingular.WorkflowVersion,
- });
- const getRecordFromCache = useGetRecordFromCache({
- objectNameSingular: CoreObjectNameSingular.WorkflowVersion,
- });
-
const setFlow = useSetAtomComponentState(flowComponentState, instanceId);
- const [mutate] = useMutation<
- UpdateWorkflowVersionPositionsMutation,
- UpdateWorkflowVersionPositionsMutationVariables
- >(UPDATE_WORKFLOW_VERSION_POSITIONS, { client: apolloCoreClient });
-
const updateWorkflowVersionPosition = async (
workflowVersionId: string,
positions: { id: string; position: { x: number; y: number } }[],
) => {
- if (isCore) {
- await mutateCore({
- variables: {
- input: { coreWorkflowVersionId: workflowVersionId, positions },
- },
- });
- } else {
- await mutate({ variables: { input: { workflowVersionId, positions } } });
- }
+ await mutateCore({
+ variables: {
+ input: { coreWorkflowVersionId: workflowVersionId, positions },
+ },
+ });
setFlow((currentFlow) => {
if (!isDefined(currentFlow)) {
@@ -95,57 +59,7 @@ export const useTidyUpWorkflowVersion = (instanceId?: string) => {
};
});
- if (isCore) {
- await invalidateCoreWorkflowVersions(apolloCoreClient);
- return;
- }
-
- const cachedRecord = getRecordFromCache<WorkflowVersion>(workflowVersionId);
-
- if (!isDefined(cachedRecord)) {
- return;
- }
-
- const triggerPosition = positions.find(
- (position) => position.id === 'trigger',
- );
-
- const updatedTrigger =
- isDefined(triggerPosition) && isDefined(cachedRecord.trigger)
- ? { ...cachedRecord.trigger, position: triggerPosition.position }
- : cachedRecord.trigger;
-
- const updatedSteps = cachedRecord.steps?.map((step) => {
- const stepPosition = positions.find(
- (position) => position.id === step.id,
- );
-
- if (!isDefined(stepPosition)) {
- return step;
- }
-
- return { ...step, position: stepPosition.position };
- });
-
- const newCachedRecord = {
- ...cachedRecord,
- trigger: updatedTrigger,
- steps: updatedSteps,
- };
-
- const recordGqlFields: RecordGqlFields = {
- trigger: true,
- steps: true,
- };
-
- updateRecordFromCache({
- objectMetadataItems,
- objectMetadataItem,
- cache: apolloCoreClient.cache,
- record: newCachedRecord,
- recordGqlFields,
- objectPermissionsByObjectMetadataId,
- });
+ await invalidateCoreWorkflowVersions(apolloCoreClient);
};
const tidyUpWorkflowVersion = async (
diff --git a/packages/twenty-front/src/modules/workflow/workflow-version/hooks/useWorkflowVersionContent.ts b/packages/twenty-front/src/modules/workflow/workflow-version/hooks/useWorkflowVersionContent.ts
index 0739d48904c..4ad6c98b666 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-version/hooks/useWorkflowVersionContent.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-version/hooks/useWorkflowVersionContent.ts
@@ -1,12 +1,10 @@
import { useMemo } from 'react';
import { GetCoreWorkflowVersionDocument } from '~/generated/graphql';
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
import { useQuery } from '@apollo/client/react';
import { isDefined } from 'twenty-shared/utils';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
import { type WorkflowVersion } from '@/workflow/types/Workflow';
-import { GET_WORKFLOW_VERSION_CONTENT } from '@/workflow/workflow-version/graphql/queries/getWorkflowVersionContent';
export type WorkflowVersionContent = {
workflowVersionId: string;
@@ -16,14 +14,13 @@ export type WorkflowVersionContent = {
export const useWorkflowVersionContent = (workflowVersionId?: string) => {
const apolloCoreClient = useApolloCoreClient();
- const isCore = useIsWorkflowCoreEnabled();
const core = useQuery(GetCoreWorkflowVersionDocument, {
client: apolloCoreClient,
variables: { coreWorkflowVersionId: workflowVersionId ?? '' },
fetchPolicy: 'cache-and-network',
- skip: !isCore || !isDefined(workflowVersionId),
+ skip: !isDefined(workflowVersionId),
});
- const coreContent = useMemo(() => {
+ const content = useMemo<WorkflowVersionContent | undefined>(() => {
const version = core.data?.coreWorkflowVersion;
return isDefined(version)
? {
@@ -34,21 +31,11 @@ export const useWorkflowVersionContent = (workflowVersionId?: string) => {
: undefined;
}, [core.data]);
- const { data, loading, refetch } = useQuery<{
- workflowVersionContent: WorkflowVersionContent;
- }>(GET_WORKFLOW_VERSION_CONTENT, {
- client: apolloCoreClient,
- variables: { workflowVersionId },
- skip: isCore || !isDefined(workflowVersionId),
- });
-
return {
- content: isCore ? coreContent : data?.workflowVersionContent,
- loading: isCore ? core.loading : loading,
- refetchContent: isCore ? core.refetch : refetch,
- contentUpdatedAt: isCore
- ? core.data?.coreWorkflowVersion?.updatedAt
- : undefined,
+ content,
+ loading: core.loading,
+ refetchContent: core.refetch,
+ contentUpdatedAt: core.data?.coreWorkflowVersion?.updatedAt,
error: core.error,
};
};
diff --git a/packages/twenty-front/src/pages/object-core/WorkflowCoreShowPage.tsx b/packages/twenty-front/src/pages/object-core/WorkflowCoreShowPage.tsx
index f48625a31e3..1638d0df6f8 100644
--- a/packages/twenty-front/src/pages/object-core/WorkflowCoreShowPage.tsx
+++ b/packages/twenty-front/src/pages/object-core/WorkflowCoreShowPage.tsx
@@ -1,7 +1,6 @@
import { useIsThirdPartyApplication } from '@/applications/hooks/useIsThirdPartyApplication';
import { CoreWorkflowEditor } from '@/object-core/workflows/components/CoreWorkflowEditor';
import { CoreObjectIdentifierBar } from '@/object-core/components/CoreObjectIdentifierBar';
-import { CoreWorkflowToWorkspaceRedirect } from '@/object-core/workflows/components/CoreWorkflowToWorkspaceRedirect';
import { useRenameCoreWorkflow } from '@/object-core/workflows/hooks/useRenameCoreWorkflow';
import { styled } from '@linaria/react';
import { isNonEmptyString } from '@sniptt/guards';
@@ -30,7 +29,6 @@ import { SidePanelToggleButton } from '@/side-panel/components/SidePanelToggleBu
import { PageCardHeader } from '@/ui/layout/page/components/PageCardHeader';
import { PageCardLayout } from '@/ui/layout/page/components/PageCardLayout';
import { PageTitle } from '@/ui/utilities/page-title/components/PageTitle';
-import { useIsWorkflowCoreEnabled } from '@/workflow/hooks/useIsWorkflowCoreEnabled';
import { getWorkflowCurrentVersion } from '@/workflow/utils/getWorkflowCurrentVersion';
import { PageContentSkeletonLoader } from '~/loading/components/PageContentSkeletonLoader';
@@ -193,7 +191,6 @@ const CoreWorkflowShowContent = ({
export const WorkflowCoreShowPage = () => {
const { coreWorkflowId } = useParams<{ coreWorkflowId: string }>();
- const isCore = useIsWorkflowCoreEnabled();
const canManageWorkflows = useHasPermissionFlag(PermissionFlagType.WORKFLOWS);
if (!canManageWorkflows) {
return (
@@ -203,12 +200,10 @@ export const WorkflowCoreShowPage = () => {
if (!isDefined(coreWorkflowId)) {
return <WorkspaceRouteUnavailable />;
}
- return isCore ? (
+ return (
<CoreWorkflowShowContent
key={coreWorkflowId}
coreWorkflowId={coreWorkflowId}
/>
- ) : (
- <CoreWorkflowToWorkspaceRedirect coreWorkflowId={coreWorkflowId} />
);
};
diff --git a/packages/twenty-front/src/pages/object-record/RecordIndexPage.tsx b/packages/twenty-front/src/pages/object-record/RecordIndexPage.tsx
index e84790298b5..ceeaa98a19a 100644
--- a/packages/twenty-front/src/pages/object-record/RecordIndexPage.tsx
+++ b/packages/twenty-front/src/pages/object-record/RecordIndexPage.tsx
@@ -2,7 +2,6 @@ import { WorkspaceRouteUnavailable } from '@/ui/layout/page/components/Workspace
import { contextStoreCurrentObjectMetadataItemIdComponentState } from '@/context-store/states/contextStoreCurrentObjectMetadataItemIdComponentState';
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
import { RecordIndexContainerGater } from '@/object-record/record-index/components/RecordIndexContainerGater';
-import { isCoreWorkflowsIndexEnabled } from '@/object-core/workflows/utils/isCoreWorkflowsIndexEnabled';
import { isWorkspaceWorkflowVersionRouteHidden } from '@/object-core/workflows/utils/isWorkspaceWorkflowVersionRouteHidden';
import { RecordIndexSkeletonLoader } from '@/object-record/record-index/components/RecordIndexSkeletonLoader';
import { useWorkspaceSurface } from '@/ui/layout/hooks/useWorkspaceSurface';
@@ -10,11 +9,10 @@ import { PageContainer } from '@/ui/layout/page/components/PageContainer';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { metadataStoreState } from '@/metadata-store/states/metadataStoreState';
import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyStateValue';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
import { isUndefined } from '@sniptt/guards';
import { lazy, Suspense } from 'react';
import { useParams } from 'react-router-dom';
-import { FeatureFlagKey } from 'twenty-shared/types';
+import { CoreObjectNameSingular } from 'twenty-shared/types';
const WorkflowCoreIndexPage = lazy(() =>
import('~/pages/object-core/WorkflowCoreIndexPage').then((module) => ({
@@ -36,10 +34,6 @@ export const RecordIndexPage = () => {
'objectMetadataItems',
);
- const isWorkflowCoreIndexPageEnabled = useIsFeatureEnabled(
- FeatureFlagKey.IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED,
- );
-
const routeObjectMetadataItem = objectMetadataItems.find(
(objectMetadataItem) => objectMetadataItem.namePlural === objectNamePlural,
);
@@ -75,18 +69,12 @@ export const RecordIndexPage = () => {
if (
isWorkspaceWorkflowVersionRouteHidden({
objectNameSingular: routeObjectMetadataItem?.nameSingular,
- isWorkflowCoreIndexPageEnabled,
})
) {
return <WorkspaceRouteUnavailable />;
}
- if (
- isCoreWorkflowsIndexEnabled({
- objectNameSingular: objectMetadataItem.nameSingular,
- isWorkflowCoreIndexPageEnabled,
- })
- ) {
+ if (objectMetadataItem.nameSingular === CoreObjectNameSingular.Workflow) {
return (
<Suspense fallback={<RecordIndexSkeletonLoader />}>
<WorkflowCoreIndexPage />
diff --git a/packages/twenty-front/src/pages/object-record/RecordShowPage.tsx b/packages/twenty-front/src/pages/object-record/RecordShowPage.tsx
index 5f27d9bc7f2..974231ee51a 100644
--- a/packages/twenty-front/src/pages/object-record/RecordShowPage.tsx
+++ b/packages/twenty-front/src/pages/object-record/RecordShowPage.tsx
@@ -1,9 +1,5 @@
import { Navigate, useParams } from 'react-router-dom';
-import {
- AppPath,
- CoreObjectNameSingular,
- FeatureFlagKey,
-} from 'twenty-shared/types';
+import { AppPath, CoreObjectNameSingular } from 'twenty-shared/types';
import { getAppPath, isDefined } from 'twenty-shared/utils';
import { WorkspaceRouteUnavailable } from '@/ui/layout/page/components/WorkspaceRouteUnavailable';
@@ -11,7 +7,6 @@ import { findCoreObjectShowPage } from '@/object-core/utils/findCoreObjectShowPa
import { isWorkspaceWorkflowVersionRouteHidden } from '@/object-core/workflows/utils/isWorkspaceWorkflowVersionRouteHidden';
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
import { useWorkspaceSurface } from '@/ui/layout/hooks/useWorkspaceSurface';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
import { AiChatThreadPageContent } from '~/pages/ai-chat/AiChatThreadPageContent';
import {
type RecordShowPageParameters,
@@ -22,9 +17,6 @@ export const RecordShowPage = () => {
const parameters = useParams<RecordShowPageParameters>();
const workspaceSurface = useWorkspaceSurface();
const { objectMetadataItems } = useObjectMetadataItems();
- const isWorkflowCoreIndexPageEnabled = useIsFeatureEnabled(
- FeatureFlagKey.IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED,
- );
const isInSidePanel = workspaceSurface.type === 'side-panel';
const isRouteObjectMetadataAvailable =
@@ -60,15 +52,14 @@ export const RecordShowPage = () => {
if (
isWorkspaceWorkflowVersionRouteHidden({
objectNameSingular: parameters.objectNameSingular,
- isWorkflowCoreIndexPageEnabled,
})
) {
return <WorkspaceRouteUnavailable />;
}
- const CoreObjectShowPage = isWorkflowCoreIndexPageEnabled
- ? findCoreObjectShowPage(parameters.objectNameSingular)
- : undefined;
+ const CoreObjectShowPage = findCoreObjectShowPage(
+ parameters.objectNameSingular,
+ );
if (isDefined(CoreObjectShowPage) && isDefined(parameters.objectRecordId)) {
return <CoreObjectShowPage objectRecordId={parameters.objectRecordId} />;
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 d511f43d008..c7059b0fcda 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
@@ -2,8 +2,8 @@ import { WorkspaceSurfaceContext } from '@/ui/layout/contexts/WorkspaceSurfaceCo
import { RecordIndexPage } from '~/pages/object-record/RecordIndexPage';
import { render, screen } from '@testing-library/react';
-const mockIsCoreWorkflowsIndexEnabled = jest.fn();
let mockObjectNamePlural = 'people';
+let mockCurrentObjectMetadataItemId = 'person-object-metadata-id';
jest.mock('react-router-dom', () => ({
...jest.requireActual('react-router-dom'),
@@ -13,7 +13,7 @@ jest.mock('react-router-dom', () => ({
jest.mock(
'@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue',
() => ({
- useAtomComponentStateValue: () => 'person-object-metadata-id',
+ useAtomComponentStateValue: () => mockCurrentObjectMetadataItemId,
}),
);
@@ -29,6 +29,11 @@ jest.mock('@/object-metadata/hooks/useObjectMetadataItems', () => ({
nameSingular: 'person',
namePlural: 'people',
},
+ {
+ id: 'workflow-object-metadata-id',
+ nameSingular: 'workflow',
+ namePlural: 'workflows',
+ },
],
}),
}));
@@ -37,10 +42,6 @@ jest.mock('@/workspace/hooks/useIsFeatureEnabled', () => ({
useIsFeatureEnabled: () => false,
}));
-jest.mock('@/object-core/workflows/utils/isCoreWorkflowsIndexEnabled', () => ({
- isCoreWorkflowsIndexEnabled: () => mockIsCoreWorkflowsIndexEnabled(),
-}));
-
jest.mock(
'@/object-record/record-index/components/RecordIndexContainerGater',
() => ({
@@ -128,8 +129,8 @@ describe('RecordIndexPage workspace surface composition', () => {
});
beforeEach(() => {
- mockIsCoreWorkflowsIndexEnabled.mockReturnValue(false);
mockObjectNamePlural = 'people';
+ mockCurrentObjectMetadataItemId = 'person-object-metadata-id';
});
it('keeps the main page container', () => {
@@ -140,7 +141,8 @@ describe('RecordIndexPage workspace surface composition', () => {
});
it('hosts the same specialized workflow index on a secondary surface', async () => {
- mockIsCoreWorkflowsIndexEnabled.mockReturnValue(true);
+ mockObjectNamePlural = 'workflows';
+ mockCurrentObjectMetadataItemId = 'workflow-object-metadata-id';
render(
<WorkspaceSurfaceContext.Provider
diff --git a/packages/twenty-front/src/pages/object-record/__tests__/RecordShowPage.surface.test.tsx b/packages/twenty-front/src/pages/object-record/__tests__/RecordShowPage.surface.test.tsx
index 9cee684640d..fe2741d0ec9 100644
--- a/packages/twenty-front/src/pages/object-record/__tests__/RecordShowPage.surface.test.tsx
+++ b/packages/twenty-front/src/pages/object-record/__tests__/RecordShowPage.surface.test.tsx
@@ -7,7 +7,6 @@ let mockParameters = {
objectNameSingular: 'person',
objectRecordId: 'record-1',
};
-let mockIsWorkflowCoreIndexPageEnabled = false;
let mockRecordResource: {
record: { id: string } | undefined;
loading: boolean;
@@ -24,10 +23,6 @@ jest.mock('react-router-dom', () => ({
Navigate: ({ to }: { to: string }) => <div data-testid="navigate">{to}</div>,
}));
-jest.mock('@/workspace/hooks/useIsFeatureEnabled', () => ({
- useIsFeatureEnabled: () => mockIsWorkflowCoreIndexPageEnabled,
-}));
-
jest.mock('@/object-core/utils/findCoreObjectShowPage', () => ({
findCoreObjectShowPage: (objectNameSingular: string) =>
objectNameSingular === 'workflow'
@@ -139,7 +134,6 @@ describe('RecordShowPage workspace surface composition', () => {
objectNameSingular: 'person',
objectRecordId: 'record-1',
};
- mockIsWorkflowCoreIndexPageEnabled = false;
mockRecordResource = {
record: { id: 'record-1' },
loading: false,
@@ -152,7 +146,6 @@ describe('RecordShowPage workspace surface composition', () => {
objectNameSingular: 'workflow',
objectRecordId: 'workspace-workflow-1',
};
- mockIsWorkflowCoreIndexPageEnabled = true;
render(<RecordShowPage />);
@@ -162,20 +155,6 @@ describe('RecordShowPage workspace surface composition', () => {
expect(screen.queryByTestId('record-renderer')).not.toBeInTheDocument();
});
- it('keeps the workspace show page for core-owned records when the flag is disabled', () => {
- mockParameters = {
- objectNameSingular: 'workflow',
- objectRecordId: 'workspace-workflow-1',
- };
-
- render(<RecordShowPage />);
-
- expect(screen.getByTestId('record-renderer')).toBeInTheDocument();
- expect(
- screen.queryByTestId('core-object-show-page'),
- ).not.toBeInTheDocument();
- });
-
it('sends a chat record to the chat page', () => {
mockObjectMetadataItems = [{ nameSingular: 'agentChatThread' }];
mockParameters = {
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-47/2-47-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-47/2-47-upgrade-version-command.module.ts
index 933b1df12c1..2b69078015c 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-47/2-47-upgrade-version-command.module.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-47/2-47-upgrade-version-command.module.ts
@@ -8,6 +8,7 @@ import { AddMessageListMemberCommandMenuItemsCommand } from 'src/database/comman
import { MergeAiChatInboxFeatureFlagsCommand } from 'src/database/commands/upgrade-version-command/2-47/2-47-workspace-command-1791822328094-merge-ai-chat-inbox-feature-flags.command';
import { SyncCampaignEngagementFieldsCommand } from 'src/database/commands/upgrade-version-command/2-47/2-47-workspace-command-1791811197174-sync-campaign-engagement-fields.command';
import { ConvertWorkflowEmailBodiesToEmailDocumentsCommand } from 'src/database/commands/upgrade-version-command/2-47/2-47-workspace-command-1791811310066-convert-workflow-email-bodies-to-email-documents.command';
+import { RemoveWorkflowCoreIndexFlagFromCommandMenuItemsCommand } from 'src/database/commands/upgrade-version-command/2-47/2-47-workspace-command-1791823009575-remove-workflow-core-index-flag-from-command-menu-items.command';
import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';
@@ -27,6 +28,7 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace
MergeAiChatInboxFeatureFlagsCommand,
SyncCampaignEngagementFieldsCommand,
ConvertWorkflowEmailBodiesToEmailDocumentsCommand,
+ RemoveWorkflowCoreIndexFlagFromCommandMenuItemsCommand,
],
})
export class V2_47_UpgradeVersionCommandModule {}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-47/2-47-workspace-command-1791823009575-remove-workflow-core-index-flag-from-command-menu-items.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-47/2-47-workspace-command-1791823009575-remove-workflow-core-index-flag-from-command-menu-items.command.ts
new file mode 100644
index 00000000000..e7dbb9976d4
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-47/2-47-workspace-command-1791823009575-remove-workflow-core-index-flag-from-command-menu-items.command.ts
@@ -0,0 +1,120 @@
+import { Command } from 'nest-commander';
+import { TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER } from 'twenty-shared/application';
+
+import { ProvisionedWorkspaceCommandRunner } from 'src/database/commands/command-runners/provisioned-workspace.command-runner';
+import { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';
+import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspace.command-runner';
+import { buildRemoveWorkflowCoreIndexFlagCommandMenuItemUpdates } from 'src/database/commands/upgrade-version-command/2-47/utils/build-remove-workflow-core-index-flag-command-menu-item-updates.util';
+import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';
+import { type FlatCommandMenuItem } from 'src/engine/metadata-modules/flat-command-menu-item/types/flat-command-menu-item.type';
+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
+import { WorkspaceMigrationBuilderException } from 'src/engine/workspace-manager/workspace-migration/exceptions/workspace-migration-builder-exception';
+import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';
+
+@RegisteredWorkspaceCommand('2.47.0', 1791823009575)
+@Command({
+ name: 'upgrade:2-47:remove-workflow-core-index-flag-from-command-menu-items',
+ description:
+ 'Drop the removed workflow core index feature flag from command menu item availability expressions',
+})
+export class RemoveWorkflowCoreIndexFlagFromCommandMenuItemsCommand extends ProvisionedWorkspaceCommandRunner {
+ constructor(
+ protected readonly workspaceIteratorService: WorkspaceIteratorService,
+ private readonly workspaceCacheService: WorkspaceCacheService,
+ private readonly workspaceMigrationValidateBuildAndRunService: WorkspaceMigrationValidateBuildAndRunService,
+ ) {
+ super(workspaceIteratorService);
+ }
+
+ override async runOnWorkspace(args: RunOnWorkspaceArgs): Promise<void> {
+ await this.up(args);
+ }
+
+ async up(args: RunOnWorkspaceArgs): Promise<void> {
+ await this.syncAvailabilityExpressions(args, 'up');
+ }
+
+ async down(args: RunOnWorkspaceArgs): Promise<void> {
+ await this.syncAvailabilityExpressions(args, 'down');
+ }
+
+ private async syncAvailabilityExpressions(
+ { workspaceId, options }: RunOnWorkspaceArgs,
+ direction: 'up' | 'down',
+ ): Promise<void> {
+ const { flatCommandMenuItemMaps } =
+ await this.workspaceCacheService.getOrRecompute(workspaceId, [
+ 'flatCommandMenuItemMaps',
+ ]);
+
+ const commandMenuItemsToUpdate =
+ buildRemoveWorkflowCoreIndexFlagCommandMenuItemUpdates({
+ flatCommandMenuItems: Object.values(
+ flatCommandMenuItemMaps.byUniversalIdentifier,
+ ),
+ now: new Date().toISOString(),
+ direction,
+ });
+
+ if (commandMenuItemsToUpdate.length === 0) {
+ return;
+ }
+
+ this.logger.log(
+ `${options.dryRun ? '[DRY RUN] ' : ''}Workspace ${workspaceId}: updating ${commandMenuItemsToUpdate.length} command menu items`,
+ );
+
+ if (options.dryRun) {
+ return;
+ }
+
+ const commandMenuItemsByApplicationUniversalIdentifier = new Map<
+ string,
+ FlatCommandMenuItem[]
+ >();
+
+ for (const commandMenuItem of commandMenuItemsToUpdate) {
+ commandMenuItemsByApplicationUniversalIdentifier.set(
+ commandMenuItem.applicationUniversalIdentifier,
+ [
+ ...(commandMenuItemsByApplicationUniversalIdentifier.get(
+ commandMenuItem.applicationUniversalIdentifier,
+ ) ?? []),
+ commandMenuItem,
+ ],
+ );
+ }
+
+ for (const [
+ applicationUniversalIdentifier,
+ commandMenuItems,
+ ] of commandMenuItemsByApplicationUniversalIdentifier) {
+ const migrationArgs = {
+ workspaceId,
+ isSystemBuild: true,
+ applicationUniversalIdentifier,
+ allFlatEntityOperationByMetadataName: {
+ commandMenuItem: {
+ flatEntityToCreate: [],
+ flatEntityToDelete: [],
+ flatEntityToUpdate: commandMenuItems,
+ },
+ },
+ };
+
+ const result =
+ applicationUniversalIdentifier ===
+ TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER
+ ? await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunLegacyWorkspaceMigration(
+ migrationArgs,
+ )
+ : await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunWorkspaceMigration(
+ migrationArgs,
+ );
+
+ if (result.status === 'fail') {
+ throw new WorkspaceMigrationBuilderException(result);
+ }
+ }
+ }
+}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-47/utils/__tests__/build-remove-workflow-core-index-flag-command-menu-item-updates.util.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-47/utils/__tests__/build-remove-workflow-core-index-flag-command-menu-item-updates.util.spec.ts
new file mode 100644
index 00000000000..a9c00d7a58a
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-47/utils/__tests__/build-remove-workflow-core-index-flag-command-menu-item-updates.util.spec.ts
@@ -0,0 +1,185 @@
+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
+import { isDefined } from 'twenty-shared/utils';
+
+import { buildRemoveWorkflowCoreIndexFlagCommandMenuItemUpdates } from 'src/database/commands/upgrade-version-command/2-47/utils/build-remove-workflow-core-index-flag-command-menu-item-updates.util';
+import { EngineComponentKey } from 'src/engine/metadata-modules/command-menu-item/enums/engine-component-key.enum';
+import { type FlatCommandMenuItem } from 'src/engine/metadata-modules/flat-command-menu-item/types/flat-command-menu-item.type';
+import { computeTwentyStandardApplicationAllFlatEntityMaps } from 'src/engine/workspace-manager/twenty-standard-application/utils/twenty-standard-application-all-flat-entity-maps.constant';
+
+const NOW = '2026-10-12T12:00:00.000Z';
+const FLAG = 'featureFlags.IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED';
+const ADD_TO_FAVORITES_UNIVERSAL_IDENTIFIER =
+ '38bf80c3-bd55-4753-80ba-38aa66429a03';
+const REMOVE_FROM_FAVORITES_UNIVERSAL_IDENTIFIER =
+ '3ea42507-44fa-4895-a36d-cbfef7355a50';
+
+const { allFlatEntityMaps } = computeTwentyStandardApplicationAllFlatEntityMaps(
+ {
+ now: '2026-10-01T12:00:00.000Z',
+ workspaceId: '20202020-1111-4111-8111-111111111111',
+ twentyStandardApplicationId: '20202020-2222-4222-8222-222222222222',
+ },
+);
+
+const getStandardItem = (universalIdentifier: string): FlatCommandMenuItem => {
+ const commandMenuItem =
+ allFlatEntityMaps.flatCommandMenuItemMaps.byUniversalIdentifier[
+ universalIdentifier
+ ];
+
+ if (!isDefined(commandMenuItem)) {
+ throw new Error(
+ `Standard command menu item ${universalIdentifier} missing`,
+ );
+ }
+
+ return commandMenuItem;
+};
+
+const withFlaggedFavoritesExpression = (
+ commandMenuItem: FlatCommandMenuItem,
+): FlatCommandMenuItem => ({
+ ...commandMenuItem,
+ conditionalAvailabilityExpression:
+ commandMenuItem.conditionalAvailabilityExpression?.replace(
+ ' and objectMetadataItem.nameSingular != "workflow"',
+ ` and not (${FLAG} and objectMetadataItem.nameSingular == "workflow")`,
+ ) ?? null,
+});
+
+const buildItem = (
+ overrides: Partial<FlatCommandMenuItem>,
+): FlatCommandMenuItem => ({
+ ...getStandardItem(ADD_TO_FAVORITES_UNIVERSAL_IDENTIFIER),
+ ...overrides,
+});
+
+const WORKFLOW_VERSION_NAVIGATION_ITEM = buildItem({
+ universalIdentifier: 'workflow-version-navigation',
+ engineComponentKey: EngineComponentKey.NAVIGATION,
+ navigationTargetObjectMetadataUniversalIdentifier:
+ STANDARD_OBJECTS.workflowVersion.universalIdentifier,
+ conditionalAvailabilityExpression: `not ${FLAG} and targetObjectReadPermissions.workflowVersion`,
+});
+
+const APPLICATION_WORKFLOW_ITEM = buildItem({
+ universalIdentifier: 'application-workflow',
+ applicationUniversalIdentifier: 'application',
+ engineComponentKey: EngineComponentKey.TRIGGER_WORKFLOW_VERSION,
+ isSystemSideEffect: true,
+ conditionalAvailabilityExpression: FLAG,
+});
+
+const updateUp = (flatCommandMenuItems: FlatCommandMenuItem[]) =>
+ buildRemoveWorkflowCoreIndexFlagCommandMenuItemUpdates({
+ flatCommandMenuItems,
+ now: NOW,
+ direction: 'up',
+ });
+
+describe('buildRemoveWorkflowCoreIndexFlagCommandMenuItemUpdates', () => {
+ it('moves the favorites commands to the current standard expressions', () => {
+ const favoritesItems = [
+ ADD_TO_FAVORITES_UNIVERSAL_IDENTIFIER,
+ REMOVE_FROM_FAVORITES_UNIVERSAL_IDENTIFIER,
+ ].map(getStandardItem);
+
+ const updates = updateUp(
+ favoritesItems.map(withFlaggedFavoritesExpression),
+ );
+
+ expect(
+ updates.map(
+ ({ conditionalAvailabilityExpression }) =>
+ conditionalAvailabilityExpression,
+ ),
+ ).toEqual(
+ favoritesItems.map(
+ ({ conditionalAvailabilityExpression }) =>
+ conditionalAvailabilityExpression,
+ ),
+ );
+ expect(updates.every(({ updatedAt }) => updatedAt === NOW)).toBe(true);
+ });
+
+ it('hides the workflow versions navigation', () => {
+ expect(updateUp([WORKFLOW_VERSION_NAVIGATION_ITEM])).toMatchObject([
+ { conditionalAvailabilityExpression: 'false' },
+ ]);
+ });
+
+ it('drops the condition of application workflow commands', () => {
+ expect(updateUp([APPLICATION_WORKFLOW_ITEM])).toMatchObject([
+ {
+ universalIdentifier: 'application-workflow',
+ conditionalAvailabilityExpression: null,
+ },
+ ]);
+ });
+
+ it('treats the flag as enabled in any other expression', () => {
+ expect(
+ updateUp([
+ buildItem({
+ conditionalAvailabilityExpression: `numberOfSelectedRecords == 1 and ${FLAG}`,
+ }),
+ ]),
+ ).toMatchObject([
+ {
+ conditionalAvailabilityExpression:
+ 'numberOfSelectedRecords == 1 and true',
+ },
+ ]);
+ });
+
+ it('leaves expressions without the flag untouched', () => {
+ expect(
+ updateUp([
+ getStandardItem(ADD_TO_FAVORITES_UNIVERSAL_IDENTIFIER),
+ buildItem({ conditionalAvailabilityExpression: null }),
+ ]),
+ ).toEqual([]);
+ });
+
+ it('restores the flagged standard expressions on down', () => {
+ const favoritesItem = getStandardItem(
+ ADD_TO_FAVORITES_UNIVERSAL_IDENTIFIER,
+ );
+ const hiddenNavigationItem = {
+ ...WORKFLOW_VERSION_NAVIGATION_ITEM,
+ conditionalAvailabilityExpression: 'false',
+ };
+
+ const updates = buildRemoveWorkflowCoreIndexFlagCommandMenuItemUpdates({
+ flatCommandMenuItems: [
+ favoritesItem,
+ hiddenNavigationItem,
+ buildItem({ conditionalAvailabilityExpression: 'false' }),
+ {
+ ...APPLICATION_WORKFLOW_ITEM,
+ conditionalAvailabilityExpression: null,
+ },
+ {
+ ...APPLICATION_WORKFLOW_ITEM,
+ universalIdentifier: 'user-workflow',
+ isSystemSideEffect: false,
+ conditionalAvailabilityExpression: null,
+ },
+ ],
+ now: NOW,
+ direction: 'down',
+ });
+
+ expect(
+ updates.map(
+ ({ conditionalAvailabilityExpression }) =>
+ conditionalAvailabilityExpression,
+ ),
+ ).toEqual([
+ withFlaggedFavoritesExpression(favoritesItem)
+ .conditionalAvailabilityExpression,
+ WORKFLOW_VERSION_NAVIGATION_ITEM.conditionalAvailabilityExpression,
+ FLAG,
+ ]);
+ });
+});
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-47/utils/build-remove-workflow-core-index-flag-command-menu-item-updates.util.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-47/utils/build-remove-workflow-core-index-flag-command-menu-item-updates.util.ts
new file mode 100644
index 00000000000..8431d089048
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-47/utils/build-remove-workflow-core-index-flag-command-menu-item-updates.util.ts
@@ -0,0 +1,127 @@
+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
+import { isDefined } from 'twenty-shared/utils';
+
+import { EngineComponentKey } from 'src/engine/metadata-modules/command-menu-item/enums/engine-component-key.enum';
+import { type FlatCommandMenuItem } from 'src/engine/metadata-modules/flat-command-menu-item/types/flat-command-menu-item.type';
+
+const WORKFLOW_CORE_INDEX_FLAG_EXPRESSION =
+ 'featureFlags.IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED';
+
+const FAVORITES_EXPRESSION_PREFIXES = [
+ 'arrayLength(favoriteRecordIds) < numberOfSelectedRecords',
+ 'arrayLength(favoriteRecordIds) == numberOfSelectedRecords',
+];
+
+const FAVORITES_EXPRESSION_SUFFIX =
+ ' and noneDefined(selectedRecords, "deletedAt") and not hasAnySoftDeleteFilterOnView and objectMetadataItem.nameSingular != "messageCampaign"';
+
+const FLAGGED_FAVORITES_WORKFLOW_CONDITION = ` and not (${WORKFLOW_CORE_INDEX_FLAG_EXPRESSION} and objectMetadataItem.nameSingular == "workflow")`;
+
+const FAVORITES_WORKFLOW_CONDITION =
+ ' and objectMetadataItem.nameSingular != "workflow"';
+
+const FLAGGED_WORKFLOW_VERSION_NAVIGATION_EXPRESSION = `not ${WORKFLOW_CORE_INDEX_FLAG_EXPRESSION} and targetObjectReadPermissions.workflowVersion`;
+
+const HIDDEN_WORKFLOW_VERSION_NAVIGATION_EXPRESSION = 'false';
+
+const FAVORITES_EXPRESSION_REPLACEMENTS = FAVORITES_EXPRESSION_PREFIXES.map(
+ (prefix) => ({
+ flaggedExpression: `${prefix}${FAVORITES_EXPRESSION_SUFFIX}${FLAGGED_FAVORITES_WORKFLOW_CONDITION}`,
+ unflaggedExpression: `${prefix}${FAVORITES_EXPRESSION_SUFFIX}${FAVORITES_WORKFLOW_CONDITION}`,
+ }),
+);
+
+const isWorkflowVersionNavigation = (commandMenuItem: FlatCommandMenuItem) =>
+ commandMenuItem.navigationTargetObjectMetadataUniversalIdentifier ===
+ STANDARD_OBJECTS.workflowVersion.universalIdentifier;
+
+const isApplicationWorkflowCommand = (commandMenuItem: FlatCommandMenuItem) =>
+ commandMenuItem.engineComponentKey ===
+ EngineComponentKey.TRIGGER_WORKFLOW_VERSION &&
+ commandMenuItem.isSystemSideEffect;
+
+const computeUnflaggedExpression = (
+ commandMenuItem: FlatCommandMenuItem,
+): string | null | undefined => {
+ const expression = commandMenuItem.conditionalAvailabilityExpression;
+
+ if (
+ !isDefined(expression) ||
+ !expression.includes(WORKFLOW_CORE_INDEX_FLAG_EXPRESSION)
+ ) {
+ return undefined;
+ }
+
+ if (expression === WORKFLOW_CORE_INDEX_FLAG_EXPRESSION) {
+ return null;
+ }
+
+ if (expression === FLAGGED_WORKFLOW_VERSION_NAVIGATION_EXPRESSION) {
+ return HIDDEN_WORKFLOW_VERSION_NAVIGATION_EXPRESSION;
+ }
+
+ const favoritesReplacement = FAVORITES_EXPRESSION_REPLACEMENTS.find(
+ ({ flaggedExpression }) => flaggedExpression === expression,
+ );
+
+ return (
+ favoritesReplacement?.unflaggedExpression ??
+ expression.split(WORKFLOW_CORE_INDEX_FLAG_EXPRESSION).join('true')
+ );
+};
+
+const computeFlaggedExpression = (
+ commandMenuItem: FlatCommandMenuItem,
+): string | undefined => {
+ if (
+ isApplicationWorkflowCommand(commandMenuItem) &&
+ !isDefined(commandMenuItem.conditionalAvailabilityExpression)
+ ) {
+ return WORKFLOW_CORE_INDEX_FLAG_EXPRESSION;
+ }
+
+ if (
+ isWorkflowVersionNavigation(commandMenuItem) &&
+ commandMenuItem.conditionalAvailabilityExpression ===
+ HIDDEN_WORKFLOW_VERSION_NAVIGATION_EXPRESSION
+ ) {
+ return FLAGGED_WORKFLOW_VERSION_NAVIGATION_EXPRESSION;
+ }
+
+ return FAVORITES_EXPRESSION_REPLACEMENTS.find(
+ ({ unflaggedExpression }) =>
+ unflaggedExpression === commandMenuItem.conditionalAvailabilityExpression,
+ )?.flaggedExpression;
+};
+
+export const buildRemoveWorkflowCoreIndexFlagCommandMenuItemUpdates = ({
+ flatCommandMenuItems,
+ now,
+ direction,
+}: {
+ flatCommandMenuItems: (FlatCommandMenuItem | undefined)[];
+ now: string;
+ direction: 'up' | 'down';
+}): FlatCommandMenuItem[] =>
+ flatCommandMenuItems.flatMap((commandMenuItem) => {
+ if (!isDefined(commandMenuItem)) {
+ return [];
+ }
+
+ const nextExpression =
+ direction === 'up'
+ ? computeUnflaggedExpression(commandMenuItem)
+ : computeFlaggedExpression(commandMenuItem);
+
+ if (nextExpression === undefined) {
+ return [];
+ }
+
+ return [
+ {
+ ...commandMenuItem,
+ conditionalAvailabilityExpression: nextExpression,
+ updatedAt: now,
+ },
+ ];
+ });
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-workflow-manifest-to-universal-flat-command-menu-item.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-workflow-manifest-to-universal-flat-command-menu-item.util.spec.ts
index 600d42e6eed..4e2e97ce792 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-workflow-manifest-to-universal-flat-command-menu-item.util.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-workflow-manifest-to-universal-flat-command-menu-item.util.spec.ts
@@ -82,12 +82,11 @@ describe('fromWorkflowManifestToUniversalFlatCommandMenuItem', () => {
});
});
- it('hides the command while the core workflows index is off, since only the core path can start it', () => {
+ it('builds the command without an availability condition', () => {
expect(
build(manifestWithTriggerSettings({ availability: { type: 'GLOBAL' } })),
).toMatchObject({
- conditionalAvailabilityExpression:
- 'featureFlags.IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED',
+ conditionalAvailabilityExpression: null,
});
});
});
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-workflow-manifest-to-universal-flat-command-menu-item.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-workflow-manifest-to-universal-flat-command-menu-item.util.ts
index b63e8830a52..aa0a02ca098 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-workflow-manifest-to-universal-flat-command-menu-item.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-workflow-manifest-to-universal-flat-command-menu-item.util.ts
@@ -2,10 +2,7 @@ import {
getWorkflowCommandMenuItemUniversalIdentifier,
type WorkflowManifest,
} from 'twenty-shared/application';
-import {
- CommandMenuItemAvailabilityType,
- FeatureFlagKey,
-} from 'twenty-shared/types';
+import { CommandMenuItemAvailabilityType } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { EngineComponentKey } from 'src/engine/metadata-modules/command-menu-item/enums/engine-component-key.enum';
@@ -46,7 +43,7 @@ export const fromWorkflowManifestToUniversalFlatCommandMenuItem = ({
availabilityType: isRecordSelection
? CommandMenuItemAvailabilityType.RECORD_SELECTION
: CommandMenuItemAvailabilityType.GLOBAL,
- conditionalAvailabilityExpression: `featureFlags.${FeatureFlagKey.IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED}`,
+ conditionalAvailabilityExpression: null,
conditionalPinnedExpression: null,
frontComponentUniversalIdentifier: null,
availabilityObjectMetadataUniversalIdentifier: isRecordSelection
diff --git a/packages/twenty-server/src/engine/core-modules/feature-flag/validates/feature-flag.validate.spec.ts b/packages/twenty-server/src/engine/core-modules/feature-flag/validates/feature-flag.validate.spec.ts
index ae3e7e56821..687dfb26685 100644
--- a/packages/twenty-server/src/engine/core-modules/feature-flag/validates/feature-flag.validate.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/feature-flag/validates/feature-flag.validate.spec.ts
@@ -8,7 +8,7 @@ describe('featureFlagValidator', () => {
it('should not throw error if featureFlagKey is valid', () => {
expect(() =>
featureFlagValidator.assertIsFeatureFlagKey(
- 'IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED',
+ 'IS_JSON_FILTER_ENABLED',
new UnknownException('Error', 'Error', {
userFriendlyMessage: msg`Error`,
}),
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/__tests__/build-object-navigation-universal-flat-command-menu-item.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/__tests__/build-object-navigation-universal-flat-command-menu-item.util.spec.ts
index 525700540b1..086beda5879 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/__tests__/build-object-navigation-universal-flat-command-menu-item.util.spec.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/__tests__/build-object-navigation-universal-flat-command-menu-item.util.spec.ts
@@ -33,16 +33,14 @@ describe('buildNavigationConditionalAvailabilityExpression', () => {
).toBe('targetObjectReadPermissions.messageCampaign');
});
- it('hides a standard object whose flag replaces its navigation', () => {
+ it('hides the workflow versions navigation', () => {
expect(
buildNavigationConditionalAvailabilityExpression({
universalIdentifier:
STANDARD_OBJECTS.workflowVersion.universalIdentifier,
nameSingular: 'workflowVersion',
}),
- ).toBe(
- 'not featureFlags.IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED and targetObjectReadPermissions.workflowVersion',
- );
+ ).toBe('false');
});
it('does not hide a custom object that reuses a hidden object name', () => {
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/build-object-navigation-universal-flat-command-menu-item.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/build-object-navigation-universal-flat-command-menu-item.util.ts
index c276002debc..c477178612c 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/build-object-navigation-universal-flat-command-menu-item.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-command-menu-item/utils/build-object-navigation-universal-flat-command-menu-item.util.ts
@@ -34,12 +34,9 @@ const NAVIGATION_FEATURE_FLAG_GATE_BY_OBJECT_UNIVERSAL_IDENTIFIER: Partial<
FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,
};
-const NAVIGATION_HIDING_FEATURE_FLAG_BY_OBJECT_UNIVERSAL_IDENTIFIER: Partial<
- Record<string, FeatureFlagKey>
-> = {
- [STANDARD_OBJECTS.workflowVersion.universalIdentifier]:
- FeatureFlagKey.IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED,
-};
+const HIDDEN_NAVIGATION_OBJECT_UNIVERSAL_IDENTIFIERS = new Set<string>([
+ STANDARD_OBJECTS.workflowVersion.universalIdentifier,
+]);
export const buildNavigationConditionalAvailabilityExpression = ({
universalIdentifier,
@@ -48,19 +45,15 @@ export const buildNavigationConditionalAvailabilityExpression = ({
universalIdentifier: string;
nameSingular: string;
}): string => {
+ if (HIDDEN_NAVIGATION_OBJECT_UNIVERSAL_IDENTIFIERS.has(universalIdentifier)) {
+ return 'false';
+ }
+
const targetObjectReadPermissionExpression = `targetObjectReadPermissions.${nameSingular}`;
const featureFlagGate =
NAVIGATION_FEATURE_FLAG_GATE_BY_OBJECT_UNIVERSAL_IDENTIFIER[
universalIdentifier
];
- const hidingFeatureFlagGate =
- NAVIGATION_HIDING_FEATURE_FLAG_BY_OBJECT_UNIVERSAL_IDENTIFIER[
- universalIdentifier
- ];
-
- if (isDefined(hidingFeatureFlagGate)) {
- return `not featureFlags.${hidingFeatureFlagGate} and ${targetObjectReadPermissionExpression}`;
- }
return isDefined(featureFlagGate)
? `featureFlags.${featureFlagGate} and ${targetObjectReadPermissionExpression}`
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-command-menu-item.constant.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-command-menu-item.constant.ts
index b9a944318fa..9abebe81af8 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-command-menu-item.constant.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-command-menu-item.constant.ts
@@ -149,7 +149,7 @@ export const STANDARD_COMMAND_MENU_ITEMS = {
shortLabel: null,
availabilityType: CommandMenuItemAvailabilityType.RECORD_SELECTION,
conditionalAvailabilityExpression:
- 'arrayLength(favoriteRecordIds) < numberOfSelectedRecords and noneDefined(selectedRecords, "deletedAt") and not hasAnySoftDeleteFilterOnView and objectMetadataItem.nameSingular != "messageCampaign" and not (featureFlags.IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED and objectMetadataItem.nameSingular == "workflow")',
+ 'arrayLength(favoriteRecordIds) < numberOfSelectedRecords and noneDefined(selectedRecords, "deletedAt") and not hasAnySoftDeleteFilterOnView and objectMetadataItem.nameSingular != "messageCampaign" and objectMetadataItem.nameSingular != "workflow"',
availabilityObjectMetadataUniversalIdentifier: null,
frontComponentUniversalIdentifier: null,
engineComponentKey: EngineComponentKey.ADD_TO_FAVORITES,
@@ -169,7 +169,7 @@ export const STANDARD_COMMAND_MENU_ITEMS = {
shortLabel: null,
availabilityType: CommandMenuItemAvailabilityType.RECORD_SELECTION,
conditionalAvailabilityExpression:
- 'arrayLength(favoriteRecordIds) == numberOfSelectedRecords and noneDefined(selectedRecords, "deletedAt") and not hasAnySoftDeleteFilterOnView and objectMetadataItem.nameSingular != "messageCampaign" and not (featureFlags.IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED and objectMetadataItem.nameSingular == "workflow")',
+ 'arrayLength(favoriteRecordIds) == numberOfSelectedRecords and noneDefined(selectedRecords, "deletedAt") and not hasAnySoftDeleteFilterOnView and objectMetadataItem.nameSingular != "messageCampaign" and objectMetadataItem.nameSingular != "workflow"',
availabilityObjectMetadataUniversalIdentifier: null,
frontComponentUniversalIdentifier: null,
engineComponentKey: EngineComponentKey.REMOVE_FROM_FAVORITES,
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/constant/default-feature-flags.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/constant/default-feature-flags.ts
index 2d93f7043c7..a6e31f106e9 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/constant/default-feature-flags.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/constant/default-feature-flags.ts
@@ -2,5 +2,4 @@ import { FeatureFlagKey } from 'twenty-shared/types';
export const DEFAULT_FEATURE_FLAGS = [
FeatureFlagKey.IS_REST_METADATA_API_NEW_FORMAT_DIRECT,
- FeatureFlagKey.IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED,
] as const satisfies FeatureFlagKey[];
diff --git a/packages/twenty-shared/src/types/FeatureFlagKey.ts b/packages/twenty-shared/src/types/FeatureFlagKey.ts
index 86ce727f792..bc25994ccc1 100644
--- a/packages/twenty-shared/src/types/FeatureFlagKey.ts
+++ b/packages/twenty-shared/src/types/FeatureFlagKey.ts
@@ -5,7 +5,6 @@ export enum FeatureFlagKey {
IS_JSON_FILTER_ENABLED = 'IS_JSON_FILTER_ENABLED',
IS_MESSAGE_CAMPAIGN_ENABLED = 'IS_MESSAGE_CAMPAIGN_ENABLED',
IS_REST_METADATA_API_NEW_FORMAT_DIRECT = 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT',
- IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED = 'IS_WORKFLOW_CORE_INDEX_PAGE_ENABLED',
IS_AI_CHAT_SHARING_DROPDOWN_ENABLED = 'IS_AI_CHAT_SHARING_DROPDOWN_ENABLED',
IS_INITIAL_OBJECT_VIEW_ENABLED = 'IS_INITIAL_OBJECT_VIEW_ENABLED',
IS_DEFERRED_WORKSPACE_MIGRATION_ACTIONS_ENABLED = 'IS_DEFERRED_WORKSPACE_MIGRATION_ACTIONS_ENABLED',