From da0315d5857cdcd39a7d1e1df2fe2b37145f840e Mon Sep 17 00:00:00 2001 From: Alex Grozav Date: Tue, 25 Jul 2023 13:13:30 +0300 Subject: [PATCH] fix: fixed param name update and credential edit --- cypress/e2e/16-webhook-node.cy.ts | 21 ++++++++++--------- .../CredentialEdit/CredentialConfig.vue | 2 +- .../CredentialEdit/CredentialEdit.vue | 2 +- .../editor-ui/src/components/NodeSettings.vue | 6 ++++++ .../src/components/ParameterInput.vue | 4 ++-- .../src/components/ParameterInputExpanded.vue | 2 +- 6 files changed, 22 insertions(+), 15 deletions(-) diff --git a/cypress/e2e/16-webhook-node.cy.ts b/cypress/e2e/16-webhook-node.cy.ts index a4df2b2cfd..6eff0542a7 100644 --- a/cypress/e2e/16-webhook-node.cy.ts +++ b/cypress/e2e/16-webhook-node.cy.ts @@ -121,13 +121,13 @@ describe('Webhook Trigger node', async () => { workflowPage.actions.addNodeToCanvas('Set'); workflowPage.actions.openNode('Set'); cy.get('.add-option').click(); - cy.get('.add-option').find('.el-select-dropdown__item').contains('Number').click(); + getVisibleSelect().find('.el-select-dropdown__item').contains('Number').click(); cy.get('.fixed-collection-parameter') .getByTestId('parameter-input-name') .clear() .type('MyValue'); cy.get('.fixed-collection-parameter').getByTestId('parameter-input-value').clear().type('1234'); - ndv.getters.backToCanvas().click(); + ndv.getters.backToCanvas().click({ force: true }); workflowPage.actions.addNodeToCanvas('Respond to Webhook'); @@ -173,10 +173,15 @@ describe('Webhook Trigger node', async () => { getVisibleSelect().find('.el-select-dropdown__item').contains('Number').click(); cy.get('.fixed-collection-parameter') .getByTestId('parameter-input-name') + .find('input') .clear() .type('MyValue'); - cy.get('.fixed-collection-parameter').getByTestId('parameter-input-value').clear().type('1234'); - ndv.getters.backToCanvas().click(); + cy.get('.fixed-collection-parameter') + .getByTestId('parameter-input-value') + .find('input') + .clear() + .type('1234'); + ndv.getters.backToCanvas().click({ force: true }); workflowPage.actions.executeWorkflow(); cy.wait(waitForWebhook); @@ -216,11 +221,7 @@ describe('Webhook Trigger node', async () => { workflowPage.actions.openNode('Move Binary Data'); cy.getByTestId('parameter-input-mode').click(); - cy.getByTestId('parameter-input-mode') - .find('.el-select-dropdown') - .find('.option-headline') - .contains('JSON to Binary') - .click(); + getVisibleSelect().find('.option-headline').contains('JSON to Binary').click(); ndv.getters.backToCanvas().click(); workflowPage.actions.executeWorkflow(); @@ -249,7 +250,7 @@ describe('Webhook Trigger node', async () => { }); }); - it('should listen for a GET request with Basic Authentication', () => { + it.only('should listen for a GET request with Basic Authentication', () => { const webhookPath = uuid(); simpleWebhookCall({ method: 'GET', diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue index 951b96efc2..8a75cfeb2b 100644 --- a/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue +++ b/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue @@ -332,7 +332,7 @@ export default defineComponent({ return this.credentialsStore.allUsableCredentialsByType[type]; }, onDataChange(event: { name: string; value: string | number | boolean | Date | null }): void { - this.$emit('change', event); + this.$emit('update', event); }, onDocumentationUrlClick(): void { this.$telemetry.track('User clicked credential modal docs link', { diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue index 149618c953..cbecace0b3 100644 --- a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue +++ b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue @@ -73,7 +73,7 @@ :mode="mode" :selectedCredential="selectedCredential" :showAuthTypeSelector="requiredCredentials" - @change="onDataChange" + @update="onDataChange" @oauth="oAuthCredentialAuthorize" @retest="retestCredential" @scrollToTop="scrollToTop" diff --git a/packages/editor-ui/src/components/NodeSettings.vue b/packages/editor-ui/src/components/NodeSettings.vue index d0a6fcc5ab..6ce049a0be 100644 --- a/packages/editor-ui/src/components/NodeSettings.vue +++ b/packages/editor-ui/src/components/NodeSettings.vue @@ -605,6 +605,8 @@ export default defineComponent({ valueChanged(parameterData: IUpdateInformation) { let newValue: NodeParameterValue; + console.log(parameterData); + if (parameterData.hasOwnProperty('value')) { // New value is given newValue = parameterData.value as string | number; @@ -768,6 +770,8 @@ export default defineComponent({ } } + console.log('after set', nodeParameters); + // Get the parameters with the now new defaults according to the // from the user actually defined parameters nodeParameters = NodeHelpers.getNodeParameters( @@ -778,6 +782,8 @@ export default defineComponent({ node, ); + console.log('after getNodeParameters', nodeParameters); + for (const key of Object.keys(nodeParameters as object)) { if (nodeParameters && nodeParameters[key] !== null && nodeParameters[key] !== undefined) { this.setValue(`parameters.${key}`, nodeParameters[key] as string); diff --git a/packages/editor-ui/src/components/ParameterInput.vue b/packages/editor-ui/src/components/ParameterInput.vue index 07606cfaaf..6d63933cea 100644 --- a/packages/editor-ui/src/components/ParameterInput.vue +++ b/packages/editor-ui/src/components/ParameterInput.vue @@ -131,14 +131,14 @@