From 75eea89273b854110fa6d1f96c7c1d78dd3b0731 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= Date: Wed, 4 May 2022 12:39:19 +0200 Subject: [PATCH 01/13] :zap: Generalize cred component positioning --- .../editor-ui/src/components/ParameterInputList.vue | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/editor-ui/src/components/ParameterInputList.vue b/packages/editor-ui/src/components/ParameterInputList.vue index 89d2d3b838..e874e7b092 100644 --- a/packages/editor-ui/src/components/ParameterInputList.vue +++ b/packages/editor-ui/src/components/ParameterInputList.vue @@ -134,10 +134,18 @@ export default mixins( return this.$store.getters.activeNode; }, indexToShowSlotAt (): number { - if (this.node.type === HTTP_REQUEST_NODE_TYPE && this.node.typeVersion === 2) { + // edge cases: credential with two dependencies + if ( + (this.node.type === HTTP_REQUEST_NODE_TYPE && this.node.typeVersion === 2) || + this.node.type === 'n8n-nodes-base.sentryIo' + ) { return 2; } + if (this.nodeValues.parameters.authentication !== undefined) { + return 1; + } + return 0; }, }, From 2eaf05ea216091b58cb476171ac9251f950c2483 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= Date: Thu, 5 May 2022 09:36:53 +0200 Subject: [PATCH 02/13] :rewind: Revert "Generalize cred comp positioning" This reverts commit 75eea89273b854110fa6d1f96c7c1d78dd3b0731. --- .../editor-ui/src/components/ParameterInputList.vue | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/packages/editor-ui/src/components/ParameterInputList.vue b/packages/editor-ui/src/components/ParameterInputList.vue index e874e7b092..89d2d3b838 100644 --- a/packages/editor-ui/src/components/ParameterInputList.vue +++ b/packages/editor-ui/src/components/ParameterInputList.vue @@ -134,18 +134,10 @@ export default mixins( return this.$store.getters.activeNode; }, indexToShowSlotAt (): number { - // edge cases: credential with two dependencies - if ( - (this.node.type === HTTP_REQUEST_NODE_TYPE && this.node.typeVersion === 2) || - this.node.type === 'n8n-nodes-base.sentryIo' - ) { + if (this.node.type === HTTP_REQUEST_NODE_TYPE && this.node.typeVersion === 2) { return 2; } - if (this.nodeValues.parameters.authentication !== undefined) { - return 1; - } - return 0; }, }, From fec2fc1b085bc9a01af114eea202abb05d114a74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= Date: Thu, 5 May 2022 14:56:06 +0200 Subject: [PATCH 03/13] :zap: Consolidate HTTPRN check --- .../editor-ui/src/components/NodeCredentials.vue | 11 ++++------- .../editor-ui/src/components/ParameterInputList.vue | 4 +--- .../editor-ui/src/components/mixins/nodeHelpers.ts | 13 ++++++------- .../src/components/mixins/workflowHelpers.ts | 4 +--- 4 files changed, 12 insertions(+), 20 deletions(-) diff --git a/packages/editor-ui/src/components/NodeCredentials.vue b/packages/editor-ui/src/components/NodeCredentials.vue index 3f9d33452d..07d8a04350 100644 --- a/packages/editor-ui/src/components/NodeCredentials.vue +++ b/packages/editor-ui/src/components/NodeCredentials.vue @@ -77,7 +77,6 @@ import { showMessage } from '@/components/mixins/showMessage'; import { mapGetters } from "vuex"; import mixins from 'vue-typed-mixins'; -import { HTTP_REQUEST_NODE_TYPE } from '@/constants'; export default mixins( genericHelpers, @@ -101,14 +100,12 @@ export default mixins( getCredentialTypeByName: 'getCredentialTypeByName', }), isProxyAuth(): boolean { - return this.node.type === HTTP_REQUEST_NODE_TYPE - && this.node.typeVersion === 2 - && this.node.parameters.authenticateWith === 'nodeCredential'; + return this.isHttpRequestNodeV2(this.node) && + this.node.parameters.authenticateWith === 'nodeCredential'; }, isGenericAuth(): boolean { - return this.node.type === HTTP_REQUEST_NODE_TYPE - && this.node.typeVersion === 2 - && this.node.parameters.authenticateWith === 'genericAuth'; + return this.isHttpRequestNodeV2(this.node) && + this.node.parameters.authenticateWith === 'genericAuth'; }, credentialTypesNode (): string[] { return this.credentialTypesNodeDescription diff --git a/packages/editor-ui/src/components/ParameterInputList.vue b/packages/editor-ui/src/components/ParameterInputList.vue index 89d2d3b838..760a1dccd2 100644 --- a/packages/editor-ui/src/components/ParameterInputList.vue +++ b/packages/editor-ui/src/components/ParameterInputList.vue @@ -134,9 +134,7 @@ export default mixins( return this.$store.getters.activeNode; }, indexToShowSlotAt (): number { - if (this.node.type === HTTP_REQUEST_NODE_TYPE && this.node.typeVersion === 2) { - return 2; - } + if (this.isHttpRequestNodeV2(this.node)) return 2; return 0; }, diff --git a/packages/editor-ui/src/components/mixins/nodeHelpers.ts b/packages/editor-ui/src/components/mixins/nodeHelpers.ts index c0e4939753..b188a26007 100644 --- a/packages/editor-ui/src/components/mixins/nodeHelpers.ts +++ b/packages/editor-ui/src/components/mixins/nodeHelpers.ts @@ -43,6 +43,9 @@ export const nodeHelpers = mixins( ...mapGetters('credentials', [ 'getCredentialTypeByName', 'getCredentialsByType' ]), }, methods: { + isHttpRequestNodeV2 (node: INodeUi): boolean { + return node.type === HTTP_REQUEST_NODE_TYPE && node.typeVersion === 2; + }, // Returns the parameter value getParameterValue (nodeValues: INodeParameters, parameterName: string, path: string) { @@ -211,7 +214,7 @@ export const nodeHelpers = mixins( }; if ( - isHttpRequestNodeV2(node) && + this.isHttpRequestNodeV2(node) && authenticateWith === 'genericAuth' && selectedCredsAreUnusable(node, genericAuthType) ) { @@ -220,7 +223,7 @@ export const nodeHelpers = mixins( } if ( - isHttpRequestNodeV2(node) && + this.isHttpRequestNodeV2(node) && authenticateWith === 'nodeCredential' && nodeCredentialType !== '' && node.credentials !== undefined @@ -234,7 +237,7 @@ export const nodeHelpers = mixins( } if ( - isHttpRequestNodeV2(node) && + this.isHttpRequestNodeV2(node) && authenticateWith === 'nodeCredential' && nodeCredentialType !== '' && selectedCredsAreUnusable(node, nodeCredentialType) @@ -440,10 +443,6 @@ export const nodeHelpers = mixins( }, }); -function isHttpRequestNodeV2(node: INodeUi) { - return node.type === HTTP_REQUEST_NODE_TYPE && node.typeVersion === 2; -} - /** * Whether the node has no selected credentials, or none of the node's * selected credentials are of the specified type. diff --git a/packages/editor-ui/src/components/mixins/workflowHelpers.ts b/packages/editor-ui/src/components/mixins/workflowHelpers.ts index f00f2230fe..dfc47b3a5c 100644 --- a/packages/editor-ui/src/components/mixins/workflowHelpers.ts +++ b/packages/editor-ui/src/components/mixins/workflowHelpers.ts @@ -327,13 +327,11 @@ export const workflowHelpers = mixins( const nodeParameters = NodeHelpers.getNodeParameters(nodeType.properties, node.parameters, false, false, node); nodeData.parameters = nodeParameters !== null ? nodeParameters : {}; - const fullAccess = node.type === HTTP_REQUEST_NODE_TYPE && node.typeVersion === 2; - // Add the node credentials if there are some set and if they should be displayed if (node.credentials !== undefined && nodeType.credentials !== undefined) { const saveCredenetials: INodeCredentials = {}; for (const nodeCredentialTypeName of Object.keys(node.credentials)) { - if (fullAccess) { + if (this.isHttpRequestNodeV2(node)) { saveCredenetials[nodeCredentialTypeName] = node.credentials[nodeCredentialTypeName]; continue; } From 24b8a562a5c90f7dffb2c580b3795ab62f37d9a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= Date: Thu, 5 May 2022 14:57:00 +0200 Subject: [PATCH 04/13] :zap: Fix hue percentage to degree --- packages/design-system/theme/src/_tokens.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/design-system/theme/src/_tokens.scss b/packages/design-system/theme/src/_tokens.scss index c8b64341d4..30afd03d86 100644 --- a/packages/design-system/theme/src/_tokens.scss +++ b/packages/design-system/theme/src/_tokens.scss @@ -120,7 +120,7 @@ var(--color-warning-tint-1-l) ); - --color-warning-tint-2-h: 34%; + --color-warning-tint-2-h: 34; --color-warning-tint-2-s: 80%; --color-warning-tint-2-l: 96%; --color-warning-tint-2: hsl( From cb96d78b6ec851dc9b5899f88440e9ff1b7d1ac6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= Date: Thu, 5 May 2022 15:00:05 +0200 Subject: [PATCH 05/13] :fire: Remove unused import --- packages/editor-ui/src/components/ParameterInputList.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/editor-ui/src/components/ParameterInputList.vue b/packages/editor-ui/src/components/ParameterInputList.vue index 760a1dccd2..e684b8426f 100644 --- a/packages/editor-ui/src/components/ParameterInputList.vue +++ b/packages/editor-ui/src/components/ParameterInputList.vue @@ -104,7 +104,6 @@ import ParameterInputFull from '@/components/ParameterInputFull.vue'; import { get, set } from 'lodash'; import mixins from 'vue-typed-mixins'; -import { HTTP_REQUEST_NODE_TYPE } from '@/constants'; export default mixins( genericHelpers, From b8357e0ccd8bab51c46f36825f0deb376b01ccf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= Date: Thu, 5 May 2022 15:00:19 +0200 Subject: [PATCH 06/13] :fire: Remove unused import --- packages/editor-ui/src/components/ParameterInputList.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/editor-ui/src/components/ParameterInputList.vue b/packages/editor-ui/src/components/ParameterInputList.vue index e684b8426f..f38b149d88 100644 --- a/packages/editor-ui/src/components/ParameterInputList.vue +++ b/packages/editor-ui/src/components/ParameterInputList.vue @@ -88,7 +88,6 @@