From 39b544271d2d2aa0a910f58303b24c58d47df64c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Thu, 27 Apr 2023 21:21:53 +0200
Subject: [PATCH] refactor(editor): Add skip option to activation modal (#6092)

:zap: Add skip option to activation modal
---
 cypress/e2e/22-user-activation-modal.cy.ts            |  1 +
 cypress/pages/modals/user-activation-survey-modal.ts  |  1 +
 .../src/components/UserActivationSurveyModal.vue      | 11 +++++++++++
 packages/editor-ui/src/plugins/i18n/locales/en.json   |  1 +
 4 files changed, 14 insertions(+)

diff --git a/cypress/e2e/22-user-activation-modal.cy.ts b/cypress/e2e/22-user-activation-modal.cy.ts
index 6b8f23be2f..eb598abff6 100644
--- a/cypress/e2e/22-user-activation-modal.cy.ts
+++ b/cypress/e2e/22-user-activation-modal.cy.ts
@@ -57,6 +57,7 @@ describe('User activation survey', () => {
 			cy.wait(['@getWorkflows', '@getCredentials', '@getActive']);
 			userActivationSurveyModal.getters.modalContainer().should('be.visible');
 			userActivationSurveyModal.getters.feedbackInput().should('be.visible');
+			userActivationSurveyModal.getters.skipButton().should('be.visible');
 			userActivationSurveyModal.getters.feedbackInput().type('testing');
 			userActivationSurveyModal.getters.feedbackInput().should('have.value', 'testing');
 			userActivationSurveyModal.getters.sendFeedbackButton().click();
diff --git a/cypress/pages/modals/user-activation-survey-modal.ts b/cypress/pages/modals/user-activation-survey-modal.ts
index d47f987887..cc8f139fb6 100644
--- a/cypress/pages/modals/user-activation-survey-modal.ts
+++ b/cypress/pages/modals/user-activation-survey-modal.ts
@@ -5,5 +5,6 @@ export class UserActivationSurveyModal extends BasePage {
 		modalContainer: () => cy.getByTestId('userActivationSurvey-modal').last(),
 		feedbackInput: () => cy.getByTestId('activation-feedback-input').find('textarea'),
 		sendFeedbackButton: () => cy.getByTestId('send-activation-feedback-button'),
+		skipButton: () => cy.getByTestId('skip-button'),
 	};
 }
diff --git a/packages/editor-ui/src/components/UserActivationSurveyModal.vue b/packages/editor-ui/src/components/UserActivationSurveyModal.vue
index 3cab5fbf59..2c1d00a5e9 100644
--- a/packages/editor-ui/src/components/UserActivationSurveyModal.vue
+++ b/packages/editor-ui/src/components/UserActivationSurveyModal.vue
@@ -47,6 +47,13 @@
 		</template>
 		<template #footer>
 			<div :class="$style.modalFooter">
+				<n8n-button
+					size="large"
+					type="secondary"
+					data-test-id="skip-button"
+					:label="locale.baseText('userActivationSurveyModal.form.button.skip')"
+					@click="onSkip"
+				/>
 				<n8n-button
 					:disabled="!hasAnyChanges"
 					@click="onShareFeedback"
@@ -100,6 +107,10 @@ const onShareFeedback = () => {
 	modalBus.emit('close');
 };
 
+const onSkip = () => {
+	modalBus.emit('close');
+};
+
 const getCurrentSettings = () => {
 	return userStore.currentUser?.settings;
 };
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 44dd779f20..0c617ecca8 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -1806,6 +1806,7 @@
 	"userActivationSurveyModal.description.savedTime": "for the first time. Looks like n8n just saved you some time! Can you help us make n8n even better and answer the following question?",
 	"userActivationSurveyModal.form.label": "What almost stopped you from creating this workflow?",
 	"userActivationSurveyModal.form.button.shareFeedback": "Share feedback",
+	"userActivationSurveyModal.form.button.skip": "Skip",
 	"userActivationSurveyModal.sharedFeedback.success": "Thanks for your feedback",
 	"userActivationSurveyModal.sharedFeedback.error": "Problem sharing feedback, try again",
 	"sso.login.divider": "or",