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

alexgrozav · 2023-05-23T11:12:40Z

No description provided.

… data exists

github-actions · 2023-05-23T11:13:06Z

Great PR! Please pay attention to the following items before merging:

Files matching packages/**:

If fixing bug, added test to cover scenario.
If addressing forum or Github issue, added link to description.

Files matching packages/**/*.ts:

Added unit tests to cover new or updated functionality.

Files matching **/*.vue:

Used composition API for all new components.
Added component or unit tests to cover functionality.

Files matching packages/editor-ui/**/*.vue:

Added E2E if adding new features.
Used design system tokens (colors, spacings...) where possible.

Files matching packages/editor-ui/src/mixins/**:

Avoided adding new mixins (use composables instead). Only removed code from here.

Files matching packages/editor-ui/src/views/NodeView.vue:

Avoided adding code here. Only refactored to make it smaller.

Make sure to check off this list before asking for review.

codecov · 2023-05-23T11:25:56Z

Codecov Report

Patch coverage: 14.28% and project coverage change: -0.01 ⚠️

Comparison is base (2d13b3f) 27.65% compared to head (ef42bf9) 27.65%.

❗ Current head ef42bf9 differs from pull request most recent head 3c2e0ff. Consider uploading reports for the commit 3c2e0ff to get more accurate results

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #6302      +/-   ##
==========================================
- Coverage   27.65%   27.65%   -0.01%     
==========================================
  Files        2948     2948              
  Lines      180860   180927      +67     
  Branches    19642    19648       +6     
==========================================
+ Hits        50019    50033      +14     
- Misses     130094   130147      +53     
  Partials      747      747

Impacted Files	Coverage Δ
packages/editor-ui/src/views/NodeView.vue	`13.48% <0.00%> (-0.02%)`	⬇️
...ackages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts	`0.00% <0.00%> (ø)`
.../nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.ts	`0.00% <0.00%> (ø)`
...kages/editor-ui/src/components/WorkflowPreview.vue	`46.18% <16.66%> (-1.72%)`	⬇️
packages/editor-ui/src/mixins/workflowHelpers.ts	`14.49% <19.56%> (+0.65%)`	⬆️

... and 22 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

ivov

Confirmed working!

ivov · 2023-05-30T10:05:56Z

packages/editor-ui/src/mixins/__tests__/workflowHelpers.test.ts

+			expect(result).toBe(true);
+		});
+
+		it('should return true if active execution is set and mode is manual', async () => {


Suggested change

it('should return true if active execution is set and mode is manual', async () => {

it('should return true if active execution is set and mode is manual', () => {

ivov · 2023-05-30T10:06:09Z

packages/editor-ui/src/mixins/__tests__/workflowHelpers.test.ts

+			expect(result).toBe(true);
+		});
+
+		it('should return false if active execution is set and mode is not manual', async () => {


Suggested change

it('should return false if active execution is set and mode is not manual', async () => {

it('should return false if active execution is set and mode is not manual', () => {

ivov · 2023-05-30T10:07:55Z

packages/editor-ui/src/mixins/workflowHelpers.ts

-			});
-		}
+	if (shouldReplaceInputDataWithPinData()) {
+		const parentPinData = parentNode.reduce((acc: INodeExecutionData[], parentNodeName, index) => {


Suggested change

const parentPinData = parentNode.reduce((acc: INodeExecutionData[], parentNodeName, index) => {

const parentPinData = parentNode.reduce<INodeExecutionData[]>((acc, parentNodeName, index) => {

ivov · 2023-05-30T10:09:13Z

packages/editor-ui/src/views/NodeView.vue

@@ -3604,6 +3604,8 @@ export default defineComponent({
 							type: 'error',
 						});
 					}
+				} else if (json && json.command === 'setActiveExecution') {


Suggested change

} else if (json && json.command === 'setActiveExecution') {

} else if (json?.command === 'setActiveExecution') {

ivov · 2023-05-30T10:18:17Z

packages/editor-ui/src/mixins/workflowHelpers.ts

+export function shouldReplaceInputDataWithPinData() {
+	const workflowsStore = useWorkflowsStore();
+	return (
+		!workflowsStore.activeWorkflowExecution ||
+		(workflowsStore.activeWorkflowExecution &&
+			workflowsStore.activeWorkflowExecution.mode === 'manual')
+	);
+}


Or shorter:

export function shouldReplaceInputDataWithPinData() { const { activeWorkflowExecution } = useWorkflowsStore(); return !activeWorkflowExecution || activeWorkflowExecution?.mode === 'manual'; }

We could make this a getter in the workflows store? To avoid adding to mixins.

github-actions · 2023-05-30T10:34:16Z

✅ All Cypress E2E specs passed

…ements

github-actions · 2023-06-01T14:57:46Z

✅ All Cypress E2E specs passed

* master: fix(editor): Fix an issue with connections breaking during renaming (#6358) fix(core): Upgrade @n8n_io/riot-tmpl (no-changelog) (#6357) fix: Show actual execution data for production executions even if pin data exists (#6302) fix: Improve executions list polling performance (#6355) refactor: Revert 30k stars banner (no-changelog) (#6347) refactor: Add deprecation notice for basic auth and JWT auth (#6349) fix: Prevent redirect when outside of executions home (no-changelog) (#6305)

janober · 2023-06-14T11:07:30Z

Got released with [email protected]

… data exists (#6302)

fix: show actual execution data for production executions even if pin…

fe06348

… data exists

fix: small refactoring

b5f62e9

n8n-assistant bot added n8n team Authored by the n8n team ui Enhancement in /editor-ui or /design-system labels May 23, 2023

alexgrozav added 2 commits May 23, 2023 14:30

test: add tests for helper function (no-changelog)

2f40037

fix: remove commented code

ef42bf9

ivov previously approved these changes May 30, 2023

View reviewed changes

fix: shouldReplaceInputDataWithPinData code simplification and improv…

80948a7

…ements

alexgrozav dismissed ivov’s stale review via 80948a7 June 1, 2023 09:26

fix: move pinning getter tests to workflows store tests

3c2e0ff

ivov approved these changes Jun 1, 2023

View reviewed changes

alexgrozav merged commit 4eb8437 into master Jun 1, 2023

alexgrozav deleted the pay-216-ndv-in-executions-view-shows-wrong-data branch June 1, 2023 16:12

janober added the Released label Jun 14, 2023

netroy pushed a commit that referenced this pull request Jun 14, 2023

fix: Show actual execution data for production executions even if pin…

f9a61c2

… data exists (#6302)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

alexgrozav commented May 23, 2023

github-actions bot commented May 23, 2023

codecov bot commented May 23, 2023 •

edited

Loading

ivov left a comment

ivov May 30, 2023

ivov May 30, 2023

ivov May 30, 2023

ivov May 30, 2023

ivov May 30, 2023

ivov May 30, 2023

github-actions bot commented May 30, 2023

github-actions bot commented Jun 1, 2023

janober commented Jun 14, 2023

	it('should return true if active execution is set and mode is manual', async () => {
	it('should return true if active execution is set and mode is manual', () => {

	it('should return false if active execution is set and mode is not manual', async () => {
	it('should return false if active execution is set and mode is not manual', () => {

	const parentPinData = parentNode.reduce((acc: INodeExecutionData[], parentNodeName, index) => {
	const parentPinData = parentNode.reduce<INodeExecutionData[]>((acc, parentNodeName, index) => {

	} else if (json && json.command === 'setActiveExecution') {
	} else if (json?.command === 'setActiveExecution') {

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

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

Conversation

alexgrozav commented May 23, 2023

github-actions bot commented May 23, 2023

codecov bot commented May 23, 2023 • edited Loading

Codecov Report

ivov left a comment

Choose a reason for hiding this comment

ivov May 30, 2023

Choose a reason for hiding this comment

ivov May 30, 2023

Choose a reason for hiding this comment

ivov May 30, 2023

Choose a reason for hiding this comment

ivov May 30, 2023

Choose a reason for hiding this comment

ivov May 30, 2023

Choose a reason for hiding this comment

ivov May 30, 2023

Choose a reason for hiding this comment

github-actions bot commented May 30, 2023

github-actions bot commented Jun 1, 2023

janober commented Jun 14, 2023

codecov bot commented May 23, 2023 •

edited

Loading