From 832d08776c0e572c9d967365b48ec0af4211cf3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= Date: Thu, 17 Aug 2023 12:28:32 +0200 Subject: [PATCH 01/10] fix(editor): Fix formatting on editors (no-changelog) (#6953) Prettier 3 has a [new package structure](https://prettier.io/blog/2023/07/05/3.0.0.html#npm-package-file-structures-changed-12740httpsgithubcomprettierprettierpull12740-by-fiskerhttpsgithubcomfisker-13530httpsgithubcomprettierprettierpull13530-by-fiskerhttpsgithubcomfisker-14570httpsgithubcomprettierprettierpull14570-by-fiskerhttpsgithubcomfisker), made `format` async, and requires `estree` in specific cases. e2e run: https://github.com/n8n-io/n8n/actions/runs/5889270624 --- .../CodeNodeEditor/CodeNodeEditor.vue | 9 ++++--- .../src/components/HtmlEditor/HtmlEditor.vue | 25 ++++++++++--------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue index 14401cd10fb69..0727a4401fced 100644 --- a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue +++ b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue @@ -42,8 +42,9 @@ + + diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json index 3cc1d63ccd200..e4641639a5700 100644 --- a/packages/editor-ui/src/plugins/i18n/locales/en.json +++ b/packages/editor-ui/src/plugins/i18n/locales/en.json @@ -115,6 +115,7 @@ "auth.signup.setupYourAccount": "Set up your account", "auth.signup.setupYourAccountError": "Problem setting up your account", "auth.signup.tokenValidationError": "Issue validating invite token", + "banners.nonProductionLicense.message": "This n8n instance is not licensed for production purposes!", "banners.trial.message": "1 day left in your n8n trial | {count} days left in your n8n trial", "banners.trialOver.message": "Your trial is over. Upgrade now to keep automating.", "banners.v1.message": "n8n has been updated to version 1, introducing some breaking changes. Please consult the migration guide for more information.", diff --git a/packages/editor-ui/src/stores/settings.store.ts b/packages/editor-ui/src/stores/settings.store.ts index 5fbc12ceeb41f..9b8dcd758031b 100644 --- a/packages/editor-ui/src/stores/settings.store.ts +++ b/packages/editor-ui/src/stores/settings.store.ts @@ -198,6 +198,9 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, { this.saml.loginEnabled = settings.sso.saml.loginEnabled; this.saml.loginLabel = settings.sso.saml.loginLabel; } + if (settings.enterprise?.showNonProdBanner) { + useUIStore().banners.NON_PRODUCTION_LICENSE.dismissed = false; + } }, async getSettings(): Promise { const rootStore = useRootStore(); diff --git a/packages/editor-ui/src/stores/ui.store.ts b/packages/editor-ui/src/stores/ui.store.ts index c3c51cae2680c..f3fe6c6b4a85b 100644 --- a/packages/editor-ui/src/stores/ui.store.ts +++ b/packages/editor-ui/src/stores/ui.store.ts @@ -56,7 +56,7 @@ import { i18n as locale } from '@/plugins/i18n'; import { useTelemetryStore } from '@/stores/telemetry.store'; import { getStyleTokenValue } from '@/utils/htmlUtils'; import { dismissBannerPermanently } from '@/api/ui'; -import type { Banners } from 'n8n-workflow'; +import type { BannerName } from 'n8n-workflow'; export const useUIStore = defineStore(STORES.UI, { state: (): UIState => ({ @@ -176,6 +176,7 @@ export const useUIStore = defineStore(STORES.UI, { V1: { dismissed: true }, TRIAL: { dismissed: true }, TRIAL_OVER: { dismissed: true }, + NON_PRODUCTION_LICENSE: { dismissed: true }, }, bannersHeight: 0, }), @@ -333,12 +334,6 @@ export const useUIStore = defineStore(STORES.UI, { }, }, actions: { - setBanners(banners: UIState['banners']): void { - this.banners = { - ...this.banners, - ...banners, - }; - }, setMode(name: keyof Modals, mode: string): void { this.modals[name] = { ...this.modals[name], @@ -541,7 +536,7 @@ export const useUIStore = defineStore(STORES.UI, { } }, async dismissBanner( - name: Banners, + name: BannerName, type: 'temporary' | 'permanent' = 'temporary', ): Promise { if (type === 'permanent') { @@ -556,7 +551,7 @@ export const useUIStore = defineStore(STORES.UI, { this.banners[name].dismissed = true; this.banners[name].type = 'temporary'; }, - showBanner(name: Banners): void { + showBanner(name: BannerName): void { this.banners[name].dismissed = false; }, updateBannersHeight(newHeight: number): void { diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts index 00fc5ecab503e..a1a403ff0595b 100644 --- a/packages/workflow/src/Interfaces.ts +++ b/packages/workflow/src/Interfaces.ts @@ -2203,4 +2203,4 @@ export interface IN8nUISettings { }; } -export type Banners = 'V1' | 'TRIAL_OVER' | 'TRIAL'; +export type BannerName = 'V1' | 'TRIAL_OVER' | 'TRIAL' | 'NON_PRODUCTION_LICENSE'; From b312f2ee548102399c8dd194024e31cba5e2df97 Mon Sep 17 00:00:00 2001 From: Csaba Tuncsik Date: Thu, 17 Aug 2023 14:19:13 +0200 Subject: [PATCH 05/10] fix(editor): Fix telemetry initialization (no-changelog) (#6950) --- packages/editor-ui/src/plugins/telemetry/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/editor-ui/src/plugins/telemetry/index.ts b/packages/editor-ui/src/plugins/telemetry/index.ts index e5fec616c28a7..d25fe52dc4844 100644 --- a/packages/editor-ui/src/plugins/telemetry/index.ts +++ b/packages/editor-ui/src/plugins/telemetry/index.ts @@ -36,7 +36,7 @@ export class Telemetry { versionCli: string; }, ) { - if (!telemetrySettings.enabled || !telemetrySettings.config || this.rudderStack) return; + if (!telemetrySettings.enabled || !telemetrySettings.config) return; const { config: { key, url }, From e6cff3fce4de1644b75b07318fe561f721aee51c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= Date: Thu, 17 Aug 2023 14:22:28 +0200 Subject: [PATCH 06/10] fix(editor): Fix Remove all fields not removing values in resource mapper (#6940) Github issue / Community forum post (link here to close automatically): --- .../N8nActionToggle/ActionToggle.vue | 1 + .../components/N8nInputLabel/InputLabel.vue | 2 +- .../src/components/ParameterInputWrapper.vue | 2 +- .../ResourceMapper/MappingFields.vue | 5 +- .../ResourceMapper/MatchingColumnsSelect.vue | 45 +++++++++++++++ .../ResourceMapper/ResourceMapper.vue | 56 +++++++++++-------- .../__tests__/ResourceMapper.test.ts | 55 +++++++++++++++++- .../__tests__/utils/ResourceMapper.utils.ts | 23 ++++---- 8 files changed, 149 insertions(+), 40 deletions(-) diff --git a/packages/design-system/src/components/N8nActionToggle/ActionToggle.vue b/packages/design-system/src/components/N8nActionToggle/ActionToggle.vue index 4b92dd4d74780..f555db6eb1df2 100644 --- a/packages/design-system/src/components/N8nActionToggle/ActionToggle.vue +++ b/packages/design-system/src/components/N8nActionToggle/ActionToggle.vue @@ -21,6 +21,7 @@ :key="action.value" :command="action.value" :disabled="action.disabled" + :data-test-id="`action-${action.value}`" > {{ action.label }}
diff --git a/packages/design-system/src/components/N8nInputLabel/InputLabel.vue b/packages/design-system/src/components/N8nInputLabel/InputLabel.vue index 38c340380fe94..f029f16722a9f 100644 --- a/packages/design-system/src/components/N8nInputLabel/InputLabel.vue +++ b/packages/design-system/src/components/N8nInputLabel/InputLabel.vue @@ -36,7 +36,7 @@
diff --git a/packages/editor-ui/src/components/ParameterInputWrapper.vue b/packages/editor-ui/src/components/ParameterInputWrapper.vue index a0246a7fc6ab1..3d4e86975f7f3 100644 --- a/packages/editor-ui/src/components/ParameterInputWrapper.vue +++ b/packages/editor-ui/src/components/ParameterInputWrapper.vue @@ -1,5 +1,5 @@