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(core): Fix frontend.settings external hook execution #7496

Merged

Conversation

RicardoE105
Copy link
Contributor

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

@github-actions
Copy link
Contributor

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.

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

@RicardoE105 RicardoE105 changed the title await promise before passing settings fix: await promise before passing settings so they n8nMetadata can be injected Oct 23, 2023
@RicardoE105 RicardoE105 changed the title fix: await promise before passing settings so they n8nMetadata can be injected fix: await promise before passing settings so they n8nMetadata can be injected (no-changelog) Oct 23, 2023
@RicardoE105 RicardoE105 changed the title fix: await promise before passing settings so they n8nMetadata can be injected (no-changelog) fix: Await promise before passing settings so they n8nMetadata can be injected (no-changelog) Oct 23, 2023
mutdmour
mutdmour previously approved these changes Oct 23, 2023
packages/cli/src/Server.ts Outdated Show resolved Hide resolved
@cypress
Copy link

cypress bot commented Oct 23, 2023

Passing run #2551 ↗︎

0 258 0 0 Flakiness 0

Details:

🌳 🖥️ browsers:node18.12.0-chrome107 🤖 RicardoE105 🗃️ e2e/*
Project: n8n Commit: d9c55a378d
Status: Passed Duration: 09:42 💡
Started: Oct 23, 2023 3:07 PM Ended: Oct 23, 2023 3:16 PM

Review all test suite changes for PR #7496 ↗︎

@n8n-assistant n8n-assistant bot added core Enhancement outside /nodes-base and /editor-ui n8n team Authored by the n8n team labels Oct 23, 2023
@github-actions
Copy link
Contributor

✅ All Cypress E2E specs passed

@codecov
Copy link

codecov bot commented Oct 23, 2023

Codecov Report

Attention: 6 lines in your changes are missing coverage. Please review.

Comparison is base (b6de910) 33.55% compared to head (d9c55a3) 33.55%.
Report is 1 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #7496   +/-   ##
=======================================
  Coverage   33.55%   33.55%           
=======================================
  Files        3399     3399           
  Lines      207444   207455   +11     
  Branches    22417    22415    -2     
=======================================
+ Hits        69602    69621   +19     
+ Misses     136714   136706    -8     
  Partials     1128     1128           
Files Coverage Δ
packages/cli/src/services/frontend.service.ts 0.00% <0.00%> (ø)

... and 7 files with indirect coverage changes

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

@@ -198,7 +198,7 @@ export class FrontendService {
this.writeStaticJSON('credentials', credentials);
}

async getSettings(): Promise<IN8nUISettings> {
getSettings(): IN8nUISettings {
Copy link
Member

Choose a reason for hiding this comment

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

While we are at it, I think we should add some simple unit tests to cover this case.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will do after all the metings 💀

@netroy netroy changed the title fix: Await promise before passing settings so they n8nMetadata can be injected (no-changelog) fix(core): Fix frontend.settings external hook execution Oct 23, 2023
Copy link
Member

@netroy netroy left a comment

Choose a reason for hiding this comment

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

Let's do tests in another PR, so that we can release this without rushing the tests.

@github-actions
Copy link
Contributor

✅ All Cypress E2E specs passed

@RicardoE105 RicardoE105 merged commit 774fe20 into master Oct 23, 2023
61 checks passed
@RicardoE105 RicardoE105 deleted the ado-1245-bug-1121-does-not-set-n8nmetadata-in-settings branch October 23, 2023 15:46
@github-actions github-actions bot mentioned this pull request Oct 24, 2023
netroy added a commit that referenced this pull request Oct 24, 2023
## [1.12.2](https://github.com/n8n-io/n8n/compare/n8n@1.12.1...n8n@1.12.2)
(2023-10-24)


### Bug Fixes

* **core:** Fix `frontend.settings` external hook execution
([#7496](#7496))
([e8294b1](e8294b1))
* **MQTT Trigger Node:** Fix node causing a start up hang when active
([#7498](#7498))
([ede3047](ede3047))
* **Redis Node:** Fix adding sets data types
([#7444](#7444))
([27b5543](27b5543)),
closes [#6339](#6339)

Co-authored-by: netroy <netroy@users.noreply.github.com>
@janober
Copy link
Member

janober commented Oct 24, 2023

Got released with n8n@1.12.2

@github-actions github-actions bot mentioned this pull request Oct 25, 2023
netroy added a commit that referenced this pull request Oct 25, 2023
# [1.13.0](https://github.com/n8n-io/n8n/compare/n8n@1.12.0...n8n@1.13.0)
(2023-10-25)


### Bug Fixes

* **core:** Do not return `inviteAcceptUrl` in response if email was
sent ([#7465](#7465))
([55c6a1b](55c6a1b))
* **core:** Ensure nodes post-processors run in the correct order
([#7500](#7500))
([6f45298](6f45298))
* **core:** Fix `frontend.settings` external hook execution
([#7496](#7496))
([774fe20](774fe20))
* **core:** Handle gzip and deflate compressed request payloads
([#7461](#7461))
([83762e0](83762e0))
* **core:** Reduce logging overhead for levels that do not output
([#7479](#7479))
([76c0481](76c0481))
* **Customer.io Node:** Fix api endpoint when using EU region
([#7485](#7485))
([519680c](519680c))
* **editor:** Allow importing the same workflow multiple times
([#7458](#7458))
([3c0a166](3c0a166))
* **editor:** Fix canvas selection breaking after interacting with node
actions ([#7466](#7466))
([bc47365](bc47365))
* **editor:** Fix connections disappearing after reactivating canvas and
renaming a node ([#7483](#7483))
([450e0cc](450e0cc))
* **Google Sheets Node:** Append or update runs forever when without
column headers ([#7463](#7463))
([ab6a9bb](ab6a9bb))
* **Microsoft SQL Node:** Prevent SQL injection
([#7467](#7467))
([a739245](a739245))
* **MQTT Trigger Node:** Fix node causing a start up hang when active
([#7498](#7498))
([baecb93](baecb93))
* **MySQL Node:** Resolve expressions in v1
([#7464](#7464))
([5c46bb0](5c46bb0))
* **Redis Node:** Fix adding sets data types
([#7444](#7444))
([4e66023](4e66023))
* **Spreadsheet File Node:** Fix include empty cells not working with v2
([#7505](#7505))
([05e6f2a](05e6f2a))


### Features

* **core:** Add support for oauth based service accounts with UM SMTP
([#7311](#7311))
([647372b](647372b))
* **editor:** Add PH tracking to event
([#7511](#7511))
([c47d27d](c47d27d))
* **Facebook Lead Ads Trigger Node:** Add Facebook Lead Ads Trigger Node
([#7113](#7113))
([ac814a9](ac814a9))
* **Ghost Node:** Add support for lexical format
([#7488](#7488))
([7b1973c](7b1973c))
* **RSS Feed Trigger Node:** Add RSS feed trigger node
([#7386](#7386))
([689360e](689360e))

Co-authored-by: netroy <netroy@users.noreply.github.com>
MiloradFilipovic added a commit that referenced this pull request Oct 25, 2023
* master: (30 commits)
  🚀 Release 1.14.0 (#7514)
  ci: Fix oclif manifest generation
  feat(Switch Node): Add support for infinite Switch outputs (#7499)
  🚀 Release 1.13.0 (#7512)
  fix(core): Ensure nodes post-processors run in the correct order (#7500)
  feat(editor): Add PH tracking to event (#7511)
  fix(core): Fix workflow activation with history and workflow history for EE (no-changelog) (#7508)
  refactor(core): Make executions pruning more resilient (#7480)
  fix(Spreadsheet File Node): Fix include empty cells not working with v2 (#7505)
  fix(core): Create instance settings directory recursively (no-changelog) (#7506)
  fix(Microsoft SQL Node): Prevent SQL injection (#7467)
  refactor(core): Make pruning via lifecycle configuration in S3 mode mandatory (#7482)
  fix(core): Always derive `instanceId` from the encryption key (no-changlog) (#7501)
  fix(MQTT Trigger Node): Fix node causing a start up hang when active (#7498)
  feat: Collect usage metrics on license renewal (no-changelog) (#7486)
  fix(core): Fix `frontend.settings` external hook execution (#7496)
  fix(Redis Node): Fix adding sets data types (#7444)
  fix: Save new version of the workflow instead of the previous (no-changelog) (#7428)
  refactor(core): Abstract away InstanceSettings and `encryptionKey` into injectable services (no-changelog) (#7471)
  fix(Customer.io Node): Fix api endpoint when using EU region (#7485)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core Enhancement outside /nodes-base and /editor-ui n8n team Authored by the n8n team Released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants