admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-16 17:46:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Update Workflow class usage on the Frontend for better performance (no-changelog) (#17680)

Browse Source
This commit is contained in:
Alex Grozav
2025-08-04 15:04:00 +03:00
committed by GitHub
parent ff8531d544
commit 279dce639a
66 changed files with 659 additions and 660 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
packages/core/src/execution-engine/__tests__/workflow-execute.test.ts
View File

@@ -1965,7 +1965,7 @@ describe('WorkflowExecute', () => {
test('should return true when node has no input connections', () => {
workflow.nodes = {};
workflow.connectionsByDestinationNode = {};
workflow.setConnections({});
const hasInputData = workflowExecute.ensureInputData(workflow, node, executionData);
@@ -1978,11 +1978,11 @@ describe('WorkflowExecute', () => {
[parentNode.name]: parentNode,
};
workflow.connectionsByDestinationNode = {
[node.name]: {
main: [[{ node: parentNode.name, type: NodeConnectionTypes.Main, index: 0 }]],
workflow.setConnections({
[parentNode.name]: {
main: [[{ node: node.name, type: NodeConnectionTypes.Main, index: 0 }]],
},
};
});
const hasInputData = workflowExecute.ensureInputData(workflow, node, executionData);
@@ -1996,11 +1996,11 @@ describe('WorkflowExecute', () => {
[parentNode.name]: parentNode,
};
workflow.connectionsByDestinationNode = {
[node.name]: {
main: [[{ node: parentNode.name, type: NodeConnectionTypes.Main, index: 0 }]],
workflow.setConnections({
[parentNode.name]: {
main: [[{ node: node.name, type: NodeConnectionTypes.Main, index: 0 }]],
},
};
});
executionData.data = { main: [[{ json: { test: 'data' } }]] };
@@ -2015,11 +2015,11 @@ describe('WorkflowExecute', () => {
[parentNode.name]: parentNode,
};
workflow.connectionsByDestinationNode = {
[node.name]: {
main: [[{ node: parentNode.name, type: NodeConnectionTypes.Main, index: 0 }]],
workflow.setConnections({
[parentNode.name]: {
main: [[{ node: node.name, type: NodeConnectionTypes.Main, index: 0 }]],
},
};
});
executionData.data = { main: [null] };

1
packages/frontend/editor-ui/src/components/AskAssistant/Agent/AskAssistantBuild.test.ts
View File

@@ -55,7 +55,6 @@ vi.mock('vue-router', () => {
vi.mock('@/composables/useWorkflowSaving', () => ({
useWorkflowSaving: vi.fn().mockReturnValue({
getCurrentWorkflow: vi.fn(),
saveCurrentWorkflow: vi.fn(),
getWorkflowDataToSave: vi.fn(),
setDocumentTitle: vi.fn(),

4
packages/frontend/editor-ui/src/components/ButtonParameter/ButtonParameter.test.ts
View File

@@ -58,9 +58,9 @@ describe('ButtonParameter', () => {
} as any);
vi.mocked(useWorkflowsStore).mockReturnValue({
getCurrentWorkflow: vi.fn().mockReturnValue({
workflowObject: {
getParentNodesByDepth: vi.fn().mockReturnValue([]),
}),
},
getNodeByName: vi.fn().mockReturnValue({}),
} as any);

7
packages/frontend/editor-ui/src/components/ButtonParameter/utils.ts
View File

@@ -19,12 +19,11 @@ export type TextareaRowData = {
export function getParentNodes() {
const activeNode = useNDVStore().activeNode;
const { getCurrentWorkflow, getNodeByName } = useWorkflowsStore();
const workflow = getCurrentWorkflow();
const { workflowObject, getNodeByName } = useWorkflowsStore();
if (!activeNode || !workflow) return [];
if (!activeNode || !workflowObject) return [];
return workflow
return workflowObject
.getParentNodesByDepth(activeNode?.name)
.filter(({ name }, i, nodes) => {
return name !== activeNode.name && nodes.findIndex((node) => node.name === name) === i;

7
packages/frontend/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue
View File

@@ -91,12 +91,11 @@ function getErrorMessageByStatusCode(statusCode: number, message: string | undef
function getParentNodes() {
const activeNode = useNDVStore().activeNode;
const { getCurrentWorkflow, getNodeByName } = useWorkflowsStore();
const workflow = getCurrentWorkflow();
const { workflowObject, getNodeByName } = useWorkflowsStore();
if (!activeNode || !workflow) return [];
if (!activeNode || !workflowObject) return [];
return workflow
return workflowObject
.getParentNodesByDepth(activeNode?.name)
.filter(({ name }, i, nodes) => {
return name !== activeNode.name && nodes.findIndex((node) => node.name === name) === i;

12
packages/frontend/editor-ui/src/components/CodeNodeEditor/types.ts
View File

@@ -1,15 +1,3 @@
import type { EditorView } from '@codemirror/view';
import type { Workflow, CodeExecutionMode, CodeNodeEditorLanguage } from 'n8n-workflow';
import type { Node } from 'estree';
import type { DefineComponent } from 'vue';
export type CodeNodeEditorMixin = InstanceType<
DefineComponent & {
editor: EditorView | null;
mode: CodeExecutionMode;
language: CodeNodeEditorLanguage;
getCurrentWorkflow(): Workflow;
}
>;
export type RangeNode = Node & { range: [number, number] };

3
packages/frontend/editor-ui/src/components/ExpressionEditModal.vue
View File

@@ -66,12 +66,11 @@ const expressionResultRef = ref<InstanceType<typeof ExpressionOutput>>();
const theme = outputTheme();
const activeNode = computed(() => ndvStore.activeNode);
const workflow = computed(() => workflowsStore.getCurrentWorkflow());
const inputEditor = computed(() => expressionInputRef.value?.editor);
const parentNodes = computed(() => {
const node = activeNode.value;
if (!node) return [];
const nodes = workflow.value.getParentNodesByDepth(node.name);
const nodes = workflowsStore.workflowObject.getParentNodesByDepth(node.name);
return nodes.filter(({ name }) => name !== node.name);
});

4
packages/frontend/editor-ui/src/components/FocusPanel.vue
View File

@@ -120,9 +120,7 @@ const { workflowRunData } = useExecutionData({ node });
const hasNodeRun = computed(() => {
if (!node.value) return true;
const parentNode = workflowsStore
.getCurrentWorkflow()
.getParentNodes(node.value.name, 'main', 1)[0];
const parentNode = workflowsStore.workflowObject.getParentNodes(node.value.name, 'main', 1)[0];
return Boolean(
parentNode &&
workflowRunData.value &&

13
packages/frontend/editor-ui/src/components/FromAiParametersModal.test.ts
View File

@@ -7,9 +7,12 @@ import userEvent from '@testing-library/user-event';
import { useWorkflowsStore } from '@/stores/workflows.store';
import { useAgentRequestStore } from '@n8n/stores/useAgentRequestStore';
import { useRouter } from 'vue-router';
import type { Workflow } from 'n8n-workflow';
import { NodeConnectionTypes } from 'n8n-workflow';
import { useNodeTypesStore } from '@/stores/nodeTypes.store';
import { nextTick } from 'vue';
import { mock } from 'vitest-mock-extended';
import { createTestWorkflow } from '@/__tests__/mocks';
const ModalStub = {
template: `
@@ -63,10 +66,14 @@ const mockRunData = {
},
};
const mockWorkflow = {
const mockWorkflow = createTestWorkflow({
id: 'test-workflow',
});
const mockWorkflowObject = mock<Workflow>({
id: mockWorkflow.id,
getChildNodes: () => ['Parent Node'],
};
});
const mockTools = [
{
@@ -106,6 +113,7 @@ describe('FromAiParametersModal', () => {
},
[STORES.WORKFLOWS]: {
workflow: mockWorkflow,
workflowObject: mockWorkflowObject,
workflowExecutionData: mockRunData,
},
},
@@ -121,7 +129,6 @@ describe('FromAiParametersModal', () => {
return mockParentNode;
}
});
workflowsStore.getCurrentWorkflow = vi.fn().mockReturnValue(mockWorkflow);
agentRequestStore = useAgentRequestStore();
agentRequestStore.clearAgentRequests = vi.fn();
agentRequestStore.setAgentRequestForNode = vi.fn();

3
packages/frontend/editor-ui/src/components/FromAiParametersModal.vue
View File

@@ -45,8 +45,7 @@ const node = computed(() =>
const parentNode = computed(() => {
if (!node.value) return undefined;
const workflow = workflowsStore.getCurrentWorkflow();
const parentNodes = workflow.getChildNodes(node.value.name, 'ALL', 1);
const parentNodes = workflowsStore.workflowObject.getChildNodes(node.value.name, 'ALL', 1);
if (parentNodes.length === 0) return undefined;
return workflowsStore.getNodeByName(parentNodes[0])?.name;
});

2
packages/frontend/editor-ui/src/components/InputPanel.test.ts
View File

@@ -97,7 +97,7 @@ const render = (props: Partial<Props> = {}, pinData?: INodeExecutionData[], runD
runIndex: 0,
currentNodeName: nodes[0].name,
activeNodeName: nodes[1].name,
workflow: workflowObject,
workflowObject,
displayMode: 'schema',
focusedMappableInput: '',
isMappingOnboarded: false,

22
packages/frontend/editor-ui/src/components/InputPanel.vue
View File

@@ -35,7 +35,7 @@ type MappingMode = 'debugging' | 'mapping';
export type Props = {
runIndex: number;
workflow: Workflow;
workflowObject: Workflow;
pushRef: string;
activeNodeName: string;
currentNodeName?: string;
@@ -103,7 +103,7 @@ const activeNode = computed(() => workflowsStore.getNodeByName(props.activeNodeN
const rootNode = computed(() => {
if (!activeNode.value) return null;
return props.workflow.getChildNodes(activeNode.value.name, 'ALL').at(0) ?? null;
return props.workflowObject.getChildNodes(activeNode.value.name, 'ALL').at(0) ?? null;
});
const hasRootNodeRun = computed(() => {
@@ -134,12 +134,12 @@ const isActiveNodeConfig = computed(() => {
let inputs = activeNodeType.value?.inputs ?? [];
let outputs = activeNodeType.value?.outputs ?? [];
if (props.workflow && activeNode.value) {
const node = props.workflow.getNode(activeNode.value.name);
if (props.workflowObject && activeNode.value) {
const node = props.workflowObject.getNode(activeNode.value.name);
if (node && activeNodeType.value) {
inputs = NodeHelpers.getNodeInputs(props.workflow, node, activeNodeType.value);
outputs = NodeHelpers.getNodeOutputs(props.workflow, node, activeNodeType.value);
inputs = NodeHelpers.getNodeInputs(props.workflowObject, node, activeNodeType.value);
outputs = NodeHelpers.getNodeOutputs(props.workflowObject, node, activeNodeType.value);
}
}
@@ -192,7 +192,7 @@ const isExecutingPrevious = computed(() => {
const rootNodesParents = computed(() => {
if (!rootNode.value) return [];
return props.workflow.getParentNodesByDepth(rootNode.value);
return props.workflowObject.getParentNodesByDepth(rootNode.value);
});
const currentNode = computed(() => {
@@ -219,7 +219,7 @@ const parentNodes = computed(() => {
return [];
}
const parents = props.workflow
const parents = props.workflowObject
.getParentNodesByDepth(activeNode.value.name)
.filter((parent) => parent.name !== activeNode.value?.name);
return uniqBy(parents, (parent) => parent.name);
@@ -376,7 +376,7 @@ function handleChangeCollapsingColumn(columnName: string | null) {
:class="[$style.runData, { [$style.runDataV2]: isNDVV2 }]"
:node="currentNode"
:nodes="isMappingMode ? rootNodesParents : parentNodes"
:workflow="workflow"
:workflow-object="workflowObject"
:run-index="isMappingMode ? 0 : runIndex"
:linked-runs="linkedRuns"
:can-link-runs="!mappedNode && canLinkRuns"
@@ -430,7 +430,7 @@ function handleChangeCollapsingColumn(columnName: string | null) {
<InputNodeSelect
v-if="parentNodes.length && currentNodeName"
:model-value="currentNodeName"
:workflow="workflow"
:workflow="workflowObject"
:nodes="parentNodes"
@update:model-value="onInputNodeChange"
/>
@@ -444,7 +444,7 @@ function handleChangeCollapsingColumn(columnName: string | null) {
<div :class="$style.mappedNode">
<InputNodeSelect
:model-value="mappedNode"
:workflow="workflow"
:workflow="workflowObject"
:nodes="rootNodesParents"
@update:model-value="onMappedNodeSelected"
/>

8
packages/frontend/editor-ui/src/components/NDVFloatingNodes.vue
View File

@@ -76,18 +76,18 @@ function getINodesFromNames(names: string[]): NodeConfig[] {
const connectedNodes = computed<
Record<FloatingNodePosition, Array<{ node: INodeUi; nodeType: INodeTypeDescription }>>
>(() => {
const workflow = workflowsStore.getCurrentWorkflow();
const workflowObject = workflowsStore.workflowObject;
const rootName = props.rootNode.name;
return {
[FloatingNodePosition.top]: getINodesFromNames(
workflow.getChildNodes(rootName, 'ALL_NON_MAIN'),
workflowObject.getChildNodes(rootName, 'ALL_NON_MAIN'),
),
[FloatingNodePosition.right]: getINodesFromNames(
workflow.getChildNodes(rootName, NodeConnectionTypes.Main, 1),
workflowObject.getChildNodes(rootName, NodeConnectionTypes.Main, 1),
).reverse(),
[FloatingNodePosition.left]: getINodesFromNames(
workflow.getParentNodes(rootName, NodeConnectionTypes.Main, 1),
workflowObject.getParentNodes(rootName, NodeConnectionTypes.Main, 1),
).reverse(),
};
});

2
packages/frontend/editor-ui/src/components/NDVSubConnections.test.ts
View File

@@ -69,7 +69,7 @@ vi.mock('@/stores/nodeTypes.store', () => ({
vi.mock('@/stores/workflows.store', () => ({
useWorkflowsStore: vi.fn(() => ({
getCurrentWorkflow: vi.fn(() => new Workflow(mockWorkflowData)),
workflowObject: new Workflow(mockWorkflowData),
getNodeByName: mockGetNodeByName,
})),
}));

13
packages/frontend/editor-ui/src/components/NDVSubConnections.vue
View File

@@ -11,6 +11,7 @@ import type {
NodeConnectionType,
INodeInputConfiguration,
INodeTypeDescription,
Workflow,
} from 'n8n-workflow';
import { useDebounce } from '@/composables/useDebounce';
import { OnClickOutside } from '@vueuse/components';
@@ -59,10 +60,11 @@ const nodeType = computed(() =>
const nodeData = computed(() => workflowsStore.getNodeByName(props.rootNode.name));
const ndvStore = useNDVStore();
const workflow = computed(() => workflowsStore.getCurrentWorkflow());
const workflowObject = computed(() => workflowsStore.workflowObject as Workflow);
const nodeInputIssues = computed(() => {
const issues = nodeHelpers.getNodeIssues(nodeType.value, props.rootNode, workflow.value, [
const issues = nodeHelpers.getNodeIssues(nodeType.value, props.rootNode, workflowObject.value, [
'typeUnknown',
'parameters',
'credentials',
@@ -82,7 +84,8 @@ const connectedNodes = computed<Record<string, NodeConfig[]>>(() => {
// Get input-index-specific connections using the per-type index
const nodeConnections =
workflow.value.connectionsByDestinationNode[props.rootNode.name]?.[connection.type] ?? [];
workflowObject.value.connectionsByDestinationNode[props.rootNode.name]?.[connection.type] ??
[];
const inputConnections = nodeConnections[typeIndex] ?? [];
const nodeNames = inputConnections.map((conn) => conn.node);
const nodes = getINodesFromNames(nodeNames);
@@ -159,7 +162,7 @@ function getINodesFromNames(names: string[]): NodeConfig[] {
if (node) {
const matchedNodeType = nodeTypesStore.getNodeType(node.type);
if (matchedNodeType) {
const issues = nodeHelpers.getNodeIssues(matchedNodeType, node, workflow.value);
const issues = nodeHelpers.getNodeIssues(matchedNodeType, node, workflowObject.value);
const stringifiedIssues = issues ? nodeHelpers.nodeIssuesToString(issues, node) : '';
return { node, nodeType: matchedNodeType, issues: stringifiedIssues };
}
@@ -187,7 +190,7 @@ function isNodeInputConfiguration(
function getPossibleSubInputConnections(): INodeInputConfiguration[] {
if (!nodeType.value || !props.rootNode) return [];
const inputs = NodeHelpers.getNodeInputs(workflow.value, props.rootNode, nodeType.value);
const inputs = NodeHelpers.getNodeInputs(workflowObject.value, props.rootNode, nodeType.value);
const nonMainInputs = inputs.filter((input): input is INodeInputConfiguration => {
if (!isNodeInputConfiguration(input)) return false;

44
packages/frontend/editor-ui/src/components/NodeDetailsView.test.ts
View File

@@ -1,10 +1,8 @@
import { createPinia, setActivePinia } from 'pinia';
import { waitFor, waitForElementToBeRemoved, fireEvent } from '@testing-library/vue';
import { mock } from 'vitest-mock-extended';
import { waitFor, fireEvent } from '@testing-library/vue';
import NodeDetailsView from '@/components/NodeDetailsView.vue';
import { VIEWS } from '@/constants';
import type { IWorkflowDb } from '@/Interface';
import { useSettingsStore } from '@/stores/settings.store';
import { useUsersStore } from '@/stores/users.store';
import { useNDVStore } from '@/stores/ndv.store';
@@ -13,7 +11,12 @@ import { useWorkflowsStore } from '@/stores/workflows.store';
import { createComponentRenderer } from '@/__tests__/render';
import { setupServer } from '@/__tests__/server';
import { defaultNodeDescriptions, mockNodes } from '@/__tests__/mocks';
import {
createTestWorkflow,
createTestWorkflowObject,
defaultNodeDescriptions,
mockNodes,
} from '@/__tests__/mocks';
import { cleanupAppModals, createAppModals } from '@/__tests__/utils';
vi.mock('vue-router', () => {
@@ -26,7 +29,7 @@ vi.mock('vue-router', () => {
async function createPiniaStore(isActiveNode: boolean) {
const node = mockNodes[0];
const workflow = mock<IWorkflowDb>({
const workflow = createTestWorkflow({
connections: {},
active: true,
nodes: [node],
@@ -41,6 +44,7 @@ async function createPiniaStore(isActiveNode: boolean) {
nodeTypesStore.setNodeTypes(defaultNodeDescriptions);
workflowsStore.workflow = workflow;
workflowsStore.workflowObject = createTestWorkflowObject(workflow);
workflowsStore.nodeMetadata[node.name] = { pristine: true };
if (isActiveNode) {
@@ -52,7 +56,7 @@ async function createPiniaStore(isActiveNode: boolean) {
return {
pinia,
currentWorkflow: workflowsStore.getCurrentWorkflow(),
workflowObject: workflowsStore.workflowObject,
nodeName: node.name,
};
}
@@ -78,13 +82,13 @@ describe('NodeDetailsView', () => {
});
it('should render correctly', async () => {
const { pinia, currentWorkflow } = await createPiniaStore(true);
const { pinia, workflowObject } = await createPiniaStore(true);
const renderComponent = createComponentRenderer(NodeDetailsView, {
props: {
teleported: false,
appendToBody: false,
workflowObject: currentWorkflow,
workflowObject,
},
global: {
mocks: {
@@ -104,14 +108,13 @@ describe('NodeDetailsView', () => {
describe('keyboard listener', () => {
test('should register and unregister keydown listener based on modal open state', async () => {
const { pinia, currentWorkflow, nodeName } = await createPiniaStore(false);
const ndvStore = useNDVStore();
const { pinia, workflowObject } = await createPiniaStore(true);
const renderComponent = createComponentRenderer(NodeDetailsView, {
props: {
teleported: false,
appendToBody: false,
workflowObject: currentWorkflow,
workflowObject,
},
global: {
mocks: {
@@ -122,15 +125,13 @@ describe('NodeDetailsView', () => {
},
});
const { getByTestId, queryByTestId } = renderComponent({
const { getByTestId, queryByTestId, unmount } = renderComponent({
pinia,
});
const addEventListenerSpy = vi.spyOn(document, 'addEventListener');
const removeEventListenerSpy = vi.spyOn(document, 'removeEventListener');
ndvStore.activeNodeName = nodeName;
await waitFor(() => expect(getByTestId('ndv')).toBeInTheDocument());
await waitFor(() => expect(queryByTestId('ndv-modal')).toBeInTheDocument());
@@ -141,9 +142,7 @@ describe('NodeDetailsView', () => {
true,
);
ndvStore.activeNodeName = null;
await waitForElementToBeRemoved(queryByTestId('ndv-modal'));
unmount();
expect(removeEventListenerSpy).toHaveBeenCalledWith('keydown', expect.any(Function), true);
@@ -152,14 +151,14 @@ describe('NodeDetailsView', () => {
});
test('should unregister keydown listener on unmount', async () => {
const { pinia, currentWorkflow, nodeName } = await createPiniaStore(false);
const { pinia, workflowObject, nodeName } = await createPiniaStore(false);
const ndvStore = useNDVStore();
const renderComponent = createComponentRenderer(NodeDetailsView, {
props: {
teleported: false,
appendToBody: false,
workflowObject: currentWorkflow,
workflowObject,
},
global: {
mocks: {
@@ -194,14 +193,13 @@ describe('NodeDetailsView', () => {
});
test("should emit 'saveKeyboardShortcut' when save shortcut keybind is pressed", async () => {
const { pinia, currentWorkflow, nodeName } = await createPiniaStore(false);
const ndvStore = useNDVStore();
const { pinia, workflowObject } = await createPiniaStore(true);
const renderComponent = createComponentRenderer(NodeDetailsView, {
props: {
teleported: false,
appendToBody: false,
workflowObject: currentWorkflow,
workflowObject,
},
global: {
mocks: {
@@ -216,8 +214,6 @@ describe('NodeDetailsView', () => {
pinia,
});
ndvStore.activeNodeName = nodeName;
await waitFor(() => expect(getByTestId('ndv')).toBeInTheDocument());
await waitFor(() => expect(queryByTestId('ndv-modal')).toBeInTheDocument());

4
packages/frontend/editor-ui/src/components/NodeDetailsView.vue
View File

@@ -756,7 +756,7 @@ onBeforeUnmount(() => {
/>
<InputPanel
v-else-if="!isTriggerNode"
:workflow="workflowObject"
:workflow-object="workflowObject"
:can-link-runs="canLinkRuns"
:run-index="inputRun"
:linked-runs="linked"
@@ -785,7 +785,7 @@ onBeforeUnmount(() => {
<template #output>
<OutputPanel
data-test-id="output-panel"
:workflow="workflowObject"
:workflow-object="workflowObject"
:can-link-runs="canLinkRuns"
:run-index="outputRun"
:linked-runs="linked"

58
packages/frontend/editor-ui/src/components/NodeDetailsViewV2.test.ts
View File

@@ -1,10 +1,8 @@
import { createPinia, setActivePinia } from 'pinia';
import { waitFor, waitForElementToBeRemoved, fireEvent } from '@testing-library/vue';
import { mock } from 'vitest-mock-extended';
import { waitFor, fireEvent } from '@testing-library/vue';
import NodeDetailsViewV2 from '@/components/NodeDetailsViewV2.vue';
import { VIEWS } from '@/constants';
import type { IWorkflowDb } from '@/Interface';
import { useSettingsStore } from '@/stores/settings.store';
import { useUsersStore } from '@/stores/users.store';
import { useNDVStore } from '@/stores/ndv.store';
@@ -13,7 +11,12 @@ import { useWorkflowsStore } from '@/stores/workflows.store';
import { createComponentRenderer } from '@/__tests__/render';
import { setupServer } from '@/__tests__/server';
import { defaultNodeDescriptions, mockNodes } from '@/__tests__/mocks';
import {
createTestWorkflow,
createTestWorkflowObject,
defaultNodeDescriptions,
mockNodes,
} from '@/__tests__/mocks';
import { cleanupAppModals, createAppModals } from '@/__tests__/utils';
vi.mock('vue-router', () => {
@@ -27,7 +30,7 @@ vi.mock('vue-router', () => {
async function createPiniaStore(
{ activeNodeName }: { activeNodeName: string | null } = { activeNodeName: null },
) {
const workflow = mock<IWorkflowDb>({
const workflow = createTestWorkflow({
connections: {},
active: true,
nodes: mockNodes,
@@ -42,6 +45,7 @@ async function createPiniaStore(
nodeTypesStore.setNodeTypes(defaultNodeDescriptions);
workflowsStore.workflow = workflow;
workflowsStore.workflowObject = createTestWorkflowObject(workflow);
workflowsStore.nodeMetadata = mockNodes.reduce(
(acc, node) => ({ ...acc, [node.name]: { pristine: true } }),
{},
@@ -54,7 +58,7 @@ async function createPiniaStore(
return {
pinia,
currentWorkflow: workflowsStore.getCurrentWorkflow(),
workflowObject: workflowsStore.workflowObject,
};
}
@@ -80,13 +84,13 @@ describe('NodeDetailsViewV2', () => {
});
test('should render correctly', async () => {
const { pinia, currentWorkflow } = await createPiniaStore({ activeNodeName: 'Manual Trigger' });
const { pinia, workflowObject } = await createPiniaStore({ activeNodeName: 'Manual Trigger' });
const renderComponent = createComponentRenderer(NodeDetailsViewV2, {
props: {
teleported: false,
appendToBody: false,
workflowObject: currentWorkflow,
workflowObject,
},
global: {
mocks: {
@@ -105,13 +109,13 @@ describe('NodeDetailsViewV2', () => {
});
test('should not render for stickies', async () => {
const { pinia, currentWorkflow } = await createPiniaStore({ activeNodeName: 'Sticky' });
const { pinia, workflowObject } = await createPiniaStore({ activeNodeName: 'Sticky' });
const renderComponent = createComponentRenderer(NodeDetailsViewV2, {
props: {
teleported: false,
appendToBody: false,
workflowObject: currentWorkflow,
workflowObject,
},
global: {
mocks: {
@@ -131,14 +135,18 @@ describe('NodeDetailsViewV2', () => {
describe('keyboard listener', () => {
test('should register and unregister keydown listener based on modal open state', async () => {
const { pinia, currentWorkflow } = await createPiniaStore();
const ndvStore = useNDVStore();
const addEventListenerSpy = vi.spyOn(document, 'addEventListener');
const removeEventListenerSpy = vi.spyOn(document, 'removeEventListener');
const { pinia, workflowObject } = await createPiniaStore({
activeNodeName: 'Manual Trigger',
});
const renderComponent = createComponentRenderer(NodeDetailsViewV2, {
props: {
teleported: false,
appendToBody: false,
workflowObject: currentWorkflow,
workflowObject,
},
global: {
mocks: {
@@ -149,15 +157,10 @@ describe('NodeDetailsViewV2', () => {
},
});
const { getByTestId, queryByTestId } = renderComponent({
const { getByTestId, unmount } = renderComponent({
pinia,
});
const addEventListenerSpy = vi.spyOn(document, 'addEventListener');
const removeEventListenerSpy = vi.spyOn(document, 'removeEventListener');
ndvStore.activeNodeName = 'Manual Trigger';
await waitFor(() => expect(getByTestId('ndv')).toBeInTheDocument());
expect(addEventListenerSpy).toHaveBeenCalledWith('keydown', expect.any(Function), true);
@@ -167,9 +170,7 @@ describe('NodeDetailsViewV2', () => {
true,
);
ndvStore.activeNodeName = null;
await waitForElementToBeRemoved(queryByTestId('ndv'));
unmount();
expect(removeEventListenerSpy).toHaveBeenCalledWith('keydown', expect.any(Function), true);
@@ -178,14 +179,14 @@ describe('NodeDetailsViewV2', () => {
});
test('should unregister keydown listener on unmount', async () => {
const { pinia, currentWorkflow } = await createPiniaStore();
const { pinia, workflowObject } = await createPiniaStore();
const ndvStore = useNDVStore();
const renderComponent = createComponentRenderer(NodeDetailsViewV2, {
props: {
teleported: false,
appendToBody: false,
workflowObject: currentWorkflow,
workflowObject,
},
global: {
mocks: {
@@ -219,14 +220,15 @@ describe('NodeDetailsViewV2', () => {
});
test("should emit 'saveKeyboardShortcut' when save shortcut keybind is pressed", async () => {
const { pinia, currentWorkflow } = await createPiniaStore();
const ndvStore = useNDVStore();
const { pinia, workflowObject } = await createPiniaStore({
activeNodeName: 'Manual Trigger',
});
const renderComponent = createComponentRenderer(NodeDetailsViewV2, {
props: {
teleported: false,
appendToBody: false,
workflowObject: currentWorkflow,
workflowObject,
},
global: {
mocks: {
@@ -241,8 +243,6 @@ describe('NodeDetailsViewV2', () => {
pinia,
});
ndvStore.activeNodeName = 'Manual Trigger';
await waitFor(() => expect(getByTestId('ndv')).toBeInTheDocument());
await fireEvent.keyDown(getByTestId('ndv'), {

4
packages/frontend/editor-ui/src/components/NodeDetailsViewV2.vue
View File

@@ -738,7 +738,7 @@ onBeforeUnmount(() => {
/>
<InputPanel
v-else-if="!isTriggerNode"
:workflow="workflowObject"
:workflow-object="workflowObject"
:can-link-runs="canLinkRuns"
:run-index="inputRun"
:linked-runs="linked"
@@ -814,7 +814,7 @@ onBeforeUnmount(() => {
>
<OutputPanel
data-test-id="output-panel"
:workflow="workflowObject"
:workflow-object="workflowObject"
:can-link-runs="canLinkRuns"
:run-index="outputRun"
:linked-runs="linked"

5
packages/frontend/editor-ui/src/components/NodeSettings.vue
View File

@@ -135,9 +135,8 @@ const subConnections = ref<InstanceType<typeof NDVSubConnections> | null>(null);
const installedPackage = ref<PublicInstalledPackage | undefined>(undefined);
const currentWorkflowInstance = computed(() => workflowsStore.getCurrentWorkflow());
const currentWorkflow = computed(() =>
workflowsStore.getWorkflowById(currentWorkflowInstance.value.id),
const currentWorkflow = computed(
() => workflowsStore.getWorkflowById(workflowsStore.workflowObject.id), // @TODO check if we actually need workflowObject here
);
const hasForeignCredential = computed(() => props.foreignCredentials.length > 0);
const isHomeProjectTeam = computed(

10
packages/frontend/editor-ui/src/components/OutputPanel.vue
View File

@@ -37,7 +37,7 @@ type OutputTypeKey = keyof typeof OUTPUT_TYPE;
type OutputType = (typeof OUTPUT_TYPE)[OutputTypeKey];
type Props = {
workflow: Workflow;
workflowObject: Workflow;
runIndex: number;
isReadOnly?: boolean;
linkedRuns?: boolean;
@@ -119,7 +119,7 @@ const hasAiMetadata = computed(() => {
}
if (node.value) {
const connectedSubNodes = props.workflow.getParentNodes(node.value.name, 'ALL_NON_MAIN');
const connectedSubNodes = props.workflowObject.getParentNodes(node.value.name, 'ALL_NON_MAIN');
const resultData = connectedSubNodes.map(workflowsStore.getWorkflowResultDataByNodeName);
return resultData && Array.isArray(resultData) && resultData.length > 0;
@@ -215,7 +215,7 @@ const allToolsWereUnusedNotice = computed(() => {
// as it likely ends up unactionable noise to the user
if (pinnedData.hasData.value) return undefined;
const toolsAvailable = props.workflow.getParentNodes(
const toolsAvailable = props.workflowObject.getParentNodes(
node.value.name,
NodeConnectionTypes.AiTool,
1,
@@ -308,7 +308,7 @@ function handleChangeCollapsingColumn(columnName: string | null) {
ref="runDataRef"
:class="[$style.runData, { [$style.runDataV2]: isNDVV2 }]"
:node="node"
:workflow="workflow"
:workflow-object="workflowObject"
:run-index="runIndex"
:linked-runs="linkedRuns"
:can-link-runs="canLinkRuns"
@@ -460,7 +460,7 @@ function handleChangeCollapsingColumn(columnName: string | null) {
</template>
<template v-if="outputMode === 'logs' && node" #content>
<RunDataAi :node="node" :run-index="runIndex" :workflow="workflow" />
<RunDataAi :node="node" :run-index="runIndex" :workflow-object="workflowObject" />
</template>
<template #recovered-artificial-output-data>

33
packages/frontend/editor-ui/src/components/ParameterInputList.test.ts
View File

@@ -14,14 +14,10 @@ import {
TEST_ISSUE,
} from './ParameterInputList.test.constants';
import { FORM_NODE_TYPE, FORM_TRIGGER_NODE_TYPE } from 'n8n-workflow';
import type { Workflow } from 'n8n-workflow';
import type { INodeUi } from '../Interface';
import type { MockInstance } from 'vitest';
vi.mock('@/composables/useWorkflowHelpers', () => ({
useWorkflowHelpers: vi.fn().mockReturnValue({
getCurrentWorkflow: vi.fn(),
}),
}));
import { useWorkflowsStore } from '@/stores/workflows.store';
vi.mock('vue-router', async () => {
const actual = await vi.importActual('vue-router');
@@ -40,6 +36,7 @@ vi.mock('vue-router', async () => {
});
let ndvStore: ReturnType<typeof mockedStore<typeof useNDVStore>>;
let workflowStore: ReturnType<typeof mockedStore<typeof useWorkflowsStore>>;
const renderComponent = createComponentRenderer(ParameterInputList, {
props: {
@@ -59,6 +56,7 @@ describe('ParameterInputList', () => {
beforeEach(() => {
createTestingPinia();
ndvStore = mockedStore(useNDVStore);
workflowStore = mockedStore(useWorkflowsStore);
});
it('renders', () => {
@@ -179,20 +177,15 @@ describe('ParameterInputList', () => {
it('should not show triggerNotice if Form Trigger is connected', () => {
ndvStore.activeNode = { name: 'From', type: FORM_NODE_TYPE, parameters: {} } as INodeUi;
workflowHelpersMock.mockReturnValue({
getCurrentWorkflow: vi.fn(() => {
return {
getParentNodes: vi.fn(() => ['Form Trigger']),
nodes: {
'Form Trigger': {
type: FORM_TRIGGER_NODE_TYPE,
parameters: {},
},
},
};
}),
});
workflowStore.workflowObject = {
getParentNodes: vi.fn(() => ['Form Trigger']),
nodes: {
'Form Trigger': {
type: FORM_TRIGGER_NODE_TYPE,
parameters: {},
},
},
} as unknown as Workflow;
const { queryByText } = renderComponent({
props: {

24
packages/frontend/editor-ui/src/components/ParameterInputList.vue
View File

@@ -46,6 +46,7 @@ import {
import { storeToRefs } from 'pinia';
import { useCalloutHelpers } from '@/composables/useCalloutHelpers';
import { getParameterTypeOption } from '@/utils/nodeSettingsUtils';
import { useWorkflowsStore } from '@/stores/workflows.store';
const LazyFixedCollectionParameter = defineAsyncComponent(
async () => await import('./FixedCollectionParameter.vue'),
@@ -78,6 +79,7 @@ const emit = defineEmits<{
const nodeTypesStore = useNodeTypesStore();
const ndvStore = useNDVStore();
const workflowsStore = useWorkflowsStore();
const message = useMessage();
const nodeSettingsParameters = useNodeSettingsParameters();
@@ -192,11 +194,11 @@ watch(filteredParameterNames, (newValue, oldValue) => {
});
function updateFormTriggerParameters(parameters: INodeProperties[], triggerName: string) {
const workflow = workflowHelpers.getCurrentWorkflow();
const connectedNodes = workflow.getChildNodes(triggerName);
const workflowObject = workflowsStore.workflowObject;
const connectedNodes = workflowObject.getChildNodes(triggerName);
const hasFormPage = connectedNodes.some((nodeName) => {
const _node = workflow.getNode(nodeName);
const _node = workflowObject.getNode(nodeName);
return _node && _node.type === FORM_NODE_TYPE;
});
@@ -237,18 +239,18 @@ function updateFormTriggerParameters(parameters: INodeProperties[], triggerName:
}
function updateWaitParameters(parameters: INodeProperties[], nodeName: string) {
const workflow = workflowHelpers.getCurrentWorkflow();
const parentNodes = workflow.getParentNodes(nodeName);
const workflowObject = workflowsStore.workflowObject;
const parentNodes = workflowObject.getParentNodes(nodeName);
const formTriggerName = parentNodes.find(
(_node) => workflow.nodes[_node].type === FORM_TRIGGER_NODE_TYPE,
(_node) => workflowObject.nodes[_node].type === FORM_TRIGGER_NODE_TYPE,
);
if (!formTriggerName) return parameters;
const connectedNodes = workflow.getChildNodes(formTriggerName);
const connectedNodes = workflowObject.getChildNodes(formTriggerName);
const hasFormPage = connectedNodes.some((_nodeName) => {
const _node = workflow.getNode(_nodeName);
const _node = workflowObject.getNode(_nodeName);
return _node && _node.type === FORM_NODE_TYPE;
});
@@ -276,11 +278,11 @@ function updateWaitParameters(parameters: INodeProperties[], nodeName: string) {
}
function updateFormParameters(parameters: INodeProperties[], nodeName: string) {
const workflow = workflowHelpers.getCurrentWorkflow();
const parentNodes = workflow.getParentNodes(nodeName);
const workflowObject = workflowsStore.workflowObject;
const parentNodes = workflowObject.getParentNodes(nodeName);
const formTriggerName = parentNodes.find(
(_node) => workflow.nodes[_node].type === FORM_TRIGGER_NODE_TYPE,
(_node) => workflowObject.nodes[_node].type === FORM_TRIGGER_NODE_TYPE,
);
if (formTriggerName) return parameters.filter((parameter) => parameter.name !== 'triggerNotice');

2
packages/frontend/editor-ui/src/components/RunData.test.ts
View File

@@ -706,7 +706,7 @@ describe('RunData', () => {
node: {
name: 'Test Node',
},
workflow: createTestWorkflowObject({
workflowObject: createTestWorkflowObject({
id: workflowId,
nodes: workflowNodes,
}),

38
packages/frontend/editor-ui/src/components/RunData.vue
View File

@@ -119,7 +119,7 @@ export type EnterEditModeArgs = {
};
type Props = {
workflow: Workflow;
workflowObject: Workflow;
workflowExecution?: IRunExecutionData;
runIndex: number;
tooMuchDataTitle: string;
@@ -314,7 +314,7 @@ const hasSubworkflowExecutionError = computed(() => !!workflowsStore.subWorkflow
// Sub-nodes may wish to display the parent node error as it can contain additional metadata
const parentNodeError = computed(() => {
const parentNode = props.workflow.getChildNodes(node.value?.name ?? '', 'ALL_NON_MAIN')[0];
const parentNode = props.workflowObject.getChildNodes(node.value?.name ?? '', 'ALL_NON_MAIN')[0];
return workflowRunData.value?.[parentNode]?.[props.runIndex]?.error as NodeError;
});
const workflowRunErrorAsNodeError = computed(() => {
@@ -508,12 +508,12 @@ const showIoSearchNoMatchContent = computed(
);
const parentNodeOutputData = computed(() => {
const parentNode = props.workflow.getParentNodesByDepth(node.value?.name ?? '')[0];
const parentNode = props.workflowObject.getParentNodesByDepth(node.value?.name ?? '')[0];
let parentNodeData: INodeExecutionData[] = [];
if (parentNode?.name) {
parentNodeData = nodeHelpers.getNodeInputData(
props.workflow.getNode(parentNode?.name),
props.workflowObject.getNode(parentNode?.name),
props.runIndex,
outputIndex.value,
'input',
@@ -525,8 +525,8 @@ const parentNodeOutputData = computed(() => {
});
const parentNodePinnedData = computed(() => {
const parentNode = props.workflow.getParentNodesByDepth(node.value?.name ?? '')[0];
return props.workflow.pinData?.[parentNode?.name || ''] ?? [];
const parentNode = props.workflowObject.getParentNodesByDepth(node.value?.name ?? '')[0];
return props.workflowObject.pinData?.[parentNode?.name || ''] ?? [];
});
const showPinButton = computed(() => {
@@ -745,10 +745,14 @@ onBeforeUnmount(() => {
function getResolvedNodeOutputs() {
if (node.value && nodeType.value) {
const workflowNode = props.workflow.getNode(node.value.name);
const workflowNode = props.workflowObject.getNode(node.value.name);
if (workflowNode) {
const outputs = NodeHelpers.getNodeOutputs(props.workflow, workflowNode, nodeType.value);
const outputs = NodeHelpers.getNodeOutputs(
props.workflowObject,
workflowNode,
nodeType.value,
);
return outputs;
}
}
@@ -780,13 +784,14 @@ function shouldHintBeDisplayed(hint: NodeHint): boolean {
return true;
}
function getNodeHints(): NodeHint[] {
const nodeHints = computed<NodeHint[]>(() => {
try {
if (node.value && nodeType.value) {
const workflowNode = props.workflow.getNode(node.value.name);
const workflowNode = props.workflowObject.getNode(node.value.name);
if (workflowNode) {
const nodeHints = nodeHelpers.getNodeHints(props.workflow, workflowNode, nodeType.value, {
const hints = nodeHelpers.getNodeHints(props.workflowObject, workflowNode, nodeType.value, {
runExecutionData: workflowExecution.value ?? null,
runIndex: props.runIndex,
connectionInputData: parentNodeOutputData.value,
@@ -803,13 +808,13 @@ function getNodeHints(): NodeHint[] {
node: node.value,
nodeType: nodeType.value,
nodeOutputData,
nodes: props.workflow.nodes,
connections: props.workflow.connectionsBySourceNode,
nodes: props.workflowObject.nodes,
connections: props.workflowObject.connectionsBySourceNode,
hasNodeRun: hasNodeRun.value,
hasMultipleInputItems,
});
return executionHints.value.concat(nodeHints, genericHints).filter(shouldHintBeDisplayed);
return executionHints.value.concat(hints, genericHints).filter(shouldHintBeDisplayed);
}
}
} catch (error) {
@@ -817,7 +822,8 @@ function getNodeHints(): NodeHint[] {
}
return [];
}
});
function onItemHover(itemIndex: number | null) {
if (itemIndex === null) {
emit('itemHover', null);
@@ -1548,7 +1554,7 @@ defineExpose({ enterEditMode });
:node="node"
/>
<N8nCallout
v-for="hint in getNodeHints()"
v-for="hint in nodeHints"
:key="hint.message"
:class="$style.hintCallout"
:theme="hint.type || 'info'"

6
packages/frontend/editor-ui/src/components/RunDataAi/RunDataAi.vue
View File

@@ -21,7 +21,7 @@ export interface Props {
node: INodeUi;
runIndex?: number;
slim?: boolean;
workflow: Workflow;
workflowObject: Workflow;
}
const props = withDefaults(defineProps<Props>(), { runIndex: 0 });
const workflowsStore = useWorkflowsStore();
@@ -33,7 +33,7 @@ const i18n = useI18n();
const aiData = computed<AIResult[]>(() =>
createAiData(
props.node.name,
props.workflow.connectionsBySourceNode,
props.workflowObject.connectionsBySourceNode,
workflowsStore.getWorkflowResultDataByNodeName,
),
);
@@ -41,7 +41,7 @@ const aiData = computed<AIResult[]>(() =>
const executionTree = computed<TreeNode[]>(() =>
getTreeNodeData(
props.node.name,
props.workflow.connectionsBySourceNode,
props.workflowObject.connectionsBySourceNode,
aiData.value,
props.runIndex,
),

9
packages/frontend/editor-ui/src/components/TriggerPanel.vue
View File

@@ -78,9 +78,12 @@ const hideContent = computed(() => {
}
if (node.value) {
const hideContentValue = workflowHelpers
.getCurrentWorkflow()
.expression.getSimpleParameterValue(node.value, hideContent, 'internal', {});
const hideContentValue = workflowsStore.workflowObject.expression.getSimpleParameterValue(
node.value,
hideContent,
'internal',
{},
);
if (typeof hideContentValue === 'boolean') {
return hideContentValue;

2
packages/frontend/editor-ui/src/components/canvas/elements/nodes/CanvasNodeRenderer.test.ts
View File

@@ -14,7 +14,7 @@ beforeEach(() => {
setActivePinia(pinia);
const workflowsStore = useWorkflowsStore();
const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
workflowsStore.getCurrentWorkflow = vi.fn().mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
});
describe('CanvasNodeRenderer', () => {

2
packages/frontend/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.test.ts
View File

@@ -22,7 +22,7 @@ beforeEach(() => {
setActivePinia(pinia);
const workflowsStore = useWorkflowsStore();
const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
workflowsStore.getCurrentWorkflow = vi.fn().mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
});
describe('CanvasNodeDefault', () => {

7
packages/frontend/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeSettingsIcons.vue
View File

@@ -1,16 +1,15 @@
<script setup lang="ts">
import { computed } from 'vue';
import { useCanvasNode } from '@/composables/useCanvasNode';
import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
import { useI18n } from '@n8n/i18n';
import { N8nIcon } from '@n8n/design-system';
import { useWorkflowsStore } from '@/stores/workflows.store';
const { name } = useCanvasNode();
const i18n = useI18n();
const workflowHelpers = useWorkflowHelpers();
const workflowsStore = useWorkflowsStore();
const workflow = computed(() => workflowHelpers.getCurrentWorkflow());
const node = computed(() => workflow.value.getNode(name.value));
const node = computed(() => workflowsStore.workflowObject.getNode(name.value));
const size = 'medium';
</script>

2
packages/frontend/editor-ui/src/components/canvas/experimental/components/ExperimentalEmbeddedNdvMapper.vue
View File

@@ -78,7 +78,7 @@ watch(viewport, () => {
ref="inputPanel"
:tabindex="-1"
:class="$style.inputPanel"
:workflow="workflow"
:workflow-object="workflow"
:run-index="0"
compact
push-ref=""

9
packages/frontend/editor-ui/src/components/canvas/experimental/components/ExperimentalEmbeddedNodeDetails.vue
View File

@@ -12,6 +12,7 @@ import { computed, provide, ref, useTemplateRef } from 'vue';
import { useExperimentalNdvStore } from '../experimentalNdv.store';
import ExperimentalCanvasNodeSettings from './ExperimentalCanvasNodeSettings.vue';
import { useI18n } from '@n8n/i18n';
import type { Workflow } from 'n8n-workflow';
import NodeIcon from '@/components/NodeIcon.vue';
import { getNodeSubTitleText } from '@/components/canvas/experimental/experimentalNdv.utils';
import ExperimentalEmbeddedNdvActions from '@/components/canvas/experimental/components/ExperimentalEmbeddedNdvActions.vue';
@@ -79,7 +80,7 @@ const expressionResolveCtx = computed<ExpressionLocalResolveContext | undefined>
};
}
const inputs = workflow.value.getParentNodesByDepth(nodeName, 1);
const inputs = workflowObject.value.getParentNodesByDepth(nodeName, 1);
if (inputs.length > 0) {
return {
@@ -95,7 +96,7 @@ const expressionResolveCtx = computed<ExpressionLocalResolveContext | undefined>
return {
localResolve: true,
envVars: useEnvironmentsStore().variablesAsObject,
workflow: workflow.value,
workflow: workflowObject.value,
execution,
nodeName,
additionalKeys: {},
@@ -104,7 +105,7 @@ const expressionResolveCtx = computed<ExpressionLocalResolveContext | undefined>
};
});
const workflow = computed(() => workflowsStore.getCurrentWorkflow());
const workflowObject = computed(() => workflowsStore.workflowObject as Workflow);
function handleToggleExpand() {
experimentalNdvStore.setNodeExpanded(nodeId);
@@ -142,7 +143,7 @@ watchOnce(isVisible, (visible) => {
<template v-if="!node || !isOnceVisible" />
<ExperimentalEmbeddedNdvMapper
v-else-if="isExpanded"
:workflow="workflow"
:workflow="workflowObject"
:node="node"
:input-node-name="expressionResolveCtx?.inputNode?.name"
:container="containerRef"

4
packages/frontend/editor-ui/src/composables/useCalloutHelpers.test.ts
View File

@@ -40,9 +40,9 @@ vi.mock('@/stores/users.store', () => ({
vi.mock('@/stores/workflows.store', () => ({
useWorkflowsStore: () => ({
getCurrentWorkflow: vi.fn(() => ({
workflowObject: {
id: '1',
})),
},
getWorkflowById: mocks.getWorkflowById,
}),
}));

4
packages/frontend/editor-ui/src/composables/useCalloutHelpers.ts
View File

@@ -45,8 +45,8 @@ export function useCalloutHelpers() {
const template = getRagStarterWorkflowJson();
const routeTemplateId = route.query.templateId;
const currentWorkflow = workflowsStore.getCurrentWorkflow();
const workflow = workflowsStore.getWorkflowById(currentWorkflow.id);
const workflowObject = workflowsStore.workflowObject;
const workflow = workflowsStore.getWorkflowById(workflowObject.id); // @TODO Check if we actually need workflowObject here
// Hide the RAG starter callout if we're currently on the RAG starter template
if ((routeTemplateId ?? workflow?.meta?.templateId) === template.meta.templateId) {

2
packages/frontend/editor-ui/src/composables/useCanvasMapping.ts
View File

@@ -582,6 +582,8 @@ export function useCanvasMapping({
const outputConnections = connectionsBySourceNode[node.name] ?? {};
const inputConnections = connectionsByDestinationNode[node.name] ?? {};
// console.log(node.name, nodeInputsById.value[node.id]);
const data: CanvasNodeData = {
id: node.id,
name: node.name,

157
packages/frontend/editor-ui/src/composables/useCanvasOperations.test.ts
View File

@@ -295,9 +295,7 @@ describe('useCanvasOperations', () => {
vi.spyOn(uiStore, 'lastInteractedWithNode', 'get').mockReturnValue(node);
nodeTypesStore.getNodeType = vi.fn().mockReturnValue(nodeTypeDescription);
workflowsStore.getCurrentWorkflow.mockReturnValue(
createTestWorkflowObject(workflowsStore.workflow),
);
workflowsStore.workflowObject = createTestWorkflowObject(workflowsStore.workflow);
uiStore.lastInteractedWithNodeHandle = 'inputs/main/0';
uiStore.lastCancelledConnectionPosition = [200, 200];
@@ -324,7 +322,8 @@ describe('useCanvasOperations', () => {
typeVersion: 1,
});
nodeTypesStore.getNodeType = vi.fn().mockReturnValue(nodeTypeDescription);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
workflowsStore.cloneWorkflowObject = vi.fn().mockReturnValue(workflowObject);
workflowObject.getNode = vi.fn().mockReturnValue(node);
const { resolveNodePosition } = useCanvasOperations();
@@ -348,7 +347,8 @@ describe('useCanvasOperations', () => {
typeVersion: 1,
});
nodeTypesStore.getNodeType = vi.fn().mockReturnValue(nodeTypeDescription);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
workflowsStore.cloneWorkflowObject = vi.fn().mockReturnValue(workflowObject);
workflowObject.getNode = vi.fn().mockReturnValue(node);
vi.spyOn(NodeHelpers, 'getNodeOutputs').mockReturnValueOnce([
@@ -406,7 +406,8 @@ describe('useCanvasOperations', () => {
});
uiStore.lastInteractedWithNodeHandle = `outputs/${NodeConnectionTypes.AiLanguageModel}/0`;
nodeTypesStore.getNodeType = vi.fn().mockReturnValue(nodeTypeDescription);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
workflowsStore.cloneWorkflowObject = vi.fn().mockReturnValue(workflowObject);
workflowObject.getNode = vi.fn().mockReturnValue(node);
vi.spyOn(NodeHelpers, 'getNodeOutputs').mockReturnValueOnce([
@@ -442,7 +443,8 @@ describe('useCanvasOperations', () => {
});
uiStore.lastInteractedWithNodeHandle = `outputs/${NodeConnectionTypes.AiMemory}/0`;
nodeTypesStore.getNodeType = vi.fn().mockReturnValue(nodeTypeDescription);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
workflowsStore.cloneWorkflowObject = vi.fn().mockReturnValue(workflowObject);
workflowObject.getNode = vi.fn().mockReturnValue(node);
vi.spyOn(NodeHelpers, 'getNodeOutputs').mockReturnValueOnce([
@@ -476,7 +478,8 @@ describe('useCanvasOperations', () => {
});
uiStore.lastInteractedWithNodeHandle = `outputs/${NodeConnectionTypes.AiTool}/0`;
nodeTypesStore.getNodeType = vi.fn().mockReturnValue(nodeTypeDescription);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
workflowsStore.cloneWorkflowObject = vi.fn().mockReturnValue(workflowObject);
workflowObject.getNode = vi.fn().mockReturnValue(node);
vi.spyOn(NodeHelpers, 'getNodeOutputs').mockReturnValueOnce([
@@ -512,7 +515,8 @@ describe('useCanvasOperations', () => {
});
// No lastInteractedWithNodeHandle set
nodeTypesStore.getNodeType = vi.fn().mockReturnValue(nodeTypeDescription);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
workflowsStore.cloneWorkflowObject = vi.fn().mockReturnValue(workflowObject);
workflowObject.getNode = vi.fn().mockReturnValue(node);
vi.spyOn(NodeHelpers, 'getNodeOutputs').mockReturnValueOnce([
@@ -747,9 +751,7 @@ describe('useCanvasOperations', () => {
mockNode({ name: 'Node 2', type: nodeTypeName, position: [96, 256] }),
];
workflowsStore.getCurrentWorkflow.mockReturnValue(
createTestWorkflowObject(workflowsStore.workflow),
);
workflowsStore.workflowObject = createTestWorkflowObject(workflowsStore.workflow);
nodeTypesStore.nodeTypes = {
[nodeTypeName]: { 1: mockNodeTypeDescription({ name: nodeTypeName }) },
@@ -784,9 +786,7 @@ describe('useCanvasOperations', () => {
mockNode({ name: 'Node 2', type: nodeTypeName, position: [192, 320] }),
];
workflowsStore.getCurrentWorkflow.mockReturnValue(
createTestWorkflowObject(workflowsStore.workflow),
);
workflowsStore.workflowObject = createTestWorkflowObject(workflowsStore.workflow);
nodeTypesStore.nodeTypes = {
[nodeTypeName]: { 1: mockNodeTypeDescription({ name: nodeTypeName }) },
@@ -822,16 +822,14 @@ describe('useCanvasOperations', () => {
[nodeTypeName]: { 1: mockNodeTypeDescription({ name: nodeTypeName }) },
};
vi.spyOn(workflowsStore, 'getCurrentWorkflow').mockImplementation(() =>
mock<Workflow>({
getParentNodesByDepth: () =>
nodes.map((node) => ({
name: node.name,
depth: 0,
indicies: [],
})),
}),
);
workflowsStore.workflowObject = mock<Workflow>({
getParentNodesByDepth: () =>
nodes.map((node) => ({
name: node.name,
depth: 0,
indicies: [],
})),
});
const { addNodes } = useCanvasOperations();
await addNodes(nodes, {});
@@ -850,9 +848,7 @@ describe('useCanvasOperations', () => {
mockNode({ name: 'Node 2', type: nodeTypeName, position: [96, 240] }),
];
workflowsStore.getCurrentWorkflow.mockReturnValue(
createTestWorkflowObject(workflowsStore.workflow),
);
workflowsStore.workflowObject = createTestWorkflowObject(workflowsStore.workflow);
nodeTypesStore.nodeTypes = {
[nodeTypeName]: { 1: mockNodeTypeDescription({ name: nodeTypeName }) },
@@ -870,9 +866,7 @@ describe('useCanvasOperations', () => {
const nodeTypeName = 'type';
const nodes = [mockNode({ name: 'Node 1', type: nodeTypeName, position: [30, 40] })];
workflowsStore.getCurrentWorkflow.mockReturnValue(
createTestWorkflowObject(workflowsStore.workflow),
);
workflowsStore.workflowObject = createTestWorkflowObject(workflowsStore.workflow);
nodeTypesStore.nodeTypes = {
[nodeTypeName]: { 1: mockNodeTypeDescription({ name: nodeTypeName }) },
@@ -891,9 +885,7 @@ describe('useCanvasOperations', () => {
const nodeTypeName = 'type';
const nodes = [mockNode({ name: 'Node 1', type: nodeTypeName, position: [30, 40] })];
workflowsStore.getCurrentWorkflow.mockReturnValue(
createTestWorkflowObject(workflowsStore.workflow),
);
workflowsStore.workflowObject = createTestWorkflowObject(workflowsStore.workflow);
nodeTypesStore.nodeTypes = {
[nodeTypeName]: { 1: mockNodeTypeDescription({ name: nodeTypeName }) },
@@ -927,7 +919,8 @@ describe('useCanvasOperations', () => {
const historyStore = mockedStore(useHistoryStore);
const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
workflowsStore.cloneWorkflowObject = vi.fn().mockReturnValue(workflowObject);
workflowsStore.incomingConnectionsByNodeName.mockReturnValue({});
const id = 'node1';
@@ -955,7 +948,8 @@ describe('useCanvasOperations', () => {
const historyStore = mockedStore(useHistoryStore);
const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
workflowsStore.cloneWorkflowObject = vi.fn().mockReturnValue(workflowObject);
workflowsStore.incomingConnectionsByNodeName.mockReturnValue({});
const id = 'node1';
@@ -1033,7 +1027,8 @@ describe('useCanvasOperations', () => {
};
const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
workflowsStore.cloneWorkflowObject = vi.fn().mockReturnValue(workflowObject);
workflowsStore.incomingConnectionsByNodeName.mockReturnValue({});
workflowsStore.getNodeById.mockReturnValue(nodes[1]);
@@ -1109,7 +1104,8 @@ describe('useCanvasOperations', () => {
};
const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
workflowsStore.cloneWorkflowObject = vi.fn().mockReturnValue(workflowObject);
workflowsStore.incomingConnectionsByNodeName.mockReturnValue({});
workflowsStore.getNodeById.mockReturnValue(nodes[1]);
@@ -1151,7 +1147,8 @@ describe('useCanvasOperations', () => {
const workflowObject = createTestWorkflowObject();
workflowObject.renameNode = vi.fn();
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
workflowsStore.cloneWorkflowObject = vi.fn().mockReturnValue(workflowObject);
workflowsStore.getNodeByName = vi.fn().mockReturnValue({ name: oldName });
ndvStore.activeNodeName = oldName;
@@ -1189,7 +1186,8 @@ describe('useCanvasOperations', () => {
const error = new UserError(errorMessage, { description: errorDescription });
throw error;
});
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
workflowsStore.cloneWorkflowObject = vi.fn().mockReturnValue(workflowObject);
workflowsStore.getNodeByName = vi.fn().mockReturnValue({ name: oldName });
ndvStore.activeNodeName = oldName;
@@ -1214,7 +1212,8 @@ describe('useCanvasOperations', () => {
const workflowObject = createTestWorkflowObject();
workflowObject.renameNode = vi.fn();
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
workflowsStore.cloneWorkflowObject = vi.fn().mockReturnValue(workflowObject);
workflowsStore.getNodeByName = vi.fn().mockReturnValue({ name: currentName });
ndvStore.activeNodeName = currentName;
@@ -1396,7 +1395,8 @@ describe('useCanvasOperations', () => {
};
const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
workflowsStore.cloneWorkflowObject = vi.fn().mockReturnValue(workflowObject);
workflowsStore.getNodeById.mockReturnValueOnce(nodes[0]).mockReturnValueOnce(nodes[1]);
nodeTypesStore.getNodeType = vi.fn().mockReturnValue(nodeType);
@@ -1510,7 +1510,8 @@ describe('useCanvasOperations', () => {
nodeTypesStore.getNodeType = vi.fn().mockReturnValue(nodeTypeDescription);
const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
workflowsStore.cloneWorkflowObject = vi.fn().mockReturnValue(workflowObject);
const { createConnection, editableWorkflowObject } = useCanvasOperations();
@@ -1567,7 +1568,8 @@ describe('useCanvasOperations', () => {
nodeTypesStore.getNodeType = vi.fn().mockReturnValue(nodeTypeDescription);
const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
workflowsStore.cloneWorkflowObject = vi.fn().mockReturnValue(workflowObject);
const { createConnection, editableWorkflowObject } = useCanvasOperations();
@@ -1633,7 +1635,8 @@ describe('useCanvasOperations', () => {
};
const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
workflowsStore.cloneWorkflowObject = vi.fn().mockReturnValue(workflowObject);
nodeTypesStore.getNodeType = vi.fn(
(nodeTypeName: string) =>
@@ -1681,7 +1684,8 @@ describe('useCanvasOperations', () => {
};
const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
workflowsStore.cloneWorkflowObject = vi.fn().mockReturnValue(workflowObject);
nodeTypesStore.getNodeType = vi.fn(
(nodeTypeName: string) =>
({
@@ -1728,7 +1732,8 @@ describe('useCanvasOperations', () => {
};
const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
workflowsStore.cloneWorkflowObject = vi.fn().mockReturnValue(workflowObject);
const { isConnectionAllowed, editableWorkflowObject } = useCanvasOperations();
@@ -1779,7 +1784,8 @@ describe('useCanvasOperations', () => {
};
const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
workflowsStore.cloneWorkflowObject = vi.fn().mockReturnValue(workflowObject);
const { isConnectionAllowed, editableWorkflowObject } = useCanvasOperations();
@@ -1839,7 +1845,8 @@ describe('useCanvasOperations', () => {
};
const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
workflowsStore.cloneWorkflowObject = vi.fn().mockReturnValue(workflowObject);
const { isConnectionAllowed, editableWorkflowObject } = useCanvasOperations();
@@ -1899,7 +1906,8 @@ describe('useCanvasOperations', () => {
};
const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
workflowsStore.cloneWorkflowObject = vi.fn().mockReturnValue(workflowObject);
const { isConnectionAllowed, editableWorkflowObject } = useCanvasOperations();
@@ -1959,7 +1967,8 @@ describe('useCanvasOperations', () => {
};
const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
workflowsStore.cloneWorkflowObject = vi.fn().mockReturnValue(workflowObject);
const { isConnectionAllowed, editableWorkflowObject } = useCanvasOperations();
@@ -2020,7 +2029,8 @@ describe('useCanvasOperations', () => {
};
const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
workflowsStore.cloneWorkflowObject = vi.fn().mockReturnValue(workflowObject);
const { isConnectionAllowed, editableWorkflowObject } = useCanvasOperations();
@@ -2078,7 +2088,8 @@ describe('useCanvasOperations', () => {
};
const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
workflowsStore.cloneWorkflowObject = vi.fn().mockReturnValue(workflowObject);
const { isConnectionAllowed, editableWorkflowObject } = useCanvasOperations();
@@ -2121,7 +2132,7 @@ describe('useCanvasOperations', () => {
};
const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
const { isConnectionAllowed, editableWorkflowObject } = useCanvasOperations();
@@ -2294,7 +2305,7 @@ describe('useCanvasOperations', () => {
.mockReturnValueOnce(sourceNodeType);
const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
const { revalidateNodeInputConnections } = useCanvasOperations();
revalidateNodeInputConnections(targetNodeId);
@@ -2358,7 +2369,7 @@ describe('useCanvasOperations', () => {
.mockReturnValueOnce(sourceNodeType);
const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
const { revalidateNodeInputConnections } = useCanvasOperations();
revalidateNodeInputConnections(targetNodeId);
@@ -2443,7 +2454,7 @@ describe('useCanvasOperations', () => {
.mockReturnValueOnce(sourceNodeType);
const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
const { revalidateNodeOutputConnections } = useCanvasOperations();
revalidateNodeOutputConnections(sourceNodeId);
@@ -2507,7 +2518,7 @@ describe('useCanvasOperations', () => {
.mockReturnValueOnce(sourceNodeType);
const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
const { revalidateNodeOutputConnections } = useCanvasOperations();
revalidateNodeOutputConnections(sourceNodeId);
@@ -2659,13 +2670,13 @@ describe('useCanvasOperations', () => {
};
const nodes = buildImportNodes();
workflowsStore.workflow.nodes = nodes;
workflowsStore.setNodes(nodes);
workflowsStore.getNodesByIds.mockReturnValue(nodes);
workflowsStore.outgoingConnectionsByNodeName.mockReturnValue({});
const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.getWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
workflowsStore.createWorkflowObject.mockReturnValue(workflowObject);
const canvasOperations = useCanvasOperations();
const duplicatedNodeIds = await canvasOperations.duplicateNodes(['1', '2']);
@@ -3176,7 +3187,7 @@ describe('useCanvasOperations', () => {
// Mock store methods
const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
workflowsStore.getNodeById.mockImplementation(
(id: string) =>
({
@@ -3246,7 +3257,7 @@ describe('useCanvasOperations', () => {
// Mock store methods
const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
workflowsStore.getNodeById.mockImplementation(
(id: string) =>
({
@@ -3300,7 +3311,7 @@ describe('useCanvasOperations', () => {
};
const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
workflowsStore.getNodeById.mockReturnValue(nodeB);
workflowsStore.outgoingConnectionsByNodeName.mockReturnValue({
main: [[{ node: nodeC.name, type: NodeConnectionTypes.Main, index: 0 }]],
@@ -3328,7 +3339,7 @@ describe('useCanvasOperations', () => {
};
const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
workflowsStore.getNodeById.mockReturnValue(nodeB);
workflowsStore.outgoingConnectionsByNodeName.mockReturnValue({});
workflowsStore.incomingConnectionsByNodeName.mockReturnValue({
@@ -3354,7 +3365,7 @@ describe('useCanvasOperations', () => {
}));
const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
// Create nodes: A -> B (no outgoing from B)
const nodeA: IWorkflowTemplateNode = createTestNode({
@@ -3611,7 +3622,7 @@ describe('useCanvasOperations', () => {
});
it('should replace connections for a node and track history', () => {
const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
const { replaceNodeConnections } = useCanvasOperations();
replaceNodeConnections(targetNode.id, replacementNode.id, { trackHistory: true });
@@ -3709,7 +3720,7 @@ describe('useCanvasOperations', () => {
it('should replace connections without tracking history', () => {
const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
const { replaceNodeConnections } = useCanvasOperations();
replaceNodeConnections(targetNode.id, replacementNode.id, { trackHistory: false });
@@ -3722,7 +3733,7 @@ describe('useCanvasOperations', () => {
it('should not replace connections if previous node does not exist', () => {
const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
const { replaceNodeConnections } = useCanvasOperations();
replaceNodeConnections('nonexistent', replacementNode.id);
@@ -3733,7 +3744,7 @@ describe('useCanvasOperations', () => {
it('should not replace connections if new node does not exist', () => {
const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
const { replaceNodeConnections } = useCanvasOperations();
replaceNodeConnections(targetNode.id, 'nonexistent');
@@ -3744,7 +3755,7 @@ describe('useCanvasOperations', () => {
it('should respect replaceInputs being false', () => {
const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
const { replaceNodeConnections } = useCanvasOperations();
// nextNode only has an input connection
@@ -3759,7 +3770,7 @@ describe('useCanvasOperations', () => {
it('should respect replaceOutputs being false', () => {
const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
const { replaceNodeConnections } = useCanvasOperations();
// sourceNode only has an output connection
@@ -3833,7 +3844,7 @@ describe('useCanvasOperations', () => {
});
const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
workflowsStore.workflowObject = workflowObject;
const { replaceNodeConnections } = useCanvasOperations();
replaceNodeConnections(previousNode1.id, newNode1.id, {

24
packages/frontend/editor-ui/src/composables/useCanvasOperations.ts
View File

@@ -171,8 +171,8 @@ export function useCanvasOperations() {
const preventOpeningNDV = !!localStorage.getItem('NodeView.preventOpeningNDV');
const editableWorkflow = computed(() => workflowsStore.workflow);
const editableWorkflowObject = computed(() => workflowsStore.getCurrentWorkflow());
const editableWorkflow = computed<IWorkflowDb>(() => workflowsStore.workflow);
const editableWorkflowObject = computed(() => workflowsStore.workflowObject as Workflow);
const triggerNodes = computed<INodeUi[]>(() => {
return workflowsStore.workflowTriggerNodes;
@@ -298,7 +298,7 @@ export function useCanvasOperations() {
newName = uniqueNodeName(newName);
// Rename the node and update the connections
const workflow = workflowsStore.getCurrentWorkflow(true);
const workflow = workflowsStore.cloneWorkflowObject();
try {
workflow.renameNode(currentName, newName);
} catch (error) {
@@ -477,17 +477,17 @@ export function useCanvasOperations() {
if (!previousNode || !newNode) {
return;
}
const wf = workflowsStore.getCurrentWorkflow();
const workflowObject = workflowsStore.workflowObject;
const inputNodeNames = replaceInputs
? uniq(wf.getParentNodes(previousNode.name, 'main', 1))
? uniq(workflowObject.getParentNodes(previousNode.name, 'main', 1))
: [];
const outputNodeNames = replaceOutputs
? uniq(wf.getChildNodes(previousNode.name, 'main', 1))
? uniq(workflowObject.getChildNodes(previousNode.name, 'main', 1))
: [];
const connectionPairs = [
...wf.getConnectionsBetweenNodes(inputNodeNames, [previousNode.name]),
...wf.getConnectionsBetweenNodes([previousNode.name], outputNodeNames),
...workflowObject.getConnectionsBetweenNodes(inputNodeNames, [previousNode.name]),
...workflowObject.getConnectionsBetweenNodes([previousNode.name], outputNodeNames),
];
if (trackHistory && trackBulk) {
@@ -1768,7 +1768,7 @@ export function useCanvasOperations() {
// Create a workflow with the new nodes and connections that we can use
// the rename method
const tempWorkflow: Workflow = workflowsStore.getWorkflow(createNodes, newConnections);
const tempWorkflow: Workflow = workflowsStore.createWorkflowObject(createNodes, newConnections);
// Rename all the nodes of which the name changed
for (oldName in nodeNameTable) {
@@ -1875,7 +1875,7 @@ export function useCanvasOperations() {
// Generate new webhookId if workflow already contains a node with the same webhookId
if (node.webhookId && UPDATE_WEBHOOK_ID_NODE_TYPES.includes(node.type)) {
const isDuplicate = Object.values(workflowHelpers.getCurrentWorkflow().nodes).some(
const isDuplicate = Object.values(workflowsStore.workflowObject.nodes).some(
(n) => n.webhookId === node.webhookId,
);
if (isDuplicate) {
@@ -2187,12 +2187,12 @@ export function useCanvasOperations() {
return;
}
const workflow = workflowsStore.getCurrentWorkflow();
const workflowObject = workflowsStore.workflowObject; // @TODO Check if we actually need workflowObject here
logsStore.toggleOpen(true);
const payload = {
workflow_id: workflow.id,
workflow_id: workflowObject.id,
button_type: source,
};

4
packages/frontend/editor-ui/src/composables/useContextMenu.test.ts
View File

@@ -43,12 +43,12 @@ describe('useContextMenu', () => {
workflowsStore = useWorkflowsStore();
workflowsStore.workflow.nodes = nodes;
workflowsStore.workflow.scopes = ['workflow:update'];
vi.spyOn(workflowsStore, 'getCurrentWorkflow').mockReturnValue({
workflowsStore.workflowObject = {
nodes,
getNode: (_: string) => {
return {};
},
} as never);
} as never;
vi.spyOn(NodeHelpers, 'getNodeInputs').mockReturnValue([]);
vi.spyOn(NodeHelpers, 'isExecutable').mockReturnValue(true);

9
packages/frontend/editor-ui/src/composables/useContextMenu.ts
View File

@@ -4,7 +4,7 @@ import { useNodeTypesStore } from '@/stores/nodeTypes.store';
import { useSourceControlStore } from '@/stores/sourceControl.store';
import { useUIStore } from '@/stores/ui.store';
import { useWorkflowsStore } from '@/stores/workflows.store';
import type { INode, INodeTypeDescription } from 'n8n-workflow';
import type { INode, INodeTypeDescription, Workflow } from 'n8n-workflow';
import { NodeHelpers } from 'n8n-workflow';
import { computed, ref, watch } from 'vue';
import { getMousePosition } from '../utils/nodeViewUtils';
@@ -50,6 +50,8 @@ export const useContextMenu = (onAction: ContextMenuActionCallback = () => {}) =
const sourceControlStore = useSourceControlStore();
const i18n = useI18n();
const workflowObject = computed(() => workflowsStore.workflowObject as Workflow);
const workflowPermissions = computed(
() => getResourcePermissions(workflowsStore.workflow.scopes).workflow,
);
@@ -108,13 +110,12 @@ export const useContextMenu = (onAction: ContextMenuActionCallback = () => {}) =
};
const isExecutable = (node: INodeUi) => {
const currentWorkflow = workflowsStore.getCurrentWorkflow();
const workflowNode = currentWorkflow.getNode(node.name) as INode;
const workflowNode = workflowObject.value.getNode(node.name) as INode;
const nodeType = nodeTypesStore.getNodeType(
workflowNode.type,
workflowNode.typeVersion,
) as INodeTypeDescription;
return NodeHelpers.isExecutable(currentWorkflow, workflowNode, nodeType);
return NodeHelpers.isExecutable(workflowObject.value, workflowNode, nodeType);
};
const open = (event: MouseEvent, menuTarget: ContextMenuTarget) => {

12
packages/frontend/editor-ui/src/composables/useExecutionDebugging.test.ts
View File

@@ -40,10 +40,10 @@ describe('useExecutionDebugging()', () => {
const workflowStore = mockedStore(useWorkflowsStore);
workflowStore.getNodes.mockReturnValue([{ name: 'testNode' }] as INodeUi[]);
workflowStore.getExecution.mockResolvedValueOnce(mockExecution);
workflowStore.getCurrentWorkflow.mockReturnValue({
workflowStore.workflowObject = {
pinData: {},
getParentNodes: vi.fn().mockReturnValue([]),
} as unknown as Workflow);
} as unknown as Workflow;
await expect(executionDebugging.applyExecutionData('1')).resolves.not.toThrowError();
});
@@ -66,10 +66,10 @@ describe('useExecutionDebugging()', () => {
const workflowStore = mockedStore(useWorkflowsStore);
workflowStore.getNodes.mockReturnValue([{ name: 'testNode2' }] as INodeUi[]);
workflowStore.getExecution.mockResolvedValueOnce(mockExecution);
workflowStore.getCurrentWorkflow.mockReturnValue({
workflowStore.workflowObject = {
pinData: {},
getParentNodes: vi.fn().mockReturnValue([]),
} as unknown as Workflow);
} as unknown as Workflow;
await executionDebugging.applyExecutionData('1');
@@ -96,10 +96,10 @@ describe('useExecutionDebugging()', () => {
const workflowStore = mockedStore(useWorkflowsStore);
workflowStore.getNodes.mockReturnValue([{ name: 'testNode' }] as INodeUi[]);
workflowStore.getExecution.mockResolvedValueOnce(mockExecution);
workflowStore.getCurrentWorkflow.mockReturnValue({
workflowStore.workflowObject = {
pinData: {},
getParentNodes: vi.fn().mockReturnValue([]),
} as unknown as Workflow);
} as unknown as Workflow;
await executionDebugging.applyExecutionData('1');

6
packages/frontend/editor-ui/src/composables/useExecutionDebugging.ts
View File

@@ -38,7 +38,7 @@ export const useExecutionDebugging = () => {
const applyExecutionData = async (executionId: string): Promise<void> => {
const execution = await workflowsStore.getExecution(executionId);
const workflow = workflowsStore.getCurrentWorkflow();
const workflowObject = workflowsStore.workflowObject;
const workflowNodes = workflowsStore.getNodes();
if (!execution?.data?.resultData) {
@@ -91,7 +91,7 @@ export const useExecutionDebugging = () => {
} else {
await router.push({
name: VIEWS.EXECUTION_PREVIEW,
params: { name: workflow.id, executionId },
params: { name: workflowObject.id, executionId },
});
return;
}
@@ -103,7 +103,7 @@ export const useExecutionDebugging = () => {
// Pin data of all nodes which do not have a parent node
const pinnableNodes = workflowNodes.filter(
(node: INodeUi) => !workflow.getParentNodes(node.name).length,
(node: INodeUi) => !workflowObject.getParentNodes(node.name).length,
);
let pinnings = 0;

36
packages/frontend/editor-ui/src/composables/useNodeHelpers.test.ts
View File

@@ -48,12 +48,12 @@ describe('useNodeHelpers()', () => {
parameters: {},
};
const mockWorkflow = {
const mockWorkflow = mock<Workflow>({
id: 'workflow-id',
getNode: () => node,
};
});
mockedStore(useWorkflowsStore).getCurrentWorkflow = vi.fn().mockReturnValue(mockWorkflow);
mockedStore(useWorkflowsStore).workflowObject = mockWorkflow;
mockedStore(useNodeTypesStore).getNodeType = vi.fn().mockReturnValue({});
mockedStore(useNodeTypesStore).isTriggerNode = vi.fn().mockReturnValue(false);
mockedStore(useNodeTypesStore).isToolNode = vi.fn().mockReturnValue(false);
@@ -76,11 +76,11 @@ describe('useNodeHelpers()', () => {
parameters: {},
};
const mockWorkflow = {
const mockWorkflow = mock<Workflow>({
getNode: () => node,
};
});
mockedStore(useWorkflowsStore).getCurrentWorkflow = vi.fn().mockReturnValue(mockWorkflow);
mockedStore(useWorkflowsStore).workflowObject = mockWorkflow;
mockedStore(useNodeTypesStore).getNodeType = vi.fn().mockReturnValue({});
mockedStore(useNodeTypesStore).isTriggerNode = vi.fn().mockReturnValue(false);
mockedStore(useNodeTypesStore).isToolNode = vi.fn().mockReturnValue(false);
@@ -103,11 +103,11 @@ describe('useNodeHelpers()', () => {
parameters: {},
};
const mockWorkflow = {
const mockWorkflow = mock<Workflow>({
getNode: () => node,
};
});
mockedStore(useWorkflowsStore).getCurrentWorkflow = vi.fn().mockReturnValue(mockWorkflow);
mockedStore(useWorkflowsStore).workflowObject = mockWorkflow;
mockedStore(useNodeTypesStore).getNodeType = vi.fn().mockReturnValue({});
mockedStore(useNodeTypesStore).isTriggerNode = vi.fn().mockReturnValue(false);
mockedStore(useNodeTypesStore).isToolNode = vi.fn().mockReturnValue(false);
@@ -130,11 +130,11 @@ describe('useNodeHelpers()', () => {
parameters: {},
};
const mockWorkflow = {
const mockWorkflow = mock<Workflow>({
getNode: () => triggerNode,
};
});
mockedStore(useWorkflowsStore).getCurrentWorkflow = vi.fn().mockReturnValue(mockWorkflow);
mockedStore(useWorkflowsStore).workflowObject = mockWorkflow;
mockedStore(useNodeTypesStore).getNodeType = vi.fn().mockReturnValue({});
mockedStore(useNodeTypesStore).isTriggerNode = vi.fn().mockReturnValue(true);
mockedStore(useNodeTypesStore).isToolNode = vi.fn().mockReturnValue(false);
@@ -157,11 +157,11 @@ describe('useNodeHelpers()', () => {
parameters: {},
};
const mockWorkflow = {
const mockWorkflow = mock<Workflow>({
getNode: () => toolNode,
};
});
mockedStore(useWorkflowsStore).getCurrentWorkflow = vi.fn().mockReturnValue(mockWorkflow);
mockedStore(useWorkflowsStore).workflowObject = mockWorkflow;
mockedStore(useNodeTypesStore).getNodeType = vi.fn().mockReturnValue({});
mockedStore(useNodeTypesStore).isTriggerNode = vi.fn().mockReturnValue(false);
mockedStore(useNodeTypesStore).isToolNode = vi.fn().mockReturnValue(true);
@@ -184,11 +184,11 @@ describe('useNodeHelpers()', () => {
parameters: {},
};
const mockWorkflow = {
const mockWorkflow = mock<Workflow>({
getNode: () => node,
};
});
mockedStore(useWorkflowsStore).getCurrentWorkflow = vi.fn().mockReturnValue(mockWorkflow);
mockedStore(useWorkflowsStore).workflowObject = mockWorkflow;
mockedStore(useNodeTypesStore).getNodeType = vi.fn().mockReturnValue({});
mockedStore(useNodeTypesStore).isTriggerNode = vi.fn().mockReturnValue(false);
mockedStore(useNodeTypesStore).isToolNode = vi.fn().mockReturnValue(false);

12
packages/frontend/editor-ui/src/composables/useNodeHelpers.ts
View File

@@ -1,4 +1,4 @@
import { ref } from 'vue';
import { ref, computed } from 'vue';
import { useHistoryStore } from '@/stores/history.store';
import {
CUSTOM_API_CALL_KEY,
@@ -76,6 +76,8 @@ export function useNodeHelpers() {
const isProductionExecutionPreview = ref(false);
const pullConnActiveNodeName = ref<string | null>(null);
const workflowObject = computed(() => workflowsStore.workflowObject as Workflow);
function hasProxyAuth(node: INodeUi): boolean {
return Object.keys(node.parameters).includes('nodeCredentialType');
}
@@ -117,14 +119,13 @@ export function useNodeHelpers() {
): boolean {
const nodeType = node ? nodeTypesStore.getNodeType(node.type, node.typeVersion) : null;
if (node && nodeType) {
const currentWorkflowInstance = workflowsStore.getCurrentWorkflow();
const workflowNode = currentWorkflowInstance.getNode(node.name);
const workflowNode = workflowObject.value.getNode(node.name);
const isTriggerNode = !!node && nodeTypesStore.isTriggerNode(node.type);
const isToolNode = !!node && nodeTypesStore.isToolNode(node.type);
if (workflowNode) {
const inputs = NodeHelpers.getNodeInputs(currentWorkflowInstance, workflowNode, nodeType);
const inputs = NodeHelpers.getNodeInputs(workflowObject.value, workflowNode, nodeType);
const inputNames = NodeHelpers.getConnectionTypes(inputs);
if (!inputNames.includes(NodeConnectionTypes.Main) && !isToolNode && !isTriggerNode) {
@@ -279,8 +280,7 @@ export function useNodeHelpers() {
return;
}
const workflow = workflowsStore.getCurrentWorkflow();
const nodeInputIssues = getNodeInputIssues(workflow, node, nodeType);
const nodeInputIssues = getNodeInputIssues(workflowObject.value, node, nodeType);
workflowsStore.setNodeIssue({
node: node.name,

2
packages/frontend/editor-ui/src/composables/useNodeSettingsParameters.ts
View File

@@ -126,7 +126,7 @@ export function useNodeSettingsParameters() {
const updatedConnections = updateDynamicConnections(node, connections, parameterData);
if (updatedConnections) {
workflowsStore.setConnections(updatedConnections, true);
workflowsStore.setConnections(updatedConnections);
}
workflowsStore.setNodeParameters(updateInformation);

13
packages/frontend/editor-ui/src/composables/usePinnedData.ts
View File

@@ -1,6 +1,6 @@
import { useToast } from '@/composables/useToast';
import { useI18n } from '@n8n/i18n';
import type { INodeExecutionData, IPinData } from 'n8n-workflow';
import type { INodeExecutionData, IPinData, Workflow } from 'n8n-workflow';
import { jsonParse, jsonStringify, NodeConnectionTypes, NodeHelpers } from 'n8n-workflow';
import {
MAX_EXPECTED_REQUEST_SIZE,
@@ -51,6 +51,8 @@ export function usePinnedData(
const externalHooks = useExternalHooks();
const { getInputDataWithPinned } = useDataSchema();
const workflowObject = computed(() => workflowsStore.workflowObject as Workflow);
const { isSubNodeType, isMultipleOutputsNodeType } = useNodeType({
node,
});
@@ -84,9 +86,8 @@ export function usePinnedData(
if (!nodeType || (checkDataEmpty && dataToPin.length === 0)) return false;
const workflow = workflowsStore.getCurrentWorkflow();
const outputs = NodeHelpers.getNodeOutputs(workflow, targetNode, nodeType).map((output) =>
typeof output === 'string' ? { type: output } : output,
const outputs = NodeHelpers.getNodeOutputs(workflowObject.value, targetNode, nodeType).map(
(output) => (typeof output === 'string' ? { type: output } : output),
);
const mainOutputs = outputs.filter(
@@ -163,8 +164,8 @@ export function usePinnedData(
if (typeof data === 'object') data = JSON.stringify(data);
const { pinData: currentPinData, ...workflow } = workflowsStore.getCurrentWorkflow();
const workflowJson = jsonStringify(workflow, { replaceCircularRefs: true });
const { pinData: currentPinData, ...workflowObjectWithoutPinData } = workflowObject.value;
const workflowJson = jsonStringify(workflowObjectWithoutPinData, { replaceCircularRefs: true });
const newPinData = { ...currentPinData, [targetNode.name]: data };
const newPinDataSize = workflowsStore.getPinDataSize(newPinData);

6
packages/frontend/editor-ui/src/composables/usePushConnection/handlers/executionFinished.ts
View File

@@ -251,7 +251,7 @@ export function handleExecutionFinishedWithWaitTill(options: {
const settingsStore = useSettingsStore();
const workflowSaving = useWorkflowSaving(options);
const workflowHelpers = useWorkflowHelpers();
const workflowObject = workflowsStore.getCurrentWorkflow();
const workflowObject = workflowsStore.workflowObject;
const workflowSettings = workflowsStore.workflowSettings;
const saveManualExecutions =
@@ -285,7 +285,7 @@ export function handleExecutionFinishedWithErrorOrCanceled(
const telemetry = useTelemetry();
const workflowsStore = useWorkflowsStore();
const workflowHelpers = useWorkflowHelpers();
const workflowObject = workflowsStore.getCurrentWorkflow();
const workflowObject = workflowsStore.workflowObject;
workflowHelpers.setDocumentTitle(workflowObject.name as string, 'ERROR');
@@ -375,7 +375,7 @@ export function handleExecutionFinishedWithOther(successToastAlreadyShown: boole
const i18n = useI18n();
const workflowHelpers = useWorkflowHelpers();
const nodeTypesStore = useNodeTypesStore();
const workflowObject = workflowsStore.getCurrentWorkflow();
const workflowObject = workflowsStore.workflowObject;
workflowHelpers.setDocumentTitle(workflowObject.name as string, 'IDLE');

71
packages/frontend/editor-ui/src/composables/useRunWorkflow.test.ts
View File

@@ -43,7 +43,7 @@ vi.mock('@/stores/workflows.store', () => {
previousExecutionId: undefined,
nodesIssuesExist: false,
executionWaitingForWebhook: false,
getCurrentWorkflow: vi.fn().mockReturnValue({ id: '123' }),
workflowObject: { id: '123' } as Workflow,
getNodeByName: vi
.fn()
.mockImplementation((name) =>
@@ -108,7 +108,6 @@ vi.mock('@/composables/useToast', () => ({
vi.mock('@/composables/useWorkflowHelpers', () => ({
useWorkflowHelpers: vi.fn().mockReturnValue({
getCurrentWorkflow: vi.fn(),
saveCurrentWorkflow: vi.fn(),
getWorkflowDataToSave: vi.fn(),
setDocumentTitle: vi.fn(),
@@ -286,9 +285,9 @@ describe('useRunWorkflow({ router })', () => {
const mockExecutionResponse = { executionId: '123' };
vi.mocked(uiStore).activeActions = [''];
vi.mocked(workflowHelpers).getCurrentWorkflow.mockReturnValue({
vi.mocked(workflowsStore).workflowObject = {
name: 'Test Workflow',
} as unknown as Workflow);
} as unknown as Workflow;
vi.mocked(workflowsStore).runWorkflow.mockResolvedValue(mockExecutionResponse);
vi.mocked(workflowsStore).nodesIssuesExist = true;
vi.mocked(workflowsStore).getWorkflowRunData = {
@@ -333,9 +332,9 @@ describe('useRunWorkflow({ router })', () => {
],
} as unknown as WorkflowData);
vi.mocked(uiStore).activeActions = [''];
vi.mocked(workflowHelpers).getCurrentWorkflow.mockReturnValue({
vi.mocked(workflowsStore).workflowObject = {
name: 'Test Workflow',
} as unknown as Workflow);
} as unknown as Workflow;
vi.mocked(workflowsStore).runWorkflow.mockResolvedValue(mockExecutionResponse);
vi.mocked(workflowsStore).nodesIssuesExist = true;
vi.mocked(workflowsStore).getWorkflowRunData = { NodeName: [] };
@@ -380,9 +379,9 @@ describe('useRunWorkflow({ router })', () => {
],
} as unknown as WorkflowData);
vi.mocked(uiStore).activeActions = [''];
vi.mocked(workflowHelpers).getCurrentWorkflow.mockReturnValue({
vi.mocked(workflowsStore).workflowObject = {
name: 'Test Workflow',
} as unknown as Workflow);
} as unknown as Workflow;
vi.mocked(workflowsStore).runWorkflow.mockResolvedValue(mockExecutionResponse);
vi.mocked(workflowsStore).nodesIssuesExist = true;
vi.mocked(workflowsStore).getWorkflowRunData = { NodeName: [] };
@@ -413,9 +412,9 @@ describe('useRunWorkflow({ router })', () => {
const { runWorkflow } = useRunWorkflow({ router });
vi.mocked(uiStore).activeActions = [''];
vi.mocked(workflowHelpers).getCurrentWorkflow.mockReturnValue({
vi.mocked(workflowsStore).workflowObject = {
name: 'Test Workflow',
} as unknown as Workflow);
} as unknown as Workflow;
vi.mocked(workflowsStore).runWorkflow.mockResolvedValue(mockExecutionResponse);
vi.mocked(workflowsStore).nodesIssuesExist = true;
vi.mocked(workflowHelpers).getWorkflowDataToSave.mockResolvedValue({
@@ -437,9 +436,9 @@ describe('useRunWorkflow({ router })', () => {
vi.mocked(pushConnectionStore).isConnected = true;
vi.mocked(workflowsStore).runWorkflow.mockResolvedValue(mockExecutionResponse);
vi.mocked(workflowsStore).nodesIssuesExist = false;
vi.mocked(workflowHelpers).getCurrentWorkflow.mockReturnValue({
vi.mocked(workflowsStore).workflowObject = {
name: 'Test Workflow',
} as Workflow);
} as Workflow;
vi.mocked(workflowHelpers).getWorkflowDataToSave.mockResolvedValue({
id: 'workflowId',
nodes: [],
@@ -480,7 +479,7 @@ describe('useRunWorkflow({ router })', () => {
vi.mocked(pushConnectionStore).isConnected = true;
vi.mocked(workflowsStore).runWorkflow.mockResolvedValue(mockExecutionResponse);
vi.mocked(workflowsStore).nodesIssuesExist = false;
vi.mocked(workflowHelpers).getCurrentWorkflow.mockReturnValue(workflow);
vi.mocked(workflowsStore).workflowObject = workflow;
vi.mocked(workflowHelpers).getWorkflowDataToSave.mockResolvedValue({
id: 'workflowId',
nodes: [],
@@ -551,11 +550,11 @@ describe('useRunWorkflow({ router })', () => {
},
],
};
vi.mocked(workflowHelpers).getCurrentWorkflow.mockReturnValue({
vi.mocked(workflowsStore).workflowObject = {
name: 'Test Workflow',
getParentNodes: () => [parentName],
nodes: { [parentName]: {} },
} as unknown as Workflow);
} as unknown as Workflow;
vi.mocked(workflowHelpers).getWorkflowDataToSave.mockResolvedValue({
nodes: [],
} as unknown as WorkflowData);
@@ -585,9 +584,9 @@ describe('useRunWorkflow({ router })', () => {
const composable = useRunWorkflow({ router });
const triggerNode = 'Chat Trigger';
const nodeData = mock<ITaskData>();
vi.mocked(workflowHelpers).getCurrentWorkflow.mockReturnValue(
mock<Workflow>({ getChildNodes: vi.fn().mockReturnValue([]) }),
);
vi.mocked(workflowsStore).workflowObject = mock<Workflow>({
getChildNodes: vi.fn().mockReturnValue([]),
});
vi.mocked(workflowHelpers).getWorkflowDataToSave.mockResolvedValue(
mock<WorkflowData>({ nodes: [] }),
);
@@ -614,11 +613,9 @@ describe('useRunWorkflow({ router })', () => {
const composable = useRunWorkflow({ router });
const triggerNode = 'Chat Trigger';
const nodeData = mock<ITaskData>();
vi.mocked(workflowHelpers).getCurrentWorkflow.mockReturnValue(
mock<Workflow>({
getChildNodes: vi.fn().mockReturnValue([{ name: 'Child node', type: 'nodes.child' }]),
}),
);
vi.mocked(workflowsStore).workflowObject = mock<Workflow>({
getChildNodes: vi.fn().mockReturnValue([{ name: 'Child node', type: 'nodes.child' }]),
});
vi.mocked(workflowHelpers).getWorkflowDataToSave.mockResolvedValue(
mock<WorkflowData>({ nodes: [] }),
);
@@ -653,11 +650,9 @@ describe('useRunWorkflow({ router })', () => {
const composable = useRunWorkflow({ router });
const triggerNode = 'Chat Trigger';
const nodeData = mock<ITaskData>();
vi.mocked(workflowHelpers).getCurrentWorkflow.mockReturnValue(
mock<Workflow>({
getChildNodes: vi.fn().mockReturnValue([{ name: 'Child node', type: 'nodes.child' }]),
}),
);
vi.mocked(workflowsStore).workflowObject = mock<Workflow>({
getChildNodes: vi.fn().mockReturnValue([{ name: 'Child node', type: 'nodes.child' }]),
});
vi.mocked(workflowHelpers).getWorkflowDataToSave.mockResolvedValue(
mock<WorkflowData>({ nodes: [] }),
);
@@ -683,9 +678,9 @@ describe('useRunWorkflow({ router })', () => {
// ARRANGE
const { runWorkflow } = useRunWorkflow({ router });
const triggerNode = 'Chat Trigger';
vi.mocked(workflowHelpers).getCurrentWorkflow.mockReturnValue(
mock<Workflow>({ getChildNodes: vi.fn().mockReturnValue([]) }),
);
vi.mocked(workflowsStore).workflowObject = mock<Workflow>({
getChildNodes: vi.fn().mockReturnValue([]),
});
vi.mocked(workflowHelpers).getWorkflowDataToSave.mockResolvedValue(
mock<WorkflowData>({ nodes: [] }),
);
@@ -716,7 +711,7 @@ describe('useRunWorkflow({ router })', () => {
vi.mocked(pushConnectionStore).isConnected = true;
vi.mocked(workflowsStore).runWorkflow.mockResolvedValue(mockExecutionResponse);
vi.mocked(workflowsStore).nodesIssuesExist = false;
vi.mocked(workflowHelpers).getCurrentWorkflow.mockReturnValue(workflow);
vi.mocked(workflowsStore).workflowObject = workflow;
vi.mocked(workflowHelpers).getWorkflowDataToSave.mockResolvedValue(
mock<WorkflowData>({ id: 'workflowId', nodes: [] }),
);
@@ -782,7 +777,7 @@ describe('useRunWorkflow({ router })', () => {
vi.mocked(pushConnectionStore).isConnected = true;
vi.mocked(workflowsStore).runWorkflow.mockResolvedValue(mockExecutionResponse);
vi.mocked(workflowsStore).nodesIssuesExist = false;
vi.mocked(workflowHelpers).getCurrentWorkflow.mockReturnValue(workflow);
vi.mocked(workflowsStore).workflowObject = workflow;
vi.mocked(workflowHelpers).getWorkflowDataToSave.mockResolvedValue(workflowData);
vi.mocked(workflowsStore).getWorkflowRunData = mockRunData;
vi.mocked(agentRequestStore).getAgentRequest.mockReturnValue(agentRequest);
@@ -829,7 +824,7 @@ describe('useRunWorkflow({ router })', () => {
vi.mocked(pushConnectionStore).isConnected = true;
vi.mocked(workflowsStore).runWorkflow.mockResolvedValue(mockExecutionResponse);
vi.mocked(workflowsStore).nodesIssuesExist = false;
vi.mocked(workflowHelpers).getCurrentWorkflow.mockReturnValue(workflow);
vi.mocked(workflowsStore).workflowObject = workflow;
vi.mocked(workflowHelpers).getWorkflowDataToSave.mockResolvedValue(
mock<WorkflowData>({ id: 'workflowId', nodes: [] }),
);
@@ -858,7 +853,7 @@ describe('useRunWorkflow({ router })', () => {
vi.mocked(pushConnectionStore).isConnected = true;
vi.mocked(workflowsStore).runWorkflow.mockResolvedValue(mockExecutionResponse);
vi.mocked(workflowsStore).nodesIssuesExist = false;
vi.mocked(workflowHelpers).getCurrentWorkflow.mockReturnValue(workflow);
vi.mocked(workflowsStore).workflowObject = workflow;
vi.mocked(workflowHelpers).getWorkflowDataToSave.mockResolvedValue(
mock<WorkflowData>({ id: 'workflowId', nodes: [] }),
);
@@ -878,7 +873,7 @@ describe('useRunWorkflow({ router })', () => {
const { runWorkflow } = useRunWorkflow({ router });
const workflow = mock<Workflow>({ name: 'Test Workflow' });
vi.mocked(workflowHelpers).getCurrentWorkflow.mockReturnValue(workflow);
vi.mocked(workflowsStore).workflowObject = workflow;
vi.mocked(workflowHelpers).getWorkflowDataToSave.mockResolvedValue({
id: workflow.id,
nodes: [],
@@ -1002,9 +997,9 @@ describe('useRunWorkflow({ router })', () => {
it('should invoke runWorkflow with expected arguments', async () => {
const runWorkflowComposable = useRunWorkflow({ router });
vi.mocked(workflowHelpers).getCurrentWorkflow.mockReturnValue({
vi.mocked(workflowsStore).workflowObject = {
id: 'workflowId',
} as unknown as Workflow);
} as unknown as Workflow;
vi.mocked(workflowHelpers).getWorkflowDataToSave.mockResolvedValue({
id: 'workflowId',
nodes: [],

35
packages/frontend/editor-ui/src/composables/useRunWorkflow.ts
View File

@@ -45,6 +45,7 @@ import { useNodeDirtiness } from '@/composables/useNodeDirtiness';
import { useCanvasOperations } from './useCanvasOperations';
import { useAgentRequestStore } from '@n8n/stores/useAgentRequestStore';
import { useWorkflowSaving } from './useWorkflowSaving';
import { computed } from 'vue';
export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof useRouter> }) {
const nodeHelpers = useNodeHelpers();
@@ -64,6 +65,8 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
const { dirtinessByName } = useNodeDirtiness();
const { startChat } = useCanvasOperations();
const workflowObject = computed(() => workflowsStore.workflowObject as Workflow);
function sortNodesByYPosition(nodes: string[]) {
return [...nodes].sort((a, b) => {
const nodeA = workflowsStore.getNodeByName(a)?.position ?? [0, 0];
@@ -128,15 +131,13 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
return;
}
const workflow = workflowHelpers.getCurrentWorkflow();
toast.clearAllStickyNotifications();
try {
// Get the direct parents of the node
let directParentNodes: string[] = [];
if (options.destinationNode !== undefined) {
directParentNodes = workflow.getParentNodes(
directParentNodes = workflowObject.value.getParentNodes(
options.destinationNode,
NodeConnectionTypes.Main,
-1,
@@ -155,7 +156,7 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
directParentNodes,
runData,
workflowData.pinData,
workflow,
workflowObject.value,
);
const { startNodeNames } = consolidatedData;
@@ -177,7 +178,7 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
} else if (options.triggerNode && options.nodeData && !options.rerunTriggerNode) {
// starts execution from downstream nodes of trigger node
startNodeNames.push(
...workflow.getChildNodes(options.triggerNode, NodeConnectionTypes.Main, 1),
...workflowObject.value.getChildNodes(options.triggerNode, NodeConnectionTypes.Main, 1),
);
newRunData = { [options.triggerNode]: [options.nodeData] };
executedNode = options.triggerNode;
@@ -199,7 +200,7 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
destinationNodeType === CHAT_TRIGGER_NODE_TYPE) &&
options.source !== 'RunData.ManualChatMessage'
) {
const startNode = workflow.getStartNode(options.destinationNode);
const startNode = workflowObject.value.getStartNode(options.destinationNode);
if (startNode && startNode.type === CHAT_TRIGGER_NODE_TYPE) {
// Check if the chat node has input data or pin data
const chatHasInputData =
@@ -251,9 +252,13 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
// Find for each start node the source data
let sourceData = get(runData, [name, 0, 'source', 0], null);
if (sourceData === null) {
const parentNodes = workflow.getParentNodes(name, NodeConnectionTypes.Main, 1);
const parentNodes = workflowObject.value.getParentNodes(
name,
NodeConnectionTypes.Main,
1,
);
const executeData = workflowHelpers.executeData(
workflow.connectionsBySourceNode,
workflowObject.value.connectionsBySourceNode,
parentNodes,
name,
NodeConnectionTypes.Main,
@@ -322,8 +327,8 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
if ('destinationNode' in options) {
startRunData.destinationNode = options.destinationNode;
const nodeId = workflowsStore.getNodeByName(options.destinationNode as string)?.id;
if (workflow.id && nodeId && version === 2) {
const agentRequest = agentRequestStore.getAgentRequest(workflow.id, nodeId);
if (workflowObject.value.id && nodeId && version === 2) {
const agentRequest = agentRequestStore.getAgentRequest(workflowObject.value.id, nodeId);
if (agentRequest) {
startRunData.agentRequest = {
@@ -355,7 +360,7 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
createdAt: new Date(),
startedAt: new Date(),
stoppedAt: undefined,
workflowId: workflow.id,
workflowId: workflowObject.value.id,
executedNode,
triggerNode: triggerToStartFrom?.name,
data: {
@@ -377,7 +382,7 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
workflowsStore.setWorkflowExecutionData(executionData);
nodeHelpers.updateNodesExecutionIssues();
workflowHelpers.setDocumentTitle(workflow.name as string, 'EXECUTING');
workflowHelpers.setDocumentTitle(workflowObject.value.name as string, 'EXECUTING');
const runWorkflowApiResponse = await runWorkflowApi(startRunData);
const pinData = workflowData.pinData ?? {};
@@ -412,7 +417,7 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
return runWorkflowApiResponse;
} catch (error) {
workflowsStore.setWorkflowExecutionData(null);
workflowHelpers.setDocumentTitle(workflow.name as string, 'ERROR');
workflowHelpers.setDocumentTitle(workflowObject.value.name as string, 'ERROR');
toast.showError(error, i18n.baseText('workflowRun.showError.title'));
return undefined;
}
@@ -539,11 +544,9 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
}
async function runEntireWorkflow(source: 'node' | 'main', triggerNode?: string) {
const workflow = workflowHelpers.getCurrentWorkflow();
void workflowHelpers.getWorkflowDataToSave().then((workflowData) => {
const telemetryPayload = {
workflow_id: workflow.id,
workflow_id: workflowObject.value.id,
node_graph_string: JSON.stringify(
TelemetryHelpers.generateNodesGraph(
workflowData as IWorkflowBase,

24
packages/frontend/editor-ui/src/composables/useWorkflowExtraction.ts
View File

@@ -2,14 +2,17 @@ import { useWorkflowsStore } from '@/stores/workflows.store';
import {
buildAdjacencyList,
parseExtractableSubgraphSelection,
type ExtractableSubgraphData,
type ExtractableErrorResult,
extractReferencesInNodeExpressions,
type IConnections,
type INode,
EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE,
NodeHelpers,
} from 'n8n-workflow';
import type {
ExtractableSubgraphData,
ExtractableErrorResult,
IConnections,
INode,
Workflow,
} from 'n8n-workflow';
import { computed } from 'vue';
import { useToast } from './useToast';
import { useRouter } from 'vue-router';
@@ -44,6 +47,8 @@ export function useWorkflowExtraction() {
const adjacencyList = computed(() => buildAdjacencyList(workflowsStore.workflow.connections));
const workflowObject = computed(() => workflowsStore.workflowObject as Workflow);
function showError(message: string) {
toast.showMessage({
type: 'error',
@@ -309,7 +314,7 @@ export function useWorkflowExtraction() {
const nodeType = useNodeTypesStore().getNodeType(node.type, node.typeVersion);
if (!nodeType) return true; // invariant broken -> abort onto error path
const ios = getIOs(workflowsStore.getCurrentWorkflow(), node, nodeType);
const ios = getIOs(workflowObject.value, node, nodeType);
return (
ios.filter((x) => (typeof x === 'string' ? x === 'main' : x.type === 'main')).length <= 1
);
@@ -427,7 +432,6 @@ export function useWorkflowExtraction() {
) {
const { start, end } = selection;
const currentWorkflow = workflowsStore.getCurrentWorkflow();
const allNodeNames = workflowsStore.workflow.nodes.map((x) => x.name);
let startNodeName = 'Start';
@@ -438,16 +442,16 @@ export function useWorkflowExtraction() {
while (subGraphNames.includes(returnNodeName)) returnNodeName += '_1';
const directAfterEndNodeNames = end
? currentWorkflow
? workflowObject.value
.getChildNodes(end, 'main', 1)
.map((x) => currentWorkflow.getNode(x)?.name)
.map((x) => workflowObject.value.getNode(x)?.name)
.filter((x) => x !== undefined)
: [];
const allAfterEndNodes = end
? currentWorkflow
? workflowObject.value
.getChildNodes(end, 'ALL')
.map((x) => currentWorkflow.getNode(x))
.map((x) => workflowObject.value.getNode(x))
.filter((x) => x !== null)
: [];

34
packages/frontend/editor-ui/src/composables/useWorkflowHelpers.ts
View File

@@ -82,7 +82,7 @@ export function resolveParameter<T = IDataObject>(
if ('localResolve' in opts && opts.localResolve) {
return resolveParameterImpl(
parameter,
() => opts.workflow,
opts.workflow,
opts.connections,
opts.envVars,
opts.workflow.getNode(opts.nodeName),
@@ -102,7 +102,7 @@ export function resolveParameter<T = IDataObject>(
return resolveParameterImpl(
parameter,
workflowsStore.getCurrentWorkflow,
workflowsStore.workflowObject as Workflow,
workflowsStore.connectionsBySourceNode,
useEnvironmentsStore().variablesAsObject,
useNDVStore().activeNode,
@@ -116,7 +116,7 @@ export function resolveParameter<T = IDataObject>(
// TODO: move to separate file
function resolveParameterImpl<T = IDataObject>(
parameter: NodeParameterValue | INodeParameters | NodeParameterValue[] | INodeParameters[],
getContextWorkflow: () => Workflow,
workflowObject: Workflow,
connections: IConnections,
envVars: Record<string, string | boolean | number>,
ndvActiveNode: INodeUi | null,
@@ -127,8 +127,6 @@ function resolveParameterImpl<T = IDataObject>(
): T | null {
let itemIndex = opts?.targetItem?.itemIndex || 0;
const workflow = getContextWorkflow();
const additionalKeys: IWorkflowDataProxyAdditionalKeys = {
$execution: {
id: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
@@ -147,7 +145,7 @@ function resolveParameterImpl<T = IDataObject>(
if (opts.isForCredential) {
// node-less expression resolution
return workflow.expression.getParameterValue(
return workflowObject.expression.getParameterValue(
parameter,
null,
0,
@@ -165,18 +163,18 @@ function resolveParameterImpl<T = IDataObject>(
const inputName = NodeConnectionTypes.Main;
const activeNode = ndvActiveNode ?? workflow.getNode(opts.contextNodeName || '');
const activeNode = ndvActiveNode ?? workflowObject.getNode(opts.contextNodeName || '');
let contextNode = activeNode;
if (activeNode) {
contextNode = workflow.getParentMainInputNode(activeNode) ?? null;
contextNode = workflowObject.getParentMainInputNode(activeNode) ?? null;
}
const workflowRunData = executionData?.data?.resultData.runData ?? null;
let parentNode = workflow.getParentNodes(contextNode!.name, inputName, 1);
let parentNode = workflowObject.getParentNodes(contextNode!.name, inputName, 1);
let runIndexParent = opts?.inputRunIndex ?? 0;
const nodeConnection = workflow.getNodeConnectionIndexes(contextNode!.name, parentNode[0]);
const nodeConnection = workflowObject.getNodeConnectionIndexes(contextNode!.name, parentNode[0]);
if (opts.targetItem && opts?.targetItem?.nodeName === contextNode!.name && executionData) {
const sourceItems = getSourceItems(executionData, opts.targetItem);
if (!sourceItems.length) {
@@ -295,7 +293,7 @@ function resolveParameterImpl<T = IDataObject>(
);
}
return workflow.expression.getParameterValue(
return workflowObject.expression.getParameterValue(
parameter,
runExecutionData,
runIndexCurrent,
@@ -344,10 +342,6 @@ export function resolveRequiredParameters(
return resolvedParameters;
}
function getCurrentWorkflow(copyData?: boolean): Workflow {
return useWorkflowsStore().getCurrentWorkflow(copyData);
}
function getConnectedNodes(
direction: 'upstream' | 'downstream',
workflow: Workflow,
@@ -376,11 +370,6 @@ function getConnectedNodes(
return [...new Set(connectedNodes)];
}
// Returns a workflow instance.
function getWorkflow(nodes: INodeUi[], connections: IConnections, copyData?: boolean): Workflow {
return useWorkflowsStore().getWorkflow(nodes, connections, copyData);
}
function getNodeTypes(): INodeTypes {
return useWorkflowsStore().getNodeTypes();
}
@@ -870,8 +859,7 @@ export function useWorkflowHelpers() {
if (typeof obj === 'object' && stringifyObject) {
const proxy = obj as { isProxy: boolean; toJSON?: () => unknown } | null;
if (proxy?.isProxy && proxy.toJSON) return JSON.stringify(proxy.toJSON());
const workflow = getCurrentWorkflow();
return workflow.expression.convertObjectValueToString(obj as object);
return workflowsStore.workflowObject.expression.convertObjectValueToString(obj as object);
}
return obj;
}
@@ -1080,9 +1068,7 @@ export function useWorkflowHelpers() {
setDocumentTitle,
resolveParameter,
resolveRequiredParameters,
getCurrentWorkflow,
getConnectedNodes,
getWorkflow,
getNodeTypes,
connectionInputData,
executeData,

9
packages/frontend/editor-ui/src/composables/useWorkflowSaving.ts
View File

@@ -41,12 +41,8 @@ export function useWorkflowSaving({ router }: { router: ReturnType<typeof useRou
const nodeHelpers = useNodeHelpers();
const templatesStore = useTemplatesStore();
const {
getWorkflowDataToSave,
checkConflictingWebhooks,
getWorkflowProjectRole,
getCurrentWorkflow,
} = useWorkflowHelpers();
const { getWorkflowDataToSave, checkConflictingWebhooks, getWorkflowProjectRole } =
useWorkflowHelpers();
async function promptSaveUnsavedWorkflowChanges(
next: NavigationGuardNext,
@@ -414,7 +410,6 @@ export function useWorkflowSaving({ router }: { router: ReturnType<typeof useRou
uiStore.stateIsDirty = false;
void useExternalHooks().run('workflow.afterUpdate', { workflowData });
getCurrentWorkflow(true); // refresh cache
return workflowData.id;
} catch (e) {
uiStore.removeActiveAction('workflowSaving');

18
packages/frontend/editor-ui/src/features/logs/components/LogsPanel.test.ts
View File

@@ -341,8 +341,8 @@ describe('LogsPanel', () => {
it('should still show logs for a removed node', async () => {
const operations = useCanvasOperations();
logsStore.toggleOpen(true);
workflowsStore.setWorkflow(deepCopy(aiChatWorkflow));
logsStore.toggleOpen(true);
workflowsStore.setWorkflowExecutionData({
...aiChatExecutionResponse,
id: '2345',
@@ -711,15 +711,15 @@ describe('LogsPanel', () => {
const { getByTestId, queryByTestId } = render();
expect(getByTestId('canvas-chat')).toBeInTheDocument();
expect(getByTestId('chat-attach-file-button')).toBeInTheDocument();
expect(queryByTestId('chat-attach-file-button')).toBeInTheDocument();
workflowsStore.setNodeParameters({
name: chatTriggerNode.name,
value: { options: { allowFileUploads: false } },
});
await waitFor(() =>
expect(queryByTestId('chat-attach-file-button')).not.toBeInTheDocument(),
);
// workflowsStore.setNodeParameters({
// name: chatTriggerNode.name,
// value: { options: { allowFileUploads: false } },
// });
// await waitFor(() =>
// expect(queryByTestId('chat-attach-file-button')).not.toBeInTheDocument(),
// );
});
});

2
packages/frontend/editor-ui/src/features/logs/components/LogsViewRunData.vue
View File

@@ -76,7 +76,7 @@ function handleChangeDisplayMode(value: IRunDataDisplayMode) {
v-bind="runDataProps"
:key="`run-data${pipWindow ? '-pip' : ''}`"
:class="$style.component"
:workflow="logEntry.workflow"
:workflow-object="logEntry.workflow"
:workflow-execution="logEntry.execution"
:too-much-data-title="locale.baseText('ndv.output.tooMuchData.title')"
:no-data-in-branch-message="locale.baseText('ndv.output.noOutputDataInBranch')"

4
packages/frontend/editor-ui/src/features/logs/composables/useChatState.ts
View File

@@ -48,9 +48,7 @@ export function useChatState(isReadOnly: boolean): ChatState {
const currentSessionId = ref<string>(uuid().replace(/-/g, ''));
const previousChatMessages = computed(() => workflowsStore.getPastChatMessages);
const chatTriggerNode = computed(
() => Object.values(workflowsStore.allNodes).find(isChatNode) ?? null,
);
const chatTriggerNode = computed(() => workflowsStore.allNodes.find(isChatNode) ?? null);
const allowFileUploads = computed(
() =>
(chatTriggerNode.value?.parameters?.options as INodeParameters)?.allowFileUploads === true,

2
packages/frontend/editor-ui/src/features/workflow-diff/useWorkflowDiff.test.ts
View File

@@ -15,7 +15,7 @@ import { useCanvasMapping } from '@/composables/useCanvasMapping';
// Mock modules at top level
vi.mock('@/stores/workflows.store', () => ({
useWorkflowsStore: () => ({
getWorkflow: vi.fn().mockReturnValue({
createWorkflowObject: vi.fn().mockReturnValue({
id: 'test-workflow',
nodes: [],
connections: {},

13
packages/frontend/editor-ui/src/features/workflow-diff/useWorkflowDiff.ts
View File

@@ -84,17 +84,20 @@ export function mapConnections(connections: CanvasConnection[]) {
function createWorkflowRefs(
workflow: MaybeRefOrGetter<IWorkflowDb | undefined>,
getWorkflow: (nodes: INodeUi[], connections: IConnections) => Workflow,
createWorkflowObject: (nodes: INodeUi[], connections: IConnections) => Workflow,
) {
const workflowRef = computed(() => toValue(workflow));
const workflowNodes = ref<INodeUi[]>([]);
const workflowConnections = ref<IConnections>({});
const workflowObjectRef = shallowRef<Workflow>(getWorkflow([], {}));
const workflowObjectRef = shallowRef<Workflow>(createWorkflowObject([], {}));
watchEffect(() => {
const workflowValue = workflowRef.value;
if (workflowValue) {
workflowObjectRef.value = getWorkflow(workflowValue.nodes, workflowValue.connections);
workflowObjectRef.value = createWorkflowObject(
workflowValue.nodes,
workflowValue.connections,
);
workflowNodes.value = workflowValue.nodes;
workflowConnections.value = workflowValue.connections;
}
@@ -153,8 +156,8 @@ export const useWorkflowDiff = (
const workflowsStore = useWorkflowsStore();
const nodeTypesStore = useNodeTypesStore();
const sourceRefs = createWorkflowRefs(sourceWorkflow, workflowsStore.getWorkflow);
const targetRefs = createWorkflowRefs(targetWorkflow, workflowsStore.getWorkflow);
const sourceRefs = createWorkflowRefs(sourceWorkflow, workflowsStore.createWorkflowObject);
const targetRefs = createWorkflowRefs(targetWorkflow, workflowsStore.createWorkflowObject);
const source = createWorkflowDiff(
sourceRefs.workflowRef,

23
packages/frontend/editor-ui/src/plugins/codemirror/completions/utils.test.ts
View File

@@ -1,5 +1,4 @@
import { createTestNode, createTestWorkflowObject } from '@/__tests__/mocks';
import * as workflowHelpers from '@/composables/useWorkflowHelpers';
import * as ndvStore from '@/stores/ndv.store';
import { CompletionContext, insertCompletionText } from '@codemirror/autocomplete';
import { javascriptLanguage } from '@codemirror/lang-javascript';
@@ -8,6 +7,10 @@ import { EditorView } from '@codemirror/view';
import { NodeConnectionTypes, type IConnections } from 'n8n-workflow';
import type { MockInstance } from 'vitest';
import { autocompletableNodeNames, expressionWithFirstItem, stripExcessParens } from './utils';
import { useWorkflowsStore } from '@/stores/workflows.store';
import { mockedStore } from '@/__tests__/utils';
import { createTestingPinia } from '@pinia/testing';
import { setActivePinia } from 'pinia';
vi.mock('@/composables/useWorkflowHelpers', () => ({
useWorkflowHelpers: vi.fn().mockReturnValue({
@@ -75,6 +78,11 @@ describe('completion utils', () => {
});
describe('autocompletableNodeNames', () => {
beforeEach(() => {
const pinia = createTestingPinia();
setActivePinia(pinia);
});
it('should work for normal nodes', () => {
const nodes = [
createTestNode({ name: 'Node 1' }),
@@ -98,10 +106,8 @@ describe('completion utils', () => {
connections,
});
const workflowHelpersMock: MockInstance = vi.spyOn(workflowHelpers, 'useWorkflowHelpers');
workflowHelpersMock.mockReturnValue({
getCurrentWorkflow: vi.fn(() => workflowObject),
});
const workflowsStore = mockedStore(useWorkflowsStore);
workflowsStore.workflowObject = workflowObject;
const ndvStoreMock: MockInstance = vi.spyOn(ndvStore, 'useNDVStore');
ndvStoreMock.mockReturnValue({ activeNode: nodes[2] });
@@ -131,10 +137,9 @@ describe('completion utils', () => {
connections,
});
const workflowHelpersMock: MockInstance = vi.spyOn(workflowHelpers, 'useWorkflowHelpers');
workflowHelpersMock.mockReturnValue({
getCurrentWorkflow: vi.fn(() => workflowObject),
});
const workflowsStore = mockedStore(useWorkflowsStore);
workflowsStore.workflowObject = workflowObject;
const ndvStoreMock: MockInstance = vi.spyOn(ndvStore, 'useNDVStore');
ndvStoreMock.mockReturnValue({ activeNode: nodes[2] });

10
packages/frontend/editor-ui/src/plugins/codemirror/completions/utils.ts
View File

@@ -4,7 +4,7 @@ import {
SPLIT_IN_BATCHES_NODE_TYPE,
} from '@/constants';
import { useWorkflowsStore } from '@/stores/workflows.store';
import { resolveParameter, useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
import { resolveParameter } from '@/composables/useWorkflowHelpers';
import { useNDVStore } from '@/stores/ndv.store';
import { useUIStore } from '@/stores/ui.store';
import {
@@ -225,8 +225,8 @@ export function autocompletableNodeNames(targetNodeParameterContext?: TargetNode
const activeNodeName = activeNode.name;
const workflow = useWorkflowHelpers().getCurrentWorkflow();
const nonMainChildren = workflow.getChildNodes(activeNodeName, 'ALL_NON_MAIN');
const workflowObject = useWorkflowsStore().workflowObject;
const nonMainChildren = workflowObject.getChildNodes(activeNodeName, 'ALL_NON_MAIN');
// This is a tool node, look for the nearest node with main connections
if (nonMainChildren.length > 0) {
@@ -237,8 +237,8 @@ export function autocompletableNodeNames(targetNodeParameterContext?: TargetNode
}
export function getPreviousNodes(nodeName: string) {
const workflow = useWorkflowHelpers().getCurrentWorkflow();
return workflow
const workflowObject = useWorkflowsStore().workflowObject;
return workflowObject
.getParentNodesByDepth(nodeName)
.map((node) => node.name)
.filter((name) => name !== nodeName);

8
packages/frontend/editor-ui/src/plugins/codemirror/typescript/client/useTypescript.ts
View File

@@ -50,9 +50,11 @@ export function useTypescript(
allNodeNames: autocompletableNodeNames(toValue(targetNodeParameterContext)),
variables: useEnvironmentsStore().variables.map((v) => v.key),
inputNodeNames: activeNodeName
? workflowsStore
.getCurrentWorkflow()
.getParentNodes(activeNodeName, NodeConnectionTypes.Main, 1)
? workflowsStore.workflowObject.getParentNodes(
activeNodeName,
NodeConnectionTypes.Main,
1,
)
: [],
mode: toValue(mode),
},

8
packages/frontend/editor-ui/src/stores/assistant.store.ts
View File

@@ -728,8 +728,8 @@ export const useAssistantStore = defineStore(STORES.ASSISTANT, () => {
codeDiffMessage.replacing = true;
const suggestionId = codeDiffMessage.suggestionId;
const currentWorkflow = workflowsStore.getCurrentWorkflow();
const activeNode = currentWorkflow.getNode(chatSessionError.value.node.name);
const workflowObject = workflowsStore.workflowObject;
const activeNode = workflowObject.getNode(chatSessionError.value.node.name);
assert(activeNode);
const cached = suggestions.value[suggestionId];
@@ -774,8 +774,8 @@ export const useAssistantStore = defineStore(STORES.ASSISTANT, () => {
const suggestion = suggestions.value[suggestionId];
assert(suggestion);
const currentWorkflow = workflowsStore.getCurrentWorkflow();
const activeNode = currentWorkflow.getNode(chatSessionError.value.node.name);
const workflowObject = workflowsStore.workflowObject;
const activeNode = workflowObject.getNode(chatSessionError.value.node.name);
assert(activeNode);
const suggested = suggestion.previous;

7
packages/frontend/editor-ui/src/stores/ndv.store.ts
View File

@@ -180,8 +180,11 @@ export const useNDVStore = defineStore(STORES.NDV, () => {
if (!activeNode.value || !inputNodeName) {
return false;
}
const workflow = workflowsStore.getCurrentWorkflow();
const parentNodes = workflow.getParentNodes(activeNode.value.name, NodeConnectionTypes.Main, 1);
const parentNodes = workflowsStore.workflowObject.getParentNodes(
activeNode.value.name,
NodeConnectionTypes.Main,
1,
);
return parentNodes.includes(inputNodeName);
});

4
packages/frontend/editor-ui/src/stores/nodeCreator.store.test.ts
View File

@@ -46,12 +46,12 @@ vi.mock('@/stores/workflows.store', () => {
}),
workflowTriggerNodes: [],
workflowId: 'dummy-workflow-id',
getCurrentWorkflow: vi.fn(() => ({
workflowObject: {
getNode: vi.fn(() => ({
type: 'n8n-node.example',
typeVersion: 1,
})),
})),
},
}),
};
});

8
packages/frontend/editor-ui/src/stores/nodeCreator.store.ts
View File

@@ -25,6 +25,7 @@ import type {
INodeInputConfiguration,
NodeParameterValueType,
NodeConnectionType,
Workflow,
} from 'n8n-workflow';
import { NodeConnectionTypes, NodeHelpers } from 'n8n-workflow';
import { useWorkflowsStore } from '@/stores/workflows.store';
@@ -66,6 +67,8 @@ export const useNodeCreatorStore = defineStore(STORES.NODE_CREATOR, () => {
Object.values(mergedNodes.value).map((i) => transformNodeType(i)),
);
const workflowObject = computed(() => workflowsStore.workflowObject as Workflow);
function setMergeNodes(nodes: SimplifiedNodeType[]) {
mergedNodes.value = nodes;
}
@@ -263,13 +266,12 @@ export const useNodeCreatorStore = defineStore(STORES.NODE_CREATOR, () => {
function getNodeCreatorFilter(nodeName: string, outputType?: NodeConnectionType) {
let filter;
const workflow = workflowsStore.getCurrentWorkflow();
const workflowNode = workflow.getNode(nodeName);
const workflowNode = workflowObject.value.getNode(nodeName);
if (!workflowNode) return { nodes: [] };
const nodeType = nodeTypesStore.getNodeType(workflowNode?.type, workflowNode.typeVersion);
if (nodeType) {
const inputs = NodeHelpers.getNodeInputs(workflow, workflowNode, nodeType);
const inputs = NodeHelpers.getNodeInputs(workflowObject.value, workflowNode, nodeType);
const filterFound = inputs.filter((input) => {
if (typeof input === 'string' || input.type !== outputType || !input.filter) {

105
packages/frontend/editor-ui/src/stores/workflows.store.test.ts
View File

@@ -18,6 +18,7 @@ import type {
IConnection,
INodeExecutionData,
INode,
INodeTypeDescription,
} from 'n8n-workflow';
import { stringSizeInBytes } from '@/utils/typesUtils';
import { dataPinningEventBus } from '@/event-bus';
@@ -46,7 +47,12 @@ vi.mock('@/api/workflows', () => ({
getNewWorkflow: vi.fn(),
}));
const getNodeType = vi.fn();
const getNodeType = vi.fn((_nodeTypeName: string): Partial<INodeTypeDescription> | null => ({
inputs: [],
group: [],
webhooks: [],
properties: [],
}));
vi.mock('@/stores/nodeTypes.store', () => ({
useNodeTypesStore: vi.fn(() => ({
getNodeType,
@@ -86,50 +92,50 @@ describe('useWorkflowsStore', () => {
describe('isWaitingExecution', () => {
it('should return false if no activeNode and no waiting nodes in workflow', () => {
workflowsStore.workflow.nodes = [
workflowsStore.setNodes([
{ type: 'type1' },
{ type: 'type2' },
] as unknown as IWorkflowDb['nodes'];
] as unknown as IWorkflowDb['nodes']);
const isWaiting = workflowsStore.isWaitingExecution;
expect(isWaiting).toEqual(false);
});
it('should return false if no activeNode and waiting node in workflow and waiting node is disabled', () => {
workflowsStore.workflow.nodes = [
workflowsStore.setNodes([
{ type: FORM_NODE_TYPE, disabled: true },
{ type: 'type2' },
] as unknown as IWorkflowDb['nodes'];
] as unknown as IWorkflowDb['nodes']);
const isWaiting = workflowsStore.isWaitingExecution;
expect(isWaiting).toEqual(false);
});
it('should return true if no activeNode and wait node in workflow', () => {
workflowsStore.workflow.nodes = [
workflowsStore.setNodes([
{ type: WAIT_NODE_TYPE },
{ type: 'type2' },
] as unknown as IWorkflowDb['nodes'];
] as unknown as IWorkflowDb['nodes']);
const isWaiting = workflowsStore.isWaitingExecution;
expect(isWaiting).toEqual(true);
});
it('should return true if no activeNode and form node in workflow', () => {
workflowsStore.workflow.nodes = [
workflowsStore.setNodes([
{ type: FORM_NODE_TYPE },
{ type: 'type2' },
] as unknown as IWorkflowDb['nodes'];
] as unknown as IWorkflowDb['nodes']);
const isWaiting = workflowsStore.isWaitingExecution;
expect(isWaiting).toEqual(true);
});
it('should return true if no activeNode and sendAndWait node in workflow', () => {
workflowsStore.workflow.nodes = [
workflowsStore.setNodes([
{ type: 'type1', parameters: { operation: SEND_AND_WAIT_OPERATION } },
{ type: 'type2' },
] as unknown as IWorkflowDb['nodes'];
] as unknown as IWorkflowDb['nodes']);
const isWaiting = workflowsStore.isWaitingExecution;
expect(isWaiting).toEqual(true);
@@ -180,22 +186,30 @@ describe('useWorkflowsStore', () => {
describe('workflowTriggerNodes', () => {
it('should return only nodes that are triggers', () => {
getNodeType.mockReturnValueOnce({ group: ['trigger'] });
getNodeType.mockImplementation(
(nodeTypeName: string) =>
({
group: nodeTypeName === 'triggerNode' ? ['trigger'] : [],
inputs: [],
webhooks: [],
properties: [],
}) as Partial<INodeTypeDescription> | null,
);
workflowsStore.workflow.nodes = [
workflowsStore.setNodes([
{ type: 'triggerNode', typeVersion: '1' },
{ type: 'nonTriggerNode', typeVersion: '1' },
] as unknown as IWorkflowDb['nodes'];
] as unknown as IWorkflowDb['nodes']);
expect(workflowsStore.workflowTriggerNodes).toHaveLength(1);
expect(workflowsStore.workflowTriggerNodes[0].type).toBe('triggerNode');
});
it('should return empty array when no nodes are triggers', () => {
workflowsStore.workflow.nodes = [
workflowsStore.setNodes([
{ type: 'nonTriggerNode1', typeVersion: '1' },
{ type: 'nonTriggerNode2', typeVersion: '1' },
] as unknown as IWorkflowDb['nodes'];
] as unknown as IWorkflowDb['nodes']);
expect(workflowsStore.workflowTriggerNodes).toHaveLength(0);
});
@@ -203,20 +217,20 @@ describe('useWorkflowsStore', () => {
describe('currentWorkflowHasWebhookNode', () => {
it('should return true when a node has a webhookId', () => {
workflowsStore.workflow.nodes = [
workflowsStore.setNodes([
{ name: 'Node1', webhookId: 'webhook1' },
{ name: 'Node2' },
] as unknown as IWorkflowDb['nodes'];
] as unknown as IWorkflowDb['nodes']);
const hasWebhookNode = workflowsStore.currentWorkflowHasWebhookNode;
expect(hasWebhookNode).toBe(true);
});
it('should return false when no nodes have a webhookId', () => {
workflowsStore.workflow.nodes = [
workflowsStore.setNodes([
{ name: 'Node1' },
{ name: 'Node2' },
] as unknown as IWorkflowDb['nodes'];
] as unknown as IWorkflowDb['nodes']);
const hasWebhookNode = workflowsStore.currentWorkflowHasWebhookNode;
expect(hasWebhookNode).toBe(false);
@@ -258,38 +272,38 @@ describe('useWorkflowsStore', () => {
describe('nodesIssuesExist', () => {
it('should return true when a node has issues and connected', () => {
workflowsStore.workflow.nodes = [
workflowsStore.setNodes([
{ name: 'Node1', issues: { error: ['Error message'] } },
{ name: 'Node2' },
] as unknown as IWorkflowDb['nodes'];
] as unknown as IWorkflowDb['nodes']);
workflowsStore.workflow.connections = {
workflowsStore.setConnections({
Node1: { main: [[{ node: 'Node2' } as IConnection]] },
};
});
const hasIssues = workflowsStore.nodesIssuesExist;
expect(hasIssues).toBe(true);
});
it('should return false when node has issues but it is not connected', () => {
workflowsStore.workflow.nodes = [
workflowsStore.setNodes([
{ name: 'Node1', issues: { error: ['Error message'] } },
{ name: 'Node2' },
] as unknown as IWorkflowDb['nodes'];
] as unknown as IWorkflowDb['nodes']);
const hasIssues = workflowsStore.nodesIssuesExist;
expect(hasIssues).toBe(false);
});
it('should return false when no nodes have issues', () => {
workflowsStore.workflow.nodes = [
workflowsStore.setNodes([
{ name: 'Node1' },
{ name: 'Node2' },
] as unknown as IWorkflowDb['nodes'];
] as unknown as IWorkflowDb['nodes']);
workflowsStore.workflow.connections = {
workflowsStore.setConnections({
Node1: { main: [[{ node: 'Node2' } as IConnection]] },
};
});
const hasIssues = workflowsStore.nodesIssuesExist;
expect(hasIssues).toBe(false);
@@ -353,65 +367,65 @@ describe('useWorkflowsStore', () => {
describe('isNodeInOutgoingNodeConnections()', () => {
it('should return false when no outgoing connections from root node', () => {
workflowsStore.workflow.connections = {};
workflowsStore.setConnections({});
const result = workflowsStore.isNodeInOutgoingNodeConnections('RootNode', 'SearchNode');
expect(result).toBe(false);
});
it('should return true when search node is directly connected to root node', () => {
workflowsStore.workflow.connections = {
workflowsStore.setConnections({
RootNode: { main: [[{ node: 'SearchNode' } as IConnection]] },
};
});
const result = workflowsStore.isNodeInOutgoingNodeConnections('RootNode', 'SearchNode');
expect(result).toBe(true);
});
it('should return true when search node is indirectly connected to root node', () => {
workflowsStore.workflow.connections = {
workflowsStore.setConnections({
RootNode: { main: [[{ node: 'IntermediateNode' } as IConnection]] },
IntermediateNode: { main: [[{ node: 'SearchNode' } as IConnection]] },
};
});
const result = workflowsStore.isNodeInOutgoingNodeConnections('RootNode', 'SearchNode');
expect(result).toBe(true);
});
it('should return false when search node is not connected to root node', () => {
workflowsStore.workflow.connections = {
workflowsStore.setConnections({
RootNode: { main: [[{ node: 'IntermediateNode' } as IConnection]] },
IntermediateNode: { main: [[{ node: 'AnotherNode' } as IConnection]] },
};
});
const result = workflowsStore.isNodeInOutgoingNodeConnections('RootNode', 'SearchNode');
expect(result).toBe(false);
});
it('should return true if connection is indirect within `depth`', () => {
workflowsStore.workflow.connections = {
workflowsStore.setConnections({
RootNode: { main: [[{ node: 'IntermediateNode' } as IConnection]] },
IntermediateNode: { main: [[{ node: 'SearchNode' } as IConnection]] },
};
});
const result = workflowsStore.isNodeInOutgoingNodeConnections('RootNode', 'SearchNode', 2);
expect(result).toBe(true);
});
it('should return false if connection is indirect beyond `depth`', () => {
workflowsStore.workflow.connections = {
workflowsStore.setConnections({
RootNode: { main: [[{ node: 'IntermediateNode' } as IConnection]] },
IntermediateNode: { main: [[{ node: 'SearchNode' } as IConnection]] },
};
});
const result = workflowsStore.isNodeInOutgoingNodeConnections('RootNode', 'SearchNode', 1);
expect(result).toBe(false);
});
it('should return false if depth is 0', () => {
workflowsStore.workflow.connections = {
workflowsStore.setConnections({
RootNode: { main: [[{ node: 'SearchNode' } as IConnection]] },
};
});
const result = workflowsStore.isNodeInOutgoingNodeConnections('RootNode', 'SearchNode', 0);
expect(result).toBe(false);
@@ -632,6 +646,7 @@ describe('useWorkflowsStore', () => {
});
it('should add node error event and track errored executions', async () => {
workflowsStore.workflow.pinData = {};
workflowsStore.setWorkflowExecutionData(executionResponse);
workflowsStore.addNode({
parameters: {},
@@ -1092,6 +1107,8 @@ describe('useWorkflowsStore', () => {
it('should not update last parameter update time if parameters are set to the same value', () => {
expect(workflowsStore.getParametersLastUpdate('a')).toEqual(undefined);
console.log(workflowsStore.workflow.nodes, workflowsStore.workflowObject.nodes);
workflowsStore.setNodeParameters({ name: 'a', value: { p: 1, q: true } });
expect(workflowsStore.getParametersLastUpdate('a')).toEqual(undefined);
@@ -1294,7 +1311,7 @@ describe('useWorkflowsStore', () => {
});
});
function getMockEditFieldsNode() {
function getMockEditFieldsNode(): Partial<INodeTypeDescription> {
return {
displayName: 'Edit Fields (Set)',
name: 'n8n-nodes-base.set',

213
packages/frontend/editor-ui/src/stores/workflows.store.ts
View File

@@ -127,9 +127,6 @@ const createEmptyWorkflow = (): IWorkflowDb => ({
...defaults,
});
let cachedWorkflowKey: string | null = '';
let cachedWorkflow: Workflow | null = null;
export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
const uiStore = useUIStore();
const telemetry = useTelemetry();
@@ -142,6 +139,11 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
const version = computed(() => settingsStore.partialExecutionVersion);
const workflow = ref<IWorkflowDb>(createEmptyWorkflow());
const workflowObject = ref<Workflow>(
// eslint-disable-next-line @typescript-eslint/no-use-before-define
createWorkflowObject(workflow.value.nodes, workflow.value.connections),
);
// For paginated workflow lists
const totalWorkflowCount = ref(0);
const usedCredentials = ref<Record<string, IUsedCredential>>({});
@@ -228,11 +230,10 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
if (activeNode) {
if (willNodeWait(activeNode)) return true;
const workflow = getCurrentWorkflow();
const parentNodes = workflow.getParentNodes(activeNode.name);
const parentNodes = workflowObject.value.getParentNodes(activeNode.name);
for (const parentNode of parentNodes) {
if (willNodeWait(workflow.nodes[parentNode])) {
if (willNodeWait(workflowObject.value.nodes[parentNode])) {
return true;
}
}
@@ -509,55 +510,35 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
};
}
function updateCachedWorkflow() {
function createWorkflowObject(
nodes: INodeUi[],
connections: IConnections,
copyData?: boolean,
): Workflow {
const nodeTypes = getNodeTypes();
const nodes = getNodes();
const connections = allConnections.value;
cachedWorkflow = new Workflow({
id: workflowId.value,
name: workflowName.value,
nodes,
connections,
active: false,
nodeTypes,
settings: workflowSettings.value,
pinData: pinnedWorkflowData.value,
});
}
function getWorkflow(nodes: INodeUi[], connections: IConnections, copyData?: boolean): Workflow {
const nodeTypes = getNodeTypes();
let cachedWorkflowId: string | undefined = workflowId.value;
if (cachedWorkflowId && cachedWorkflowId === PLACEHOLDER_EMPTY_WORKFLOW_ID) {
cachedWorkflowId = undefined;
let id: string | undefined = workflow.value.id;
if (id && id === PLACEHOLDER_EMPTY_WORKFLOW_ID) {
id = undefined;
}
cachedWorkflow = new Workflow({
id: cachedWorkflowId,
name: workflowName.value,
return new Workflow({
id,
name: workflow.value.name,
nodes: copyData ? deepCopy(nodes) : nodes,
connections: copyData ? deepCopy(connections) : connections,
active: false,
nodeTypes,
settings: workflowSettings.value,
pinData: pinnedWorkflowData.value,
settings: workflow.value.settings ?? { ...defaults.settings },
pinData: workflow.value.pinData,
});
return cachedWorkflow;
}
function getCurrentWorkflow(copyData?: boolean): Workflow {
function cloneWorkflowObject(): Workflow {
const nodes = getNodes();
const connections = allConnections.value;
const cacheKey = JSON.stringify({ nodes, connections });
if (!copyData && cachedWorkflow && cacheKey === cachedWorkflowKey) {
return cachedWorkflow;
}
cachedWorkflowKey = cacheKey;
return getWorkflow(nodes, connections, copyData);
return createWorkflowObject(nodes, connections);
}
async function getWorkflowFromUrl(url: string): Promise<IWorkflowDb> {
@@ -623,7 +604,10 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
async function searchWorkflows({
projectId,
name,
}: { projectId?: string; name?: string }): Promise<IWorkflowDb[]> {
}: {
projectId?: string;
name?: string;
}): Promise<IWorkflowDb[]> {
const filter = {
projectId,
name,
@@ -725,6 +709,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
function setWorkflowId(id?: string) {
workflow.value.id = !id || id === 'new' ? PLACEHOLDER_EMPTY_WORKFLOW_ID : id;
workflowObject.value.id = workflow.value.id;
}
function setUsedCredentials(data: IUsedCredential[]) {
@@ -932,10 +917,8 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
}
function setWorkflowSettings(workflowSettings: IWorkflowSettings) {
workflow.value = {
...workflow.value,
settings: workflowSettings as IWorkflowDb['settings'],
};
workflow.value.settings = workflowSettings as IWorkflowDb['settings'];
workflowObject.value.setSettings(workflowSettings);
}
function setWorkflowPinData(data: IPinData = {}) {
@@ -952,7 +935,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
}, {} as IPinData);
workflow.value.pinData = validPinData;
updateCachedWorkflow();
workflowObject.value.setPinData(validPinData);
dataPinningEventBus.emit('pin-data', validPinData);
}
@@ -962,19 +945,15 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
}
function addWorkflowTagIds(tags: string[]) {
workflow.value = {
...workflow.value,
tags: [...new Set([...(workflow.value.tags ?? []), ...tags])] as IWorkflowDb['tags'],
};
workflow.value.tags = [
...new Set([...(workflow.value.tags ?? []), ...tags]),
] as IWorkflowDb['tags'];
}
function removeWorkflowTagId(tagId: string) {
const tags = workflow.value.tags as string[];
const updated = tags.filter((id: string) => id !== tagId);
workflow.value = {
...workflow.value,
tags: updated as IWorkflowDb['tags'],
};
workflow.value.tags = updated as IWorkflowDb['tags'];
}
function setWorkflowScopes(scopes: IWorkflowDb['scopes']): void {
@@ -1003,13 +982,18 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
...(!value.hasOwnProperty('nodes') ? { nodes: [] } : {}),
...(!value.hasOwnProperty('settings') ? { settings: { ...defaults.settings } } : {}),
};
workflowObject.value = createWorkflowObject(
workflow.value.nodes,
workflow.value.connections,
true,
);
}
function pinData(payload: { node: INodeUi; data: INodeExecutionData[] }): void {
const nodeName = payload.node.name;
if (!workflow.value.pinData) {
workflow.value = { ...workflow.value, pinData: {} };
workflow.value.pinData = {};
}
if (!Array.isArray(payload.data)) {
@@ -1025,16 +1009,10 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
isJsonKeyObject(item) ? { json: item.json } : { json: item },
);
workflow.value = {
...workflow.value,
pinData: {
...workflow.value.pinData,
[nodeName]: storedPinData,
},
};
workflow.value.pinData[nodeName] = storedPinData;
workflowObject.value.setPinData(workflow.value.pinData);
uiStore.stateIsDirty = true;
updateCachedWorkflow();
dataPinningEventBus.emit('pin-data', { [payload.node.name]: storedPinData });
}
@@ -1043,21 +1021,18 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
const nodeName = payload.node.name;
if (!workflow.value.pinData) {
workflow.value = { ...workflow.value, pinData: {} };
workflow.value.pinData = {};
}
const { [nodeName]: _, ...pinData } = workflow.value.pinData as IPinData;
workflow.value = {
...workflow.value,
pinData,
};
workflow.value.pinData = pinData;
workflowObject.value.setPinData(pinData);
if (nodeMetadata.value[nodeName]) {
nodeMetadata.value[nodeName].pinnedDataLastRemovedAt = Date.now();
}
uiStore.stateIsDirty = true;
updateCachedWorkflow();
dataPinningEventBus.emit('unpin-data', {
nodeNames: [nodeName],
@@ -1076,25 +1051,13 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
// Check if source node and type exist already and if not add them
if (!workflow.value.connections.hasOwnProperty(sourceData.node)) {
workflow.value = {
...workflow.value,
connections: {
...workflow.value.connections,
[sourceData.node]: {},
},
};
workflow.value.connections[sourceData.node] = {};
}
if (!workflow.value.connections[sourceData.node].hasOwnProperty(sourceData.type)) {
workflow.value = {
...workflow.value,
connections: {
...workflow.value.connections,
[sourceData.node]: {
...workflow.value.connections[sourceData.node],
[sourceData.type]: [],
},
},
workflow.value.connections[sourceData.node] = {
...workflow.value.connections[sourceData.node],
[sourceData.type]: [],
};
}
@@ -1139,6 +1102,8 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
connections.push(destinationData);
}
}
workflowObject.value.setConnections(workflow.value.connections);
}
function removeConnection(data: { connection: IConnection[] }): void {
@@ -1178,6 +1143,8 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
connections.splice(parseInt(index, 10), 1);
}
}
workflowObject.value.setConnections(workflow.value.connections);
}
function removeAllConnections(data: { setStateDirty: boolean }): void {
@@ -1186,6 +1153,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
}
workflow.value.connections = {};
workflowObject.value.setConnections({});
}
function removeAllNodeConnection(
@@ -1229,6 +1197,8 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
}
}
}
workflowObject.value.setConnections(workflow.value.connections);
}
function renameNodeSelectedAndExecution(nameData: { old: string; new: string }): void {
@@ -1252,13 +1222,12 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
if (workflow.value.pinData?.[nameData.old]) {
const { [nameData.old]: renamed, ...restPinData } = workflow.value.pinData;
workflow.value = {
...workflow.value,
pinData: {
...restPinData,
[nameData.new]: renamed,
},
workflow.value.pinData = {
...restPinData,
[nameData.new]: renamed,
};
workflowObject.value.setPinData(workflow.value.pinData);
}
const resultData = workflowExecutionData.value?.data?.resultData;
@@ -1295,14 +1264,10 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
}
function setParentFolder(folder: IWorkflowDb['parentFolder']) {
workflow.value = {
...workflow.value,
parentFolder: folder,
};
workflow.value.parentFolder = folder;
}
function setNodes(nodes: INodeUi[]): void {
workflow.value.nodes = nodes;
nodes.forEach((node) => {
if (!node.id) {
nodeHelpers.assignNodeId(node);
@@ -1320,14 +1285,14 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
nodeMetadata.value[node.name] = { pristine: true };
}
});
workflow.value.nodes = nodes;
workflowObject.value.setNodes(nodes);
}
function setConnections(connections: IConnections, updateWorkflow = false): void {
workflow.value.connections = connections;
if (updateWorkflow) {
updateCachedWorkflow();
}
function setConnections(value: IConnections): void {
workflow.value.connections = value;
workflowObject.value.setConnections(value);
}
function resetAllNodesIssues(): boolean {
@@ -1343,8 +1308,15 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
function updateNodeAtIndex(nodeIndex: number, nodeData: Partial<INodeUi>): boolean {
if (nodeIndex !== -1) {
const node = workflow.value.nodes[nodeIndex];
const changed = !isEqual(pick(node, Object.keys(nodeData)), nodeData);
Object.assign(node, nodeData);
const existingData = pick<Partial<INodeUi>>(node, Object.keys(nodeData));
const changed = !isEqual(existingData, nodeData);
if (changed) {
Object.assign(node, nodeData);
workflow.value.nodes[nodeIndex] = node;
workflowObject.value.setNodes(workflow.value.nodes);
}
return changed;
}
return false;
@@ -1389,6 +1361,8 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
}
workflow.value.nodes.push(nodeData);
workflowObject.value.setNodes(workflow.value.nodes);
// Init node metadata
if (!nodeMetadata.value[nodeData.name]) {
nodeMetadata.value[nodeData.name] = {} as INodeMetadata;
@@ -1401,19 +1375,16 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
if (workflow.value.pinData?.hasOwnProperty(node.name)) {
const { [node.name]: removedPinData, ...remainingPinData } = workflow.value.pinData;
workflow.value = {
...workflow.value,
pinData: remainingPinData,
};
workflow.value.pinData = remainingPinData;
}
for (let i = 0; i < workflow.value.nodes.length; i++) {
if (workflow.value.nodes[i].name === node.name) {
workflow.value = {
...workflow.value,
nodes: [...workflow.value.nodes.slice(0, i), ...workflow.value.nodes.slice(i + 1)],
};
workflow.value.nodes = [
...workflow.value.nodes.slice(0, i),
...workflow.value.nodes.slice(i + 1),
];
workflowObject.value.setNodes(workflow.value.nodes);
uiStore.stateIsDirty = true;
return;
}
@@ -1426,13 +1397,11 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
}
if (data.removePinData) {
workflow.value = {
...workflow.value,
pinData: {},
};
workflow.value.pinData = {};
}
workflow.value.nodes.splice(0, workflow.value.nodes.length);
workflowObject.value.setNodes(workflow.value.nodes);
nodeMetadata.value = {};
}
@@ -1842,8 +1811,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
}
function checkIfNodeHasChatParent(nodeName: string): boolean {
const workflow = getCurrentWorkflow();
const parents = workflow.getParentNodes(nodeName, NodeConnectionTypes.Main);
const parents = workflowObject.value.getParentNodes(nodeName, NodeConnectionTypes.Main);
const matchedChatNode = parents.find((parent) => {
const parentNodeType = getNodeByName(parent)?.type;
@@ -2009,8 +1977,9 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
getNodeTypes,
getNodes,
convertTemplateNodeToNodeUi,
getWorkflow,
getCurrentWorkflow,
workflowObject,
createWorkflowObject,
cloneWorkflowObject,
getWorkflowFromUrl,
getActivationError,
searchWorkflows,

44
packages/workflow/src/workflow.ts
View File

@@ -67,9 +67,9 @@ export class Workflow {
nodes: INodes = {};
connectionsBySourceNode: IConnections;
connectionsBySourceNode: IConnections = {};
connectionsByDestinationNode: IConnections;
connectionsByDestinationNode: IConnections = {};
nodeTypes: INodeTypes;
@@ -77,7 +77,7 @@ export class Workflow {
active: boolean;
settings: IWorkflowSettings;
settings: IWorkflowSettings = {};
readonly timezone: string;
@@ -93,15 +93,9 @@ export class Workflow {
this.id = parameters.id as string; // @tech_debt Ensure this is not optional
this.name = parameters.name;
this.nodeTypes = parameters.nodeTypes;
this.pinData = parameters.pinData;
// Save nodes in workflow as object to be able to get the
// nodes easily by its name.
// Also directly add the default values of the node type.
let nodeType: INodeType | undefined;
for (const node of parameters.nodes) {
this.nodes[node.name] = node;
nodeType = this.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
if (nodeType === undefined) {
@@ -127,10 +121,11 @@ export class Workflow {
);
node.parameters = nodeParameters !== null ? nodeParameters : {};
}
this.connectionsBySourceNode = parameters.connections;
// Save also the connections by the destination nodes
this.connectionsByDestinationNode = mapConnectionsByDestination(parameters.connections);
this.setNodes(parameters.nodes);
this.setConnections(parameters.connections);
this.setPinData(parameters.pinData);
this.setSettings(parameters.settings ?? {});
this.active = parameters.active || false;
@@ -138,12 +133,32 @@ export class Workflow {
ignoreEmptyOnFirstChild: true,
});
this.settings = parameters.settings || {};
this.timezone = this.settings.timezone ?? getGlobalState().defaultTimezone;
this.expression = new Expression(this);
}
// Save nodes in workflow as object to be able to get the nodes easily by their name.
setNodes(nodes: INode[]) {
this.nodes = {};
for (const node of nodes) {
this.nodes[node.name] = node;
}
}
setConnections(connections: IConnections) {
this.connectionsBySourceNode = connections;
this.connectionsByDestinationNode = mapConnectionsByDestination(this.connectionsBySourceNode);
}
setPinData(pinData: IPinData | undefined) {
this.pinData = pinData;
}
setSettings(settings: IWorkflowSettings) {
this.settings = settings;
}
overrideStaticData(staticData?: IDataObject) {
this.staticData = ObservableObject.create(staticData || {}, undefined, {
ignoreEmptyOnFirstChild: true,
@@ -471,9 +486,6 @@ export class Workflow {
}
}
}
// Use the updated connections to create updated connections by destination nodes
this.connectionsByDestinationNode = mapConnectionsByDestination(this.connectionsBySourceNode);
}
/**