Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Manually reverted PR 11716 Do not assign all paired items (no-changelog) #13429

Merged
merged 5 commits into from
Feb 21, 2025

Conversation

ShireenMissi
Copy link
Contributor

Summary

This PR reverts #11716

Related Linear tickets, Github issues, and Community forum posts

https://linear.app/n8n/issue/NODE-2449/paired-items-are-removed

Review / Merge checklist

  • PR title and summary are descriptive. (conventions)
  • Docs updated or follow-up ticket created.
  • Tests included.
  • PR Labeled with release/backport (if the PR is an urgent fix that needs to be backported)

}
}
}

return workflowResult;
} catch (error) {
const pairedItem = generatePairedItemData(items.length);
Copy link
Contributor Author

@ShireenMissi ShireenMissi Feb 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file had conflicts and I didn't add the PairedItems back to not break the new logic return [

	[
							{
								json: { error: error.message },
								metadata,
							},
						],
					];

it was like this before the reverted PR
return [[{ json: { error: error.message }, pairedItem }]];

@ShireenMissi ShireenMissi changed the title fix: Manually reverted PR 11716 Do not assign all paired items (no-changelog) (no-changelog) fix: Manually reverted PR 11716 Do not assign all paired items (no-changelog) Feb 21, 2025
Joffcom
Joffcom previously approved these changes Feb 21, 2025
@dana-gill dana-gill requested a review from elsmr February 21, 2025 18:23
@n8n-assistant n8n-assistant bot added n8n team Authored by the n8n team node/improvement New feature or request labels Feb 21, 2025
Copy link
Contributor

✅ All Cypress E2E specs passed

Copy link

cypress bot commented Feb 21, 2025

n8n    Run #9425

Run Properties:  status check passed Passed #9425  •  git commit 2ef6f111d0: 🌳 master 🖥️ browsers:node18.12.0-chrome107 🤖 PR User 🗃️ e2e/*
Project n8n
Branch Review master
Run status status check passed Passed #9425
Run duration 04m 34s
Commit git commit 2ef6f111d0: 🌳 master 🖥️ browsers:node18.12.0-chrome107 🤖 PR User 🗃️ e2e/*
Committer Shireen Missi
View all properties for this run ↗︎

Test results
Tests that failed  Failures 0
Tests that were flaky  Flaky 2
Tests that did not run due to a developer annotating a test with .skip  Pending 5
Tests that did not run due to a failure in a mocha hook  Skipped 0
Tests that passed  Passing 437
View all changes introduced in this branch ↗︎

@ShireenMissi ShireenMissi force-pushed the node-2449-paired-items-are-removed branch from 86a66e5 to 72adfec Compare February 21, 2025 18:53
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original PR changed also the catch handler:

image

Should we change it to:

			} catch (error) {
				const pairedItem = generatePairedItemData(items.length);
				if (this.continueOnFail()) {
					const metadata = parseErrorMetadata(error);
					return [
						[
							{
								json: { error: error.message },
								metadata,
								pairedItem
							},
						],
					];
				}
				throw error;
			}
		}

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uff sorry, posted this to wrong file

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I meant packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.ts

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wasn't sure if I should chain metadata and pairedItem, I will do that just in case

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TBH I don't know. Just by looking at it, it seems to contain linkage between the workflow and execution, where as the paired item is linkage between items within the execution

@ShireenMissi ShireenMissi added the release/backport Changes that need to be backported to older releases. label Feb 21, 2025
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not in the original PR?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, I had to fix the test
the google sheet PR was merged after the original PR

Copy link
Collaborator

@tomi tomi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚀

Copy link
Contributor

✅ All Cypress E2E specs passed

@ShireenMissi ShireenMissi merged commit 2ef6f11 into master Feb 21, 2025
38 checks passed
@ShireenMissi ShireenMissi deleted the node-2449-paired-items-are-removed branch February 21, 2025 19:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
n8n team Authored by the n8n team node/improvement New feature or request release/backport Changes that need to be backported to older releases.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants