fix: Account for nanoid workflow ids for subworkflow execute policy #7094

krynble · 2023-09-04T11:26:50Z

Github issue / Community forum post (link here to close automatically):

Since the change to allow workflow IDs to become strings in Nano ID formats, this input broke.

This PR allows all characters that comprise workflow IDs.

github-actions · 2023-09-04T11:27:05Z

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.

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

ivov

Can we add a test for this?

cypress · 2023-09-04T11:49:00Z

1 flaky test on run #2150 ↗︎

0	238	0	0	1

Details:

🌳 pay-763-selected-workflows-setting-with-new-id-format 🖥️ browsers:node18.12....
Project: n8n	Commit: `264db1cd59`
Status: Passed	Duration: 07:41 💡
Started: Sep 12, 2023 3:50 PM	Ended: Sep 12, 2023 3:57 PM

cypress/e2e/2-credentials.cy.ts • 1 flaky test

View Output Video

Test		Artifacts
Credentials > should create a new credential using Add Credential button		`Output` `Screenshots` `Video`

_{This comment has been generated by cypress-bot as a result of this
project's GitHub integration settings.}

github-actions · 2023-09-04T11:49:05Z

✅ All Cypress E2E specs passed

codecov · 2023-09-04T11:49:54Z

Codecov Report

Patch coverage: 100.00% and project coverage change: +0.43% 🎉

Comparison is base (0a35025) 31.95% compared to head (264db1c) 32.39%.
Report is 8 commits behind head on master.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #7094      +/-   ##
==========================================
+ Coverage   31.95%   32.39%   +0.43%     
==========================================
  Files        3274     3277       +3     
  Lines      197826   197963     +137     
  Branches    21569    21647      +78     
==========================================
+ Hits        63212    64125     +913     
+ Misses     133558   132777     -781     
- Partials     1056     1061       +5

Files Changed	Coverage Δ
...ages/editor-ui/src/components/WorkflowSettings.vue	`80.59% <100.00%> (+80.59%)`	⬆️
...ages/editor-ui/src/composables/useExternalHooks.ts	`100.00% <100.00%> (ø)`

... and 30 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

mutdmour

nice.. one minor comment

mutdmour · 2023-09-12T15:44:23Z

packages/editor-ui/src/components/WorkflowSettings.vue

@@ -566,9 +565,9 @@ export default defineComponent({
 	},
 	methods: {
 		onCallerIdsInput(str: string) {
-			this.workflowSettings.callerIds = /^[0-9,\s]+$/.test(str)
+			this.workflowSettings.callerIds = /^[a-zA-Z0-9,\s]+$/.test(str)


nitpick - maybe this could be a constant then? instead of this being a magic value and have to update it in two places

Suggested change

this.workflowSettings.callerIds = /^[a-zA-Z0-9,\s]+$/.test(str)

this.workflowSettings.callerIds = WORKFLOW_NANO_ID_REGEX.test(str)

They are slightly different, one contains the g modifier at the end, so I don't know if we can combine them.

ah missed that.. you can if you use new RegExp I guess but not a big deal

github-actions · 2023-09-12T15:58:04Z

✅ All Cypress E2E specs passed

# [1.7.0](https://github.com/n8n-io/n8n/compare/n8n@1.6.0...n8n@1.7.0) (2023-09-13) ### Bug Fixes * **Code Node:** Disable WASM to address CVE-2023-37903 ([#7122](#7122)) ([36a8e91](36a8e91)) * **Code Node:** Upgrade vm2 to address CVE-2023-37466 ([#7123](#7123)) ([0a35025](0a35025)) * **core:** Disable Node.js custom inspection to address CVE-2023-37903 ([#7125](#7125)) ([a223734](a223734)), closes [#7122](#7122) * **editor** Account for nanoid workflow ids for subworkflow execute policy ([#7094](#7094)) ([67092c0](67092c0)) * **editor:** Unbind workflow endpoint events in case of workspace reset ([#7129](#7129)) ([c9b7948](c9b7948)) * **editor:** Update git repo url validation regex ([#7151](#7151)) ([e51f173](e51f173)) * **Google Cloud Firestore Node:** Fix empty string interpreted as number ([#7136](#7136)) ([915cfa0](915cfa0)) * **HubSpot Node:** Fix issue with contact lists not working ([#5582](#5582)) ([6e5a4f6](6e5a4f6)) * **Postgres Node:** Fix automatic column mapping ([#7121](#7121)) ([92af131](92af131)) * **Zoho CRM Node:** Fix issue with Sales Order not updating ([#6959](#6959)) ([fd800b6](fd800b6)) ### Features * **core:** Add an option to enable WAL mode for SQLite ([#7118](#7118)) ([1d1a022](1d1a022)) * **core:** Add commands to workers to respond with current state ([#7029](#7029)) ([7b49cf2](7b49cf2)) * **Salesforce Node:** Add fax field to lead option ([#7030](#7030)) ([01f875a](01f875a)) Co-authored-by: netroy <netroy@users.noreply.github.com>

# [1.7.0](https://github.com/n8n-io/n8n/compare/n8n@1.6.0...n8n@1.7.0) (2023-09-13) ### Bug Fixes * **Code Node:** Disable WASM to address CVE-2023-37903 ([#7122](#7122)) ([36a8e91](36a8e91)) * **Code Node:** Upgrade vm2 to address CVE-2023-37466 ([#7123](#7123)) ([0a35025](0a35025)) * **core:** Disable Node.js custom inspection to address CVE-2023-37903 ([#7125](#7125)) ([a223734](a223734)) * **editor** Account for nanoid workflow ids for subworkflow execute policy ([#7094](#7094)) ([67092c0](67092c0)) * **editor:** Tweak hover area of workflow / cred cards ([#7108](#7108)) ([217de21](217de21)) * **editor:** Unbind workflow endpoint events in case of workspace reset ([#7129](#7129)) ([c9b7948](c9b7948)) * **editor:** Update git repo url validation regex ([#7151](#7151)) ([e51f173](e51f173)) * **Google Cloud Firestore Node:** Fix empty string interpreted as number ([#7136](#7136)) ([915cfa0](915cfa0)) * **HubSpot Node:** Fix issue with contact lists not working ([#5582](#5582)) ([6e5a4f6](6e5a4f6)) * **Postgres Node:** Fix automatic column mapping ([#7121](#7121)) ([92af131](92af131)) * **Zoho CRM Node:** Fix issue with Sales Order not updating ([#6959](#6959)) ([fd800b6](fd800b6)) ### Features * **core:** Add an option to enable WAL mode for SQLite ([#7118](#7118)) ([1d1a022](1d1a022)) * **core:** Add commands to workers to respond with current state ([#7029](#7029)) ([7b49cf2](7b49cf2)) * **Salesforce Node:** Add fax field to lead option ([#7030](#7030)) ([01f875a](01f875a)) Co-authored-by: netroy <netroy@users.noreply.github.com>

janober · 2023-09-14T10:04:32Z

Got released with n8n@1.7.1

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

cstuncsik previously approved these changes Sep 4, 2023

View reviewed changes

ivov reviewed Sep 4, 2023

View reviewed changes

krynble dismissed cstuncsik’s stale review via ec89f14 September 5, 2023 11:27

krynble marked this pull request as draft September 5, 2023 11:27

krynble force-pushed the pay-763-selected-workflows-setting-with-new-id-format branch from 02ae97a to 3aa4014 Compare September 6, 2023 08:05

krynble and others added 3 commits September 7, 2023 14:32

fix: Account for nanoid workflow ids for subworkflow execute policy

80ec628

wip: add tests to workflow settings

efea40a

Add vue.nextTick()

ff9b70f

krynble force-pushed the pay-763-selected-workflows-setting-with-new-id-format branch 2 times, most recently from 6e3f19c to 587acbc Compare September 8, 2023 14:08

test: Add tests for workflow settings modal

264db1c

krynble force-pushed the pay-763-selected-workflows-setting-with-new-id-format branch from 587acbc to 264db1c Compare September 8, 2023 14:10

krynble marked this pull request as ready for review September 8, 2023 14:10

mutdmour approved these changes Sep 12, 2023

View reviewed changes

krynble merged commit 67092c0 into master Sep 13, 2023
56 of 57 checks passed

krynble deleted the pay-763-selected-workflows-setting-with-new-id-format branch September 13, 2023 07:57

github-actions bot mentioned this pull request Sep 13, 2023

🚀 Release 1.7.0 #7158

Merged

github-actions bot mentioned this pull request Sep 13, 2023

🚀 Release 1.7.0 #7162

Merged

janober added the Released label Sep 14, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Account for nanoid workflow ids for subworkflow execute policy #7094

fix: Account for nanoid workflow ids for subworkflow execute policy #7094

krynble commented Sep 4, 2023

github-actions bot commented Sep 4, 2023 •

edited

Loading

ivov left a comment

cypress bot commented Sep 4, 2023 •

edited

Loading

github-actions bot commented Sep 4, 2023

codecov bot commented Sep 4, 2023 •

edited

Loading

mutdmour left a comment

mutdmour Sep 12, 2023

krynble Sep 12, 2023

mutdmour Sep 12, 2023

github-actions bot commented Sep 12, 2023

janober commented Sep 14, 2023

	this.workflowSettings.callerIds = /^[a-zA-Z0-9,\s]+$/.test(str)
	this.workflowSettings.callerIds = WORKFLOW_NANO_ID_REGEX.test(str)

fix: Account for nanoid workflow ids for subworkflow execute policy #7094

fix: Account for nanoid workflow ids for subworkflow execute policy #7094

Conversation

krynble commented Sep 4, 2023

github-actions bot commented Sep 4, 2023 • edited Loading

ivov left a comment

Choose a reason for hiding this comment

cypress bot commented Sep 4, 2023 • edited Loading

1 flaky test on run #2150 ↗︎

github-actions bot commented Sep 4, 2023

codecov bot commented Sep 4, 2023 • edited Loading

Codecov Report

mutdmour left a comment

Choose a reason for hiding this comment

mutdmour Sep 12, 2023

Choose a reason for hiding this comment

krynble Sep 12, 2023

Choose a reason for hiding this comment

mutdmour Sep 12, 2023

Choose a reason for hiding this comment

github-actions bot commented Sep 12, 2023

janober commented Sep 14, 2023

github-actions bot commented Sep 4, 2023 •

edited

Loading

cypress bot commented Sep 4, 2023 •

edited

Loading

codecov bot commented Sep 4, 2023 •

edited

Loading