mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-11-10 06:34:05 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Show actual execution data for production executions even if pin data exists (#6302)

Browse source
This commit is contained in:
Alex Grozav 2023-06-01 19:12:21 +03:00 committed by GitHub
parent b5cabfef54
commit 4eb8437196
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 85 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
packages/editor-ui/src/components/WorkflowPreview.vue
View file

@ -27,6 +27,7 @@ import { useToast } from '@/composables';
import type { IWorkflowDb } from '@/Interface';
import { mapStores } from 'pinia';
import { useRootStore } from '@/stores/n8nRoot.store';
import { useWorkflowsStore } from '@/stores';
export default defineComponent({
name: 'WorkflowPreview',
@ -73,7 +74,7 @@ export default defineComponent({
};
},
computed: {
...mapStores(useRootStore),
...mapStores(useRootStore, useWorkflowsStore),
showPreview(): boolean {
return (
!this.loading &&
@ -134,6 +135,16 @@ export default defineComponent({
}),
'*',
);
if (this.workflowsStore.activeWorkflowExecution) {
iframeRef.contentWindow.postMessage(
JSON.stringify({
command: 'setActiveExecution',
execution: this.workflowsStore.activeWorkflowExecution,
}),
'*',
);
}
}
} catch (error) {
this.showError(

67
packages/editor-ui/src/mixins/workflowHelpers.ts
View file

@ -223,32 +223,36 @@ function connectionInputData(
}
}
const parentPinData = parentNode.reduce((acc: INodeExecutionData[], parentNodeName, index) => {
const pinData = useWorkflowsStore().pinDataByNodeName(parentNodeName);
const workflowsStore = useWorkflowsStore();
if (pinData) {
acc.push({
json: pinData[0],
pairedItem: {
item: index,
input: 1,
},
});
}
if (workflowsStore.shouldReplaceInputDataWithPinData) {
const parentPinData = parentNode.reduce<INodeExecutionData[]>((acc, parentNodeName, index) => {
const pinData = workflowsStore.pinDataByNodeName(parentNodeName);
return acc;
}, []);
if (pinData) {
acc.push({
json: pinData[0],
pairedItem: {
item: index,
input: 1,
},
});
}
if (parentPinData.length > 0) {
if (connectionInputData && connectionInputData.length > 0) {
parentPinData.forEach((parentPinDataEntry) => {
connectionInputData![0].json = {
...connectionInputData![0].json,
...parentPinDataEntry.json,
};
});
} else {
connectionInputData = parentPinData;
return acc;
}, []);
if (parentPinData.length > 0) {
if (connectionInputData && connectionInputData.length > 0) {
parentPinData.forEach((parentPinDataEntry) => {
connectionInputData![0].json = {
...connectionInputData![0].json,
...parentPinDataEntry.json,
};
});
} else {
connectionInputData = parentPinData;
}
}
}
@ -271,21 +275,24 @@ function executeData(
// Add the input data to be able to also resolve the short expression format
// which does not use the node name
const parentNodeName = parentNode[0];
const workflowsStore = useWorkflowsStore();
const parentPinData = useWorkflowsStore().getPinData![parentNodeName];
if (workflowsStore.shouldReplaceInputDataWithPinData) {
const parentPinData = workflowsStore.getPinData![parentNodeName];
// populate `executeData` from `pinData`
// populate `executeData` from `pinData`
if (parentPinData) {
executeData.data = { main: [parentPinData] };
executeData.source = { main: [{ previousNode: parentNodeName }] };
if (parentPinData) {
executeData.data = { main: [parentPinData] };
executeData.source = { main: [{ previousNode: parentNodeName }] };
return executeData;
return executeData;
}
}
// populate `executeData` from `runData`
const workflowRunData = useWorkflowsStore().getWorkflowRunData;
const workflowRunData = workflowsStore.getWorkflowRunData;
if (workflowRunData === null) {
return executeData;
}

31
packages/editor-ui/src/stores/__tests__/workflows.test.ts Normal file
View file

@ -0,0 +1,31 @@
import { createTestingPinia } from '@pinia/testing';
import { useWorkflowsStore } from '@/stores';
let pinia: ReturnType<typeof createTestingPinia>;
beforeAll(() => {
pinia = createTestingPinia();
});
describe('Workflows Store', () => {
describe('shouldReplaceInputDataWithPinData', () => {
beforeEach(() => {
pinia.state.value = {
workflows: useWorkflowsStore(),
};
});
it('should return true if no active execution is set', () => {
expect(useWorkflowsStore().shouldReplaceInputDataWithPinData).toBe(true);
});
it('should return true if active execution is set and mode is manual', () => {
pinia.state.value.workflows.activeWorkflowExecution = { mode: 'manual' };
expect(useWorkflowsStore().shouldReplaceInputDataWithPinData).toBe(true);
});
it('should return false if active execution is set and mode is not manual', () => {
pinia.state.value.workflows.activeWorkflowExecution = { mode: 'webhook' };
expect(useWorkflowsStore().shouldReplaceInputDataWithPinData).toBe(false);
});
});
});

3
packages/editor-ui/src/stores/workflows.store.ts
View file

@ -248,6 +248,9 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
return acc;
}, 0);
},
shouldReplaceInputDataWithPinData(): boolean {
return !this.activeWorkflowExecution || this.activeWorkflowExecution?.mode === 'manual';
},
executedNode(): string | undefined {
return this.workflowExecutionData ? this.workflowExecutionData.executedNode : undefined;
},

2
packages/editor-ui/src/views/NodeView.vue
View file

@ -3622,6 +3622,8 @@ export default defineComponent({
type: 'error',
});
}
} else if (json?.command === 'setActiveExecution') {
this.workflowsStore.activeWorkflowExecution = json.execution;
}
} catch (e) {}
},