From c2850ad6858b750144262d1d4e9fcc958467dc5e Mon Sep 17 00:00:00 2001
From: Mutasem <mutdmour@gmail.com>
Date: Fri, 18 Feb 2022 08:17:11 +0200
Subject: [PATCH 01/15] refactor/update survey

---
 .../src/components/N8nFormInput/FormInput.vue |   4 +-
 packages/editor-ui/src/Interface.ts           |   4 +-
 .../src/components/PersonalizationModal.vue   | 572 ++++++++++++------
 packages/editor-ui/src/constants.ts           |  51 +-
 packages/editor-ui/src/modules/ui.ts          |   2 +-
 .../src/plugins/i18n/locales/en.json          |  37 +-
 6 files changed, 476 insertions(+), 194 deletions(-)

diff --git a/packages/design-system/src/components/N8nFormInput/FormInput.vue b/packages/design-system/src/components/N8nFormInput/FormInput.vue
index 618e1b31bf983..7b89caf5516bb 100644
--- a/packages/design-system/src/components/N8nFormInput/FormInput.vue
+++ b/packages/design-system/src/components/N8nFormInput/FormInput.vue
@@ -3,8 +3,10 @@
 		<div :class="showErrors ? $style.errorInput : ''" @keydown.stop @keydown.enter="onEnter">
 			<slot v-if="hasDefaultSlot"></slot>
 			<n8n-select
-				v-else-if="type === 'select'"
+				v-else-if="type === 'select' || type === 'multi-select'"
 				:value="value"
+				:placeholder="placeholder"
+				:multi="type === 'multi-select'"
 			>
 				<n8n-option
 					v-for="option in (options || [])"
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index 40759c39c98ba..8978fe2d11ee5 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -818,8 +818,8 @@ export type IFormInput = {
 	name: string;
 	initialValue?: string | number | boolean | null;
 	properties: {
-		label: string;
-		type?: "text" | "email" | "password" | 'select';
+		label?: string;
+		type?: "text" | "email" | "password" | 'select' | 'multi-select';
 		maxlength?: number;
 		required?: boolean;
 		showRequiredAsterisk?: boolean;
diff --git a/packages/editor-ui/src/components/PersonalizationModal.vue b/packages/editor-ui/src/components/PersonalizationModal.vue
index 9acb66853999c..15afc8acf1002 100644
--- a/packages/editor-ui/src/components/PersonalizationModal.vue
+++ b/packages/editor-ui/src/components/PersonalizationModal.vue
@@ -1,8 +1,12 @@
 <template>
 	<Modal
 		:name="PERSONALIZATION_MODAL_KEY"
-		:title="!submitted? $locale.baseText('personalizationModal.customizeN8n') : $locale.baseText('personalizationModal.thanks')"
-		:subtitle="!submitted? $locale.baseText('personalizationModal.theseQuestionsHelpUs') : ''"
+		:title="
+			!submitted
+				? $locale.baseText('personalizationModal.customizeN8n')
+				: $locale.baseText('personalizationModal.thanks')
+		"
+		:subtitle="!submitted ? $locale.baseText('personalizationModal.theseQuestionsHelpUs') : ''"
 		:centerTitle="true"
 		:showClose="false"
 		:eventBus="modalBus"
@@ -17,127 +21,33 @@
 				<n8n-text>{{ $locale.baseText('personalizationModal.lookOutForThingsMarked') }}</n8n-text>
 			</div>
 			<div :class="$style.container" v-else>
-				<n8n-input-label :label="$locale.baseText('personalizationModal.howAreYourCodingSkills')">
-					<n8n-select :value="values[CODING_SKILL_KEY]" :placeholder="$locale.baseText('personalizationModal.select')" @change="(value) => values[CODING_SKILL_KEY] = value">
-						<n8n-option
-							:label="$locale.baseText('personalizationModal.neverCoded')"
-							value="0"
-						/>
-						<n8n-option
-							:label="$locale.baseText('personalizationModal.iGetStuckTooQuicklyToAchieveMuch')"
-							value="1"
-						/>
-						<n8n-option
-							:label="$locale.baseText('personalizationModal.iCanCodeSomeUsefulThingsBut')"
-							value="2"
-						/>
-						<n8n-option
-							:label="$locale.baseText('personalizationModal.iKnowEnoughToBeDangerousBut')"
-							value="3"
-						/>
-						<n8n-option
-							:label="$locale.baseText('personalizationModal.iCanFigureMostThingsOut')"
-							value="4"
-						/>
-						<n8n-option
-							:label="$locale.baseText('personalizationModal.iCanDoAlmostAnythingIWant')"
-							value="5"
-						/>
-					</n8n-select>
-				</n8n-input-label>
-
-				<n8n-input-label :label="$locale.baseText('personalizationModal.whichAreasDoYouMainlyWorkIn')">
-					<n8n-select :value="values[WORK_AREA_KEY]" multiple :placeholder="$locale.baseText('personalizationModal.select')" @change="(value) => onMultiInput(WORK_AREA_KEY, value)">
-						<n8n-option :value="FINANCE_WORK_AREA" :label="$locale.baseText('personalizationModal.finance')" />
-						<n8n-option :value="HR_WORK_AREA" :label="$locale.baseText('personalizationModal.hr')" />
-						<n8n-option :value="IT_ENGINEERING_WORK_AREA" :label="$locale.baseText('personalizationModal.itEngineering')" />
-						<n8n-option :value="LEGAL_WORK_AREA" :label="$locale.baseText('personalizationModal.legal')" />
-						<n8n-option :value="MARKETING_WORK_AREA" :label="$locale.baseText('personalizationModal.marketing')" />
-						<n8n-option :value="OPS_WORK_AREA" :label="$locale.baseText('personalizationModal.operations')" />
-						<n8n-option :value="PRODUCT_WORK_AREA" :label="$locale.baseText('personalizationModal.product')" />
-						<n8n-option :value="SALES_BUSINESSDEV_WORK_AREA" :label="$locale.baseText('personalizationModal.salesBizDev')" />
-						<n8n-option :value="SECURITY_WORK_AREA" :label="$locale.baseText('personalizationModal.security')" />
-						<n8n-option :value="SUPPORT_WORK_AREA" :label="$locale.baseText('personalizationModal.support')" />
-						<n8n-option :value="EXECUTIVE_WORK_AREA" :label="$locale.baseText('personalizationModal.executiveTeam')" />
-						<n8n-option :value="OTHER_WORK_AREA_OPTION" :label="$locale.baseText('personalizationModal.otherPleaseSpecify')" />
-						<n8n-option :value="NOT_APPLICABLE_WORK_AREA" :label="$locale.baseText('personalizationModal.imNotUsingN8nForWork')" />
-					</n8n-select>
-				</n8n-input-label>
-				<n8n-input
-					v-if="otherWorkAreaFieldVisible"
-					:value="values[OTHER_WORK_AREA_KEY]"
-					:placeholder="$locale.baseText('personalizationModal.specifyYourWorkArea')"
-					@input="(value) => values[OTHER_WORK_AREA_KEY] = value"
-				/>
-
-				<section v-if="showAllIndustryQuestions">
-					<n8n-input-label :label="$locale.baseText('personalizationModal.whichIndustriesIsYourCompanyIn')">
-					<n8n-select :value="values[COMPANY_INDUSTRY_KEY]" multiple :placeholder="$locale.baseText('personalizationModal.select')" @change="(value) => onMultiInput(COMPANY_INDUSTRY_KEY, value)">
-						<n8n-option :value="E_COMMERCE_INDUSTRY" :label="$locale.baseText('personalizationModal.eCommerce')" />
-						<n8n-option :value="AUTOMATION_CONSULTING_INDUSTRY" :label="$locale.baseText('personalizationModal.automationConsulting')" />
-						<n8n-option :value="SYSTEM_INTEGRATION_INDUSTRY" :label="$locale.baseText('personalizationModal.systemsIntegration')" />
-						<n8n-option :value="GOVERNMENT_INDUSTRY" :label="$locale.baseText('personalizationModal.government')" />
-						<n8n-option :value="LEGAL_INDUSTRY" :label="$locale.baseText('personalizationModal.legal')" />
-						<n8n-option :value="HEALTHCARE_INDUSTRY" :label="$locale.baseText('personalizationModal.healthcare')" />
-						<n8n-option :value="FINANCE_INDUSTRY" :label="$locale.baseText('personalizationModal.finance')" />
-						<n8n-option :value="SECURITY_INDUSTRY" :label="$locale.baseText('personalizationModal.security')" />
-						<n8n-option :value="SAAS_INDUSTRY" :label="$locale.baseText('personalizationModal.saas')" />
-						<n8n-option :value="OTHER_INDUSTRY_OPTION" :label="$locale.baseText('personalizationModal.otherPleaseSpecify')" />
-					</n8n-select>
-				</n8n-input-label>
-				<n8n-input
-					v-if="otherCompanyIndustryFieldVisible"
-					:value="values[OTHER_COMPANY_INDUSTRY_KEY]"
-					:placeholder="$locale.baseText('personalizationModal.specifyYourCompanysIndustry')"
-					@input="(value) => values[OTHER_COMPANY_INDUSTRY_KEY] = value"
-				/>
-
-				<n8n-input-label :label="$locale.baseText('personalizationModal.howBigIsYourCompany')">
-					<n8n-select :value="values[COMPANY_SIZE_KEY]" placeholder="Select..." @change="(value) => values[COMPANY_SIZE_KEY] = value">
-						<n8n-option
-							:label="$locale.baseText('personalizationModal.lessThan20People')"
-							:value="COMPANY_SIZE_20_OR_LESS"
-						/>
-						<n8n-option
-							:label="`20-99 ${$locale.baseText('personalizationModal.people')}`"
-							:value="COMPANY_SIZE_20_99"
-						/>
-						<n8n-option
-							:label="`100-499 ${$locale.baseText('personalizationModal.people')}`"
-							:value="COMPANY_SIZE_100_499"
-						/>
-						<n8n-option
-							:label="`500-999 ${$locale.baseText('personalizationModal.people')}`"
-							:value="COMPANY_SIZE_500_999"
-						/>
-						<n8n-option
-							:label="`1000+ ${$locale.baseText('personalizationModal.people')}`"
-							:value="COMPANY_SIZE_1000_OR_MORE"
-						/>
-						<n8n-option
-							:label="$locale.baseText('personalizationModal.imNotUsingN8nForWork')"
-							:value="COMPANY_SIZE_PERSONAL_USE"
-						/>
-					</n8n-select>
-				</n8n-input-label>
-
-				</section>
+				<n8n-form-inputs :inputs="survey" :columnView="true" />
 			</div>
 		</template>
 		<template v-slot:footer>
 			<div>
-				<n8n-button v-if="submitted" @click="closeDialog" :label="$locale.baseText('personalizationModal.getStarted')" float="right" />
-				<n8n-button v-else @click="save" :loading="isSaving" :label="$locale.baseText('personalizationModal.continue')" float="right" />
+				<n8n-button
+					v-if="submitted"
+					@click="closeDialog"
+					:label="$locale.baseText('personalizationModal.getStarted')"
+					float="right"
+				/>
+				<n8n-button
+					v-else
+					@click="save"
+					:loading="isSaving"
+					:label="$locale.baseText('personalizationModal.continue')"
+					float="right"
+				/>
 			</div>
 		</template>
 	</Modal>
 </template>
 
 <script lang="ts">
-import mixins from "vue-typed-mixins";
+import mixins from 'vue-typed-mixins';
 
 import {
-	AUTOMATION_CONSULTING_INDUSTRY,
 	CODING_SKILL_KEY,
 	COMPANY_INDUSTRY_KEY,
 	COMPANY_SIZE_100_499,
@@ -147,45 +57,378 @@ import {
 	COMPANY_SIZE_500_999,
 	COMPANY_SIZE_KEY,
 	COMPANY_SIZE_PERSONAL_USE,
-	E_COMMERCE_INDUSTRY,
-	EXECUTIVE_WORK_AREA,
-	FINANCE_INDUSTRY,
-	FINANCE_WORK_AREA,
 	GOVERNMENT_INDUSTRY,
 	HEALTHCARE_INDUSTRY,
-	HR_WORK_AREA,
-	IT_ENGINEERING_WORK_AREA,
 	LEGAL_INDUSTRY,
-	LEGAL_WORK_AREA,
-	MARKETING_WORK_AREA,
-	NOT_APPLICABLE_WORK_AREA,
-	OPS_WORK_AREA,
 	OTHER_COMPANY_INDUSTRY_KEY,
 	OTHER_INDUSTRY_OPTION,
 	OTHER_WORK_AREA_KEY,
-	OTHER_WORK_AREA_OPTION,
 	PERSONALIZATION_MODAL_KEY,
-	PRODUCT_WORK_AREA,
-	SAAS_INDUSTRY,
-	SALES_BUSINESSDEV_WORK_AREA,
 	SECURITY_INDUSTRY,
-	SECURITY_WORK_AREA,
-	SUPPORT_WORK_AREA,
-	SYSTEM_INTEGRATION_INDUSTRY,
 	WORK_AREA_KEY,
-} from "../constants";
-import { workflowHelpers } from "@/components/mixins/workflowHelpers";
-import { showMessage } from "@/components/mixins/showMessage";
-import Modal from "./Modal.vue";
-import { IPersonalizationSurveyAnswers, IPersonalizationSurveyKeys } from "@/Interface";
-import Vue from "vue";
-import { mapGetters } from "vuex";
+	EDUCATION_INDUSTRY,
+	FINANCE_INSURANCE_INDUSTRY,
+	IT_INDUSTRY,
+	MARKETING_INDUSTRY,
+	MEDIA_INDUSTRY,
+	MANUFACTURING_INDUSTRY,
+	PHYSICAL_RETAIL_OR_SERVICES,
+	REAL_ESTATE_OR_CONSTRUCTION,
+	TELECOMS_INDUSTRY,
+	AUTOMATION_GOAL_KEY,
+	CUSTOMER_INTEGRATIONS_GOAL,
+	CUSTOMER_SUPPORT_GOAL,
+	FINANCE_ACCOUNTING_GOAL,
+	HR_GOAL,
+	OPERATIONS_GOAL,
+	PRODUCT_GOAL,
+	SALES_MARKETING_GOAL,
+	SECURITY_GOAL,
+	OTHER_AUTOMATION_GOAL,
+	NOT_SURE_YET_GOAL,
+	AUTOMATION_GOAL_OTHER_KEY,
+	COMPANY_TYPE_KEY,
+	CUSTOMER_TYPE_KEY,
+	MSP_FOCUS_KEY,
+	MSP_FOCUS_OTHER_KEY,
+	SAAS_COMPANY_TYPE,
+	ECOMMERCE_COMPANY_TYPE,
+	MSP_COMPANY_TYPE,
+	DIGITAL_AGENCY_COMPANY_TYPE,
+	AUTOMATION_AGENCY_COMPANY_TYPE,
+	SYSTEMS_INTEGRATOR_COMPANY_TYPE,
+	OTHER_COMPANY_TYPE,
+	PERSONAL_COMPANY_TYPE,
+	INDIVIDUAL_CUSTOMER_TYPE,
+	SMALL_CUSTOMER_TYPE,
+	MEDIUM_CUSTOMER_TYPE,
+	LARGE_CUSTOMER_TYPE,
+	CLOUD_INFRA_FOCUS,
+	IT_SUPPORT_FOCUS,
+	NETWORKING_COMMUNICATION_FOCUS,
+	SECURITY_FOCUS,
+	OTHER_FOCUS,
+} from '../constants';
+import { workflowHelpers } from '@/components/mixins/workflowHelpers';
+import { showMessage } from '@/components/mixins/showMessage';
+import Modal from './Modal.vue';
+import {
+	IFormInputs,
+	IPersonalizationSurveyAnswers,
+	IPersonalizationSurveyKeys,
+} from '@/Interface';
+import Vue from 'vue';
+import { mapGetters } from 'vuex';
 
 export default mixins(showMessage, workflowHelpers).extend({
 	components: { Modal },
-	name: "PersonalizationModal",
+	name: 'PersonalizationModal',
 	data() {
+		const survey: IFormInputs = [
+			{
+				name: CODING_SKILL_KEY,
+				properties: {
+					label: this.$locale.baseText('personalizationModal.howAreYourCodingSkills'),
+					type: 'select',
+					placeholder: this.$locale.baseText('personalizationModal.select'),
+					options: [
+						{
+							label: this.$locale.baseText('personalizationModal.neverCoded'),
+							value: '0',
+						},
+						{
+							label: this.$locale.baseText('personalizationModal.iGetStuckTooQuicklyToAchieveMuch'),
+							value: '1',
+						},
+						{
+							label: this.$locale.baseText('personalizationModal.iCanCodeSomeUsefulThingsBut'),
+							value: '2',
+						},
+						{
+							label: this.$locale.baseText('personalizationModal.iKnowEnoughToBeDangerousBut'),
+							value: '3',
+						},
+						{
+							label: this.$locale.baseText('personalizationModal.iCanFigureMostThingsOut'),
+							value: '4',
+						},
+						{
+							label: this.$locale.baseText('personalizationModal.iCanDoAlmostAnythingIWant'),
+							value: '5',
+						},
+					],
+				},
+			},
+			{
+				name: COMPANY_TYPE_KEY,
+				properties: {
+					label: this.$locale.baseText('personalizationModal.whatBestDescribesYourCompany'),
+					type: 'select',
+					placeholder: this.$locale.baseText('personalizationModal.select'),
+					options: [
+						{
+							label: this.$locale.baseText('personalizationModal.saas'),
+							value: SAAS_COMPANY_TYPE,
+						},
+						{
+							label: this.$locale.baseText('personalizationModal.eCommerce'),
+							value: ECOMMERCE_COMPANY_TYPE,
+						},
+						{
+							label: this.$locale.baseText('personalizationModal.managedServiceProvider'),
+							value: MSP_COMPANY_TYPE,
+						},
+						{
+							label: this.$locale.baseText('personalizationModal.digitalAgencyOrConsultant'),
+							value: DIGITAL_AGENCY_COMPANY_TYPE,
+						},
+						{
+							label: this.$locale.baseText('personalizationModal.automationAgencyOrConsultant'),
+							value: AUTOMATION_AGENCY_COMPANY_TYPE,
+						},
+						{
+							label: this.$locale.baseText('personalizationModal.systemsIntegrator'),
+							value: SYSTEMS_INTEGRATOR_COMPANY_TYPE,
+						},
+						{
+							label: this.$locale.baseText('personalizationModal.other'),
+							value: OTHER_COMPANY_TYPE,
+						},
+						{
+							label: this.$locale.baseText('personalizationModal.imNotUsingN8nForWork'),
+							value: PERSONAL_COMPANY_TYPE,
+						},
+					],
+				},
+			},
+			{
+				name: CUSTOMER_TYPE_KEY,
+				properties: {
+					label: this.$locale.baseText('personalizationModal.whatKindOfCustomersDoYouServe'),
+					type: 'select',
+					placeholder: this.$locale.baseText('personalizationModal.select'),
+					options: [
+						{
+							label: this.$locale.baseText('personalizationModal.individualConsumers'),
+							value: INDIVIDUAL_CUSTOMER_TYPE,
+						},
+						{
+							label: this.$locale.baseText('personalizationModal.smallBusinesses'),
+							value: SMALL_CUSTOMER_TYPE,
+						},
+						{
+							label: this.$locale.baseText('personalizationModal.mediumBusinesses'),
+							value: MEDIUM_CUSTOMER_TYPE,
+						},
+						{
+							label: this.$locale.baseText('personalizationModal.largeBusinesses'),
+							value: LARGE_CUSTOMER_TYPE,
+						},
+					],
+				},
+			},
+			{
+				name: MSP_FOCUS_KEY,
+				properties: {
+					label: this.$locale.baseText('personalizationModal.whatDoesYourCompanyFocusOn'),
+					type: 'select',
+					placeholder: this.$locale.baseText('personalizationModal.select'),
+					options: [
+						{
+							label: this.$locale.baseText('personalizationModal.cloudInfrastructure'),
+							value: CLOUD_INFRA_FOCUS,
+						},
+						{
+							label: this.$locale.baseText('personalizationModal.itSupport'),
+							value: IT_SUPPORT_FOCUS,
+						},
+						{
+							label: this.$locale.baseText('personalizationModal.networkingOrCommunication'),
+							value: NETWORKING_COMMUNICATION_FOCUS,
+						},
+						{
+							label: this.$locale.baseText('personalizationModal.security'),
+							value: SECURITY_FOCUS,
+						},
+						{
+							label: this.$locale.baseText('personalizationModal.otherPleaseSpecify'),
+							value: OTHER_FOCUS,
+						},
+					],
+				},
+			},
+			{
+				name: MSP_FOCUS_OTHER_KEY,
+				properties: {
+					placeholder: this.$locale.baseText('personalizationModal.pleaseSpecifyYourCompanyFocus'),
+				},
+			},
+			{
+				name: COMPANY_INDUSTRY_KEY,
+				properties: {
+					type: 'multi-select',
+					label: this.$locale.baseText('personalizationModal.whichIndustriesIsYourCompanyIn'),
+					placeholder: this.$locale.baseText('personalizationModal.select'),
+					options: [
+						{
+							value: EDUCATION_INDUSTRY,
+							label: this.$locale.baseText('personalizationModal.education'),
+						},
+						{
+							value: FINANCE_INSURANCE_INDUSTRY,
+							label: this.$locale.baseText('personalizationModal.financeOrInsurance'),
+						},
+						{
+							value: GOVERNMENT_INDUSTRY,
+							label: this.$locale.baseText('personalizationModal.government'),
+						},
+						{
+							value: HEALTHCARE_INDUSTRY,
+							label: this.$locale.baseText('personalizationModal.healthcare'),
+						},
+						{
+							value: IT_INDUSTRY,
+							label: this.$locale.baseText('personalizationModal.it'),
+						},
+						{
+							value: LEGAL_INDUSTRY,
+							label: this.$locale.baseText('personalizationModal.legal'),
+						},
+						{
+							value: MARKETING_INDUSTRY,
+							label: this.$locale.baseText('personalizationModal.marketing'),
+						},
+						{
+							value: MEDIA_INDUSTRY,
+							label: this.$locale.baseText('personalizationModal.media'),
+						},
+						{
+							value: MANUFACTURING_INDUSTRY,
+							label: this.$locale.baseText('personalizationModal.manufacturing'),
+						},
+						{
+							value: PHYSICAL_RETAIL_OR_SERVICES,
+							label: this.$locale.baseText('personalizationModal.physicalRetailOrServices'),
+						},
+						{
+							value: REAL_ESTATE_OR_CONSTRUCTION,
+							label: this.$locale.baseText('personalizationModal.realEstateOrConstruction'),
+						},
+						{
+							value: SECURITY_INDUSTRY,
+							label: this.$locale.baseText('personalizationModal.security'),
+						},
+						{
+							value: TELECOMS_INDUSTRY,
+							label: this.$locale.baseText('personalizationModal.telecoms'),
+						},
+						{
+							value: OTHER_INDUSTRY_OPTION,
+							label: this.$locale.baseText('personalizationModal.otherPleaseSpecify'),
+						},
+					],
+				},
+			},
+			{
+				name: OTHER_COMPANY_INDUSTRY_KEY,
+				properties: {
+					placeholder: this.$locale.baseText('personalizationModal.specifyYourCompanysIndustry'),
+				},
+			},
+			{
+				name: AUTOMATION_GOAL_KEY,
+				properties: {
+					type: 'select',
+					label: this.$locale.baseText('personalizationModal.whatAreYouLookingToAutomate'),
+					placeholder: this.$locale.baseText('personalizationModal.select'),
+					options: [
+						{
+							value: CUSTOMER_INTEGRATIONS_GOAL,
+							label: this.$locale.baseText('personalizationModal.customerIntegrations'),
+						},
+						{
+							value: CUSTOMER_SUPPORT_GOAL,
+							label: this.$locale.baseText('personalizationModal.customerSupport'),
+						},
+						{
+							value: FINANCE_ACCOUNTING_GOAL,
+							label: this.$locale.baseText('personalizationModal.financeOrAccounting'),
+						},
+						{
+							value: HR_GOAL,
+							label: this.$locale.baseText('personalizationModal.hr'),
+						},
+						{
+							value: OPERATIONS_GOAL,
+							label: this.$locale.baseText('personalizationModal.operations'),
+						},
+						{
+							value: PRODUCT_GOAL,
+							label: this.$locale.baseText('personalizationModal.product'),
+						},
+						{
+							value: SALES_MARKETING_GOAL,
+							label: this.$locale.baseText('personalizationModal.salesAndMarketing'),
+						},
+						{
+							value: SECURITY_GOAL,
+							label: this.$locale.baseText('personalizationModal.security'),
+						},
+						{
+							value: OTHER_AUTOMATION_GOAL,
+							label: this.$locale.baseText('personalizationModal.otherPleaseSpecify'),
+						},
+						{
+							value: NOT_SURE_YET_GOAL,
+							label: this.$locale.baseText('personalizationModal.notSureYet'),
+						},
+					],
+				},
+			},
+			{
+				name: AUTOMATION_GOAL_OTHER_KEY,
+				properties: {
+					placeholder: this.$locale.baseText('personalizationModal.specifyYourAutomationGoal'),
+				},
+			},
+			{
+				name: COMPANY_SIZE_KEY,
+				properties: {
+					type: 'select',
+					label: this.$locale.baseText('personalizationModal.howBigIsYourCompany'),
+					placeholder: this.$locale.baseText('personalizationModal.select'),
+					options: [
+						{
+							label: this.$locale.baseText('personalizationModal.lessThan20People'),
+							value: COMPANY_SIZE_20_OR_LESS,
+						},
+						{
+							label: `20-99 ${this.$locale.baseText('personalizationModal.people')}`,
+							value: COMPANY_SIZE_20_99,
+						},
+						{
+							label: `100-499 ${this.$locale.baseText('personalizationModal.people')}`,
+							value: COMPANY_SIZE_100_499,
+						},
+						{
+							label: `500-999 ${this.$locale.baseText('personalizationModal.people')}`,
+							value: COMPANY_SIZE_500_999,
+						},
+						{
+							label: `1000+ ${this.$locale.baseText('personalizationModal.people')}`,
+							value: COMPANY_SIZE_1000_OR_MORE,
+						},
+						{
+							label: this.$locale.baseText('personalizationModal.imNotUsingN8nForWork'),
+							value: COMPANY_SIZE_PERSONAL_USE,
+						},
+					],
+				},
+			},
+		];
+
 		return {
+			survey,
 			submitted: false,
 			isSaving: false,
 			PERSONALIZATION_MODAL_KEY,
@@ -201,41 +444,6 @@ export default mixins(showMessage, workflowHelpers).extend({
 				[COMPANY_INDUSTRY_KEY]: [],
 				[OTHER_COMPANY_INDUSTRY_KEY]: null,
 			} as IPersonalizationSurveyAnswers,
-			FINANCE_WORK_AREA,
-			HR_WORK_AREA,
-			IT_ENGINEERING_WORK_AREA,
-			LEGAL_WORK_AREA,
-			MARKETING_WORK_AREA,
-			PRODUCT_WORK_AREA,
-			SALES_BUSINESSDEV_WORK_AREA,
-			SECURITY_WORK_AREA,
-			EXECUTIVE_WORK_AREA,
-			SUPPORT_WORK_AREA,
-			OPS_WORK_AREA,
-			OTHER_WORK_AREA_OPTION,
-			NOT_APPLICABLE_WORK_AREA,
-			COMPANY_SIZE_20_OR_LESS,
-			COMPANY_SIZE_20_99,
-			COMPANY_SIZE_100_499,
-			COMPANY_SIZE_500_999,
-			COMPANY_SIZE_1000_OR_MORE,
-			COMPANY_SIZE_PERSONAL_USE,
-			E_COMMERCE_INDUSTRY,
-			AUTOMATION_CONSULTING_INDUSTRY,
-			SYSTEM_INTEGRATION_INDUSTRY,
-			GOVERNMENT_INDUSTRY,
-			LEGAL_INDUSTRY,
-			HEALTHCARE_INDUSTRY,
-			FINANCE_INDUSTRY,
-			SECURITY_INDUSTRY,
-			SAAS_INDUSTRY,
-			OTHER_INDUSTRY_OPTION,
-			WORK_AREA_KEY,
-			COMPANY_SIZE_KEY,
-			CODING_SKILL_KEY,
-			COMPANY_INDUSTRY_KEY,
-			OTHER_WORK_AREA_KEY,
-			OTHER_COMPANY_INDUSTRY_KEY,
 		};
 	},
 	computed: {
@@ -248,18 +456,13 @@ export default mixins(showMessage, workflowHelpers).extend({
 			this.modalBus.$emit('close');
 		},
 		onMultiInput(name: IPersonalizationSurveyKeys, value: string[]) {
-			if (name === WORK_AREA_KEY) {
-				this.otherWorkAreaFieldVisible = value.includes(OTHER_WORK_AREA_OPTION);
-				this.showAllIndustryQuestions = !value.includes(NOT_APPLICABLE_WORK_AREA);
-				this.values[OTHER_WORK_AREA_KEY] = value.includes(OTHER_WORK_AREA_OPTION) ? this.values[OTHER_WORK_AREA_KEY] : null;
-				this.values[WORK_AREA_KEY] = value;
-			}
 			if (name === COMPANY_INDUSTRY_KEY) {
 				this.otherCompanyIndustryFieldVisible = value.includes(OTHER_INDUSTRY_OPTION);
-				this.values[OTHER_COMPANY_INDUSTRY_KEY] = value.includes(OTHER_INDUSTRY_OPTION) ? this.values[OTHER_COMPANY_INDUSTRY_KEY] : null;
+				this.values[OTHER_COMPANY_INDUSTRY_KEY] = value.includes(OTHER_INDUSTRY_OPTION)
+					? this.values[OTHER_COMPANY_INDUSTRY_KEY]
+					: null;
 				this.values[COMPANY_INDUSTRY_KEY] = value;
 			}
-
 		},
 		async save(): Promise<void> {
 			this.$data.isSaving = true;
@@ -267,7 +470,11 @@ export default mixins(showMessage, workflowHelpers).extend({
 			try {
 				await this.$store.dispatch('users/submitPersonalizationSurvey', this.values);
 
-				if (this.values[WORK_AREA_KEY] === null && this.values[COMPANY_SIZE_KEY] === null && this.values[CODING_SKILL_KEY] === null) {
+				if (
+					this.values[WORK_AREA_KEY] === null &&
+					this.values[COMPANY_SIZE_KEY] === null &&
+					this.values[CODING_SKILL_KEY] === null
+				) {
 					this.closeDialog();
 				}
 
@@ -284,7 +491,8 @@ export default mixins(showMessage, workflowHelpers).extend({
 
 <style lang="scss" module>
 .container {
-	> div, section > div:not(:last-child) {
+	> div,
+	section > div:not(:last-child) {
 		margin-bottom: var(--spacing-m);
 	}
 }
@@ -301,6 +509,4 @@ export default mixins(showMessage, workflowHelpers).extend({
 	width: 100%;
 	height: 140px;
 }
-
-
 </style>
diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index 4e53dcb48f3ab..86d2a12d30269 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -116,17 +116,49 @@ export const EXECUTIVE_WORK_AREA = 'executive';
 export const OTHER_WORK_AREA_OPTION = 'other';
 export const NOT_APPLICABLE_WORK_AREA = 'n/a';
 
+export const COMPANY_TYPE_KEY = 'companyType';
+export const SAAS_COMPANY_TYPE = 'saas';
+export const ECOMMERCE_COMPANY_TYPE = 'ecommerce';
+export const MSP_COMPANY_TYPE = 'msp';
+export const DIGITAL_AGENCY_COMPANY_TYPE = 'digital-agency';
+export const AUTOMATION_AGENCY_COMPANY_TYPE = 'automation-agency';
+export const SYSTEMS_INTEGRATOR_COMPANY_TYPE = 'systems-integrator';
+export const OTHER_COMPANY_TYPE = 'other';
+export const PERSONAL_COMPANY_TYPE = 'personal';
+
+export const CUSTOMER_TYPE_KEY = 'customerType';
+export const INDIVIDUAL_CUSTOMER_TYPE = 'individual';
+export const SMALL_CUSTOMER_TYPE = 'small';
+export const MEDIUM_CUSTOMER_TYPE = 'medium';
+export const LARGE_CUSTOMER_TYPE = 'large';
+
+export const MSP_FOCUS_KEY = 'mspFocus';
+export const CLOUD_INFRA_FOCUS = 'cloud-infra';
+export const IT_SUPPORT_FOCUS = 'it-support';
+export const NETWORKING_COMMUNICATION_FOCUS = 'networking-communication';
+export const SECURITY_FOCUS = 'security';
+export const OTHER_FOCUS = 'other';
+
+export const MSP_FOCUS_OTHER_KEY = 'mspFocusOther';
+
 export const COMPANY_INDUSTRY_KEY = 'companyIndustry';
-export const E_COMMERCE_INDUSTRY = 'e-commerce';
+export const EDUCATION_INDUSTRY = 'education';
 export const AUTOMATION_CONSULTING_INDUSTRY = 'automation-consulting';
+export const PHYSICAL_RETAIL_OR_SERVICES = 'physical-retail-or-services';
+export const REAL_ESTATE_OR_CONSTRUCTION = 'real-estate-or-construction';
 export const SYSTEM_INTEGRATION_INDUSTRY = 'systems-integration';
 export const GOVERNMENT_INDUSTRY = 'government';
 export const LEGAL_INDUSTRY = 'legal-industry';
+export const MARKETING_INDUSTRY = 'marketing-industry';
+export const MEDIA_INDUSTRY = 'media-industry';
+export const MANUFACTURING_INDUSTRY = 'manufacturing-industry';
 export const HEALTHCARE_INDUSTRY= 'healthcare';
-export const FINANCE_INDUSTRY = 'finance-industry';
+export const FINANCE_INSURANCE_INDUSTRY = 'finance-insurance-industry';
+export const IT_INDUSTRY = 'it-industry';
 export const SECURITY_INDUSTRY = 'security-industry';
 export const SAAS_INDUSTRY = 'saas';
-export const OTHER_INDUSTRY_OPTION= 'other';
+export const TELECOMS_INDUSTRY = 'telecoms';
+export const OTHER_INDUSTRY_OPTION = 'other';
 
 export const COMPANY_SIZE_KEY = 'companySize';
 export const COMPANY_SIZE_20_OR_LESS = '<20';
@@ -140,6 +172,19 @@ export const CODING_SKILL_KEY = 'codingSkill';
 export const OTHER_WORK_AREA_KEY = 'otherWorkArea';
 export const OTHER_COMPANY_INDUSTRY_KEY = 'otherCompanyIndustry';
 
+export const AUTOMATION_GOAL_KEY = 'automationGoalKey';
+export const AUTOMATION_GOAL_OTHER_KEY = 'automationGoalOtherKey';
+export const CUSTOMER_INTEGRATIONS_GOAL = 'customer-integrations';
+export const CUSTOMER_SUPPORT_GOAL = 'customer-support';
+export const FINANCE_ACCOUNTING_GOAL = 'finance-accounting';
+export const HR_GOAL = 'hr';
+export const OPERATIONS_GOAL = 'operations';
+export const PRODUCT_GOAL = 'product';
+export const SALES_MARKETING_GOAL = 'sales-marketing';
+export const SECURITY_GOAL = 'security';
+export const OTHER_AUTOMATION_GOAL = 'other';
+export const NOT_SURE_YET_GOAL = 'not-sure-yet';
+
 export const VALID_EMAIL_REGEX = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
 export const LOCAL_STORAGE_ACTIVATION_FLAG = 'N8N_HIDE_ACTIVATION_ALERT';
 
diff --git a/packages/editor-ui/src/modules/ui.ts b/packages/editor-ui/src/modules/ui.ts
index bb015c4b927df..094b028663672 100644
--- a/packages/editor-ui/src/modules/ui.ts
+++ b/packages/editor-ui/src/modules/ui.ts
@@ -56,7 +56,7 @@ const module: Module<IUiState, IRootState> = {
 				open: false,
 			},
 			[PERSONALIZATION_MODAL_KEY]: {
-				open: false,
+				open: true,
 			},
 			[INVITE_USER_MODAL_KEY]: {
 				open: false,
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 26d6a72987ad7..c969d7b2a4f81 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -670,31 +670,48 @@
 		"eCommerce": "eCommerce",
 		"errorWhileSubmittingResults": "Error while submitting results",
 		"executiveTeam": "Executive team",
-		"finance": "Finance",
+		"financeOrInsurance": "Finance / Insurance",
 		"getStarted": "Get started",
 		"government": "Government",
 		"healthcare": "Healthcare",
 		"howAreYourCodingSkills": "How are your coding skills?",
 		"howBigIsYourCompany": "How big is your company?",
 		"hr": "HR",
+		"it": "IT",
 		"iCanCodeSomeUsefulThingsBut": "2. I can code some useful things, but I spend a lot of time stuck",
 		"iCanDoAlmostAnythingIWant": "5. I can do almost anything I want, easily (pro coder)",
 		"iCanFigureMostThingsOut": "4. I can figure most things out",
 		"iGetStuckTooQuicklyToAchieveMuch": "1. I get stuck too quickly to achieve much",
 		"iKnowEnoughToBeDangerousBut": "3. I know enough to be dangerous, but I'm no expert",
 		"imNotUsingN8nForWork": "I'm not using n8n for work",
+		"individualConsumers": "Individual Consumers",
+		"smallBusinesses": "Small businesses (under 20 employees)",
+		"mediumBusinesses": "Medium businesses (20-499 employees)",
+		"largeBusinesses": "Large businesses (500+ employees)",
+		"whatKindOfCustomersDoYouServe": "What kind of customers do you serve?",
+		"cloudInfrastructure": "Cloud infrastructure",
+		"itSupport": "IT support",
+		"networkingOrCommunication": "Networking / Communication",
 		"itEngineering": "IT / Engineering",
 		"legal": "Legal",
 		"lessThan20People": "Less than 20 people",
 		"lookOutForThingsMarked": "Look out for things marked with a ✨. They are personalized to make n8n more relevant to you.",
 		"marketing": "Marketing",
-		"neverCoded": "0 (Never coded)",
+		"media": "Media",
+		"manufacturing": "Manufacturing",
+		"managedServiceProvider": "Managed service provider",
+		"digitalAgencyOrConsultant": "Digital agency/consultant",
+		"automationAgencyOrConsultant": "Automation agency/consultant",
+		"neverCoded": "0. Never coded",
 		"operations": "Operations",
 		"otherPleaseSpecify": "Other (please specify)",
+		"other": "Other",
 		"people": "people",
 		"proCoder": "Pro coder",
-		"product": "Product",
+		"physicalRetailOrServices": "Physical retail or services",
+		"realEstateOrConstruction": "Real estate / Construction",
 		"saas": "SaaS",
+		"education": "Education",
 		"salesBizDev": "Sales / Bizdev",
 		"salesBusinessDevelopment": "Sales / Business Development",
 		"security": "Security",
@@ -703,10 +720,22 @@
 		"specifyYourWorkArea": "Specify your work area",
 		"support": "Support",
 		"systemsIntegration": "Systems Integration",
+		"systemsIntegrator": "Systems Integrator",
 		"thanks": "Thanks!",
+		"telecoms": "Telecoms",
 		"theseQuestionsHelpUs": "These questions help us tailor n8n to you",
 		"whichIndustriesIsYourCompanyIn": "Which industries is your company in?",
-		"whichAreasDoYouMainlyWorkIn": "Which areas do you mainly work in?"
+		"whatBestDescribesYourCompany": "What best describes your company?",
+		"whatDoesYourCompanyFocusOn": "Which services does your company focus on?",
+		"pleaseSpecifyYourCompanyFocus": "Please specify your company focus",
+		"whatAreYouLookingToAutomate": "What are you looking to automate?",
+		"customerIntegrations": "Customer integrations",
+		"customerSupport": "Customer support",
+		"financeOrAccounting": "Finance / Accounting",
+		"product": "Product (e.g fast prototyping)",
+		"salesAndMarketing": "Sales and Marketing",
+		"notSureYet": "Not sure yet",
+		"specifyYourAutomationGoal": "Please specify your automation goal"
 	},
 	"pushConnection": {
 		"showMessage": {

From e0f81abea1ce92ff2f6a5930627d068d8a0147da Mon Sep 17 00:00:00 2001
From: Mutasem <mutdmour@gmail.com>
Date: Mon, 28 Feb 2022 09:09:57 +0300
Subject: [PATCH 02/15] update customers

---
 packages/editor-ui/src/plugins/i18n/locales/en.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index f8a2d72fef185..c4436e9a5ac38 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -652,10 +652,10 @@
 		"iGetStuckTooQuicklyToAchieveMuch": "1. I get stuck too quickly to achieve much",
 		"iKnowEnoughToBeDangerousBut": "3. I know enough to be dangerous, but I'm no expert",
 		"imNotUsingN8nForWork": "I'm not using n8n for work",
-		"individualConsumers": "Individual Consumers",
-		"smallBusinesses": "Small businesses (under 20 employees)",
-		"mediumBusinesses": "Medium businesses (20-499 employees)",
-		"largeBusinesses": "Large businesses (500+ employees)",
+		"individualConsumers": "Customers are individual Consumers",
+		"smallBusinesses": "Customers are small businesses (under 20 employees)",
+		"mediumBusinesses": "Customers are medium businesses (20-499 employees)",
+		"largeBusinesses": "Customers are large businesses (500+ employees)",
 		"whatKindOfCustomersDoYouServe": "What kind of customers do you serve?",
 		"cloudInfrastructure": "Cloud infrastructure",
 		"itSupport": "IT support",

From 559f35397a66bfadb3ccd399a379beebd4591e61 Mon Sep 17 00:00:00 2001
From: Mutasem <mutdmour@gmail.com>
Date: Mon, 28 Feb 2022 10:36:37 +0300
Subject: [PATCH 03/15] Fix up personalization survey

---
 .../src/components/N8nFormInput/FormInput.vue |   9 +-
 .../components/N8nFormInputs/FormInputs.vue   |  16 +-
 packages/editor-ui/src/Interface.ts           |  22 +-
 .../src/components/PersonalizationModal.vue   | 691 +++++++++---------
 packages/editor-ui/src/constants.ts           |   6 +-
 packages/editor-ui/src/modules/userHelpers.ts |   2 +-
 6 files changed, 393 insertions(+), 353 deletions(-)

diff --git a/packages/design-system/src/components/N8nFormInput/FormInput.vue b/packages/design-system/src/components/N8nFormInput/FormInput.vue
index 7b89caf5516bb..f545178ff226e 100644
--- a/packages/design-system/src/components/N8nFormInput/FormInput.vue
+++ b/packages/design-system/src/components/N8nFormInput/FormInput.vue
@@ -6,16 +6,16 @@
 				v-else-if="type === 'select' || type === 'multi-select'"
 				:value="value"
 				:placeholder="placeholder"
-				:multi="type === 'multi-select'"
+				:multiple="type === 'multi-select'"
+				@change="onInput"
+				@focus="onFocus"
+				@blur="onBlur"
 			>
 				<n8n-option
 					v-for="option in (options || [])"
 					:key="option.value"
 					:value="option.value"
 					:label="option.label"
-					@change="onInput"
-					@focus="onFocus"
-					@blur="onBlur"
 				/>
 			</n8n-select>
 			<n8n-input
@@ -74,7 +74,6 @@ export default Vue.extend({
 	},
 	props: {
 		value: {
-			type: String,
 		},
 		label: {
 			type: String,
diff --git a/packages/design-system/src/components/N8nFormInputs/FormInputs.vue b/packages/design-system/src/components/N8nFormInputs/FormInputs.vue
index 2c1b0037b136f..8511a909c3044 100644
--- a/packages/design-system/src/components/N8nFormInputs/FormInputs.vue
+++ b/packages/design-system/src/components/N8nFormInputs/FormInputs.vue
@@ -5,7 +5,7 @@
 		<template v-slot="{ bp }">
 			<div :class="bp === 'md' || columnView? $style.grid : $style.gridMulti">
 				<div
-					v-for="(input) in inputs"
+					v-for="(input) in filteredInputs"
 					:key="input.name"
 				>
 					<n8n-text color="text-base" v-if="input.properties.type === 'text'" tag="div" align="center">
@@ -51,11 +51,14 @@ export default Vue.extend({
 		columnView: {
 			type: Boolean,
 		},
+		filterInput: {
+			type: Function,
+		},
 	},
 	data() {
 		return {
 			showValidationWarnings: false,
-			values: {} as {[key: string]: string},
+			values: {} as {[key: string]: any},
 			validity: {} as {[key: string]: boolean},
 		};
 	},
@@ -71,6 +74,13 @@ export default Vue.extend({
 		}
 	},
 	computed: {
+		filteredInputs(): IFormInput[] {
+			if (!this.filterInput) {
+				return this.inputs;
+			}
+
+			return this.inputs.filter((input: IFormInput) => this.filterInput(input, this.values));
+		},
 		isReadyToSubmit(): boolean {
 			for (let key in this.validity) {
 				if (!this.validity[key]) {
@@ -82,7 +92,7 @@ export default Vue.extend({
 		},
 	},
 	methods: {
-		onInput(name: string, value: string) {
+		onInput(name: string, value: any) {
 			this.values = {
 				...this.values,
 				[name]: value,
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index 6eca8d0e937ed..1a6744b637e90 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -483,15 +483,21 @@ export interface IVersionNotificationSettings {
 	infoUrl: string;
 }
 
-export type IPersonalizationSurveyKeys = 'codingSkill' | 'companyIndustry' | 'companySize' | 'otherCompanyIndustry' | 'otherWorkArea' | 'workArea';
-
+// must remain backwards compatible even as survey changes
 export type IPersonalizationSurveyAnswers = {
-	codingSkill: string | null;
-	companyIndustry: string[];
-	companySize: string | null;
-	otherCompanyIndustry: string | null;
-	otherWorkArea: string | null;
-	workArea: string[] | string | null;
+	automationGoal?: string | null;
+	codingSkill?: string | null;
+	companyIndustry?: string[] | null;
+	companyIndustryExtended?: string[] | null;
+	companySize?: string | null;
+	companyType?: string | null;
+	mspFocus?: string[] | null;
+	mspFocusOther?: string | null;
+	otherAutomationGoal?: string | null;
+	otherCompanyIndustry?: string | null;
+	otherCompanyIndustryExtended?: string[] | null;
+	otherWorkArea?: string | null;
+	workArea?: string[] | string | null;
 };
 
 export interface IN8nPrompts {
diff --git a/packages/editor-ui/src/components/PersonalizationModal.vue b/packages/editor-ui/src/components/PersonalizationModal.vue
index 15afc8acf1002..ea302cc8b8714 100644
--- a/packages/editor-ui/src/components/PersonalizationModal.vue
+++ b/packages/editor-ui/src/components/PersonalizationModal.vue
@@ -21,7 +21,7 @@
 				<n8n-text>{{ $locale.baseText('personalizationModal.lookOutForThingsMarked') }}</n8n-text>
 			</div>
 			<div :class="$style.container" v-else>
-				<n8n-form-inputs :inputs="survey" :columnView="true" />
+				<n8n-form-inputs :inputs="survey" :columnView="true" :filterInput="filterInput" />
 			</div>
 		</template>
 		<template v-slot:footer>
@@ -49,7 +49,6 @@ import mixins from 'vue-typed-mixins';
 
 import {
 	CODING_SKILL_KEY,
-	COMPANY_INDUSTRY_KEY,
 	COMPANY_SIZE_100_499,
 	COMPANY_SIZE_1000_OR_MORE,
 	COMPANY_SIZE_20_OR_LESS,
@@ -60,12 +59,9 @@ import {
 	GOVERNMENT_INDUSTRY,
 	HEALTHCARE_INDUSTRY,
 	LEGAL_INDUSTRY,
-	OTHER_COMPANY_INDUSTRY_KEY,
 	OTHER_INDUSTRY_OPTION,
-	OTHER_WORK_AREA_KEY,
 	PERSONALIZATION_MODAL_KEY,
 	SECURITY_INDUSTRY,
-	WORK_AREA_KEY,
 	EDUCATION_INDUSTRY,
 	FINANCE_INSURANCE_INDUSTRY,
 	IT_INDUSTRY,
@@ -108,15 +104,14 @@ import {
 	NETWORKING_COMMUNICATION_FOCUS,
 	SECURITY_FOCUS,
 	OTHER_FOCUS,
+	COMPANY_INDUSTRY_EXTENDED_KEY,
+	OTHER_COMPANY_INDUSTRY_EXTENDED_KEY,
+	COMPANY_INDUSTRY_KEY,
 } from '../constants';
 import { workflowHelpers } from '@/components/mixins/workflowHelpers';
 import { showMessage } from '@/components/mixins/showMessage';
 import Modal from './Modal.vue';
-import {
-	IFormInputs,
-	IPersonalizationSurveyAnswers,
-	IPersonalizationSurveyKeys,
-} from '@/Interface';
+import { IFormInput, IFormInputs, IPersonalizationSurveyAnswers } from '@/Interface';
 import Vue from 'vue';
 import { mapGetters } from 'vuex';
 
@@ -124,311 +119,7 @@ export default mixins(showMessage, workflowHelpers).extend({
 	components: { Modal },
 	name: 'PersonalizationModal',
 	data() {
-		const survey: IFormInputs = [
-			{
-				name: CODING_SKILL_KEY,
-				properties: {
-					label: this.$locale.baseText('personalizationModal.howAreYourCodingSkills'),
-					type: 'select',
-					placeholder: this.$locale.baseText('personalizationModal.select'),
-					options: [
-						{
-							label: this.$locale.baseText('personalizationModal.neverCoded'),
-							value: '0',
-						},
-						{
-							label: this.$locale.baseText('personalizationModal.iGetStuckTooQuicklyToAchieveMuch'),
-							value: '1',
-						},
-						{
-							label: this.$locale.baseText('personalizationModal.iCanCodeSomeUsefulThingsBut'),
-							value: '2',
-						},
-						{
-							label: this.$locale.baseText('personalizationModal.iKnowEnoughToBeDangerousBut'),
-							value: '3',
-						},
-						{
-							label: this.$locale.baseText('personalizationModal.iCanFigureMostThingsOut'),
-							value: '4',
-						},
-						{
-							label: this.$locale.baseText('personalizationModal.iCanDoAlmostAnythingIWant'),
-							value: '5',
-						},
-					],
-				},
-			},
-			{
-				name: COMPANY_TYPE_KEY,
-				properties: {
-					label: this.$locale.baseText('personalizationModal.whatBestDescribesYourCompany'),
-					type: 'select',
-					placeholder: this.$locale.baseText('personalizationModal.select'),
-					options: [
-						{
-							label: this.$locale.baseText('personalizationModal.saas'),
-							value: SAAS_COMPANY_TYPE,
-						},
-						{
-							label: this.$locale.baseText('personalizationModal.eCommerce'),
-							value: ECOMMERCE_COMPANY_TYPE,
-						},
-						{
-							label: this.$locale.baseText('personalizationModal.managedServiceProvider'),
-							value: MSP_COMPANY_TYPE,
-						},
-						{
-							label: this.$locale.baseText('personalizationModal.digitalAgencyOrConsultant'),
-							value: DIGITAL_AGENCY_COMPANY_TYPE,
-						},
-						{
-							label: this.$locale.baseText('personalizationModal.automationAgencyOrConsultant'),
-							value: AUTOMATION_AGENCY_COMPANY_TYPE,
-						},
-						{
-							label: this.$locale.baseText('personalizationModal.systemsIntegrator'),
-							value: SYSTEMS_INTEGRATOR_COMPANY_TYPE,
-						},
-						{
-							label: this.$locale.baseText('personalizationModal.other'),
-							value: OTHER_COMPANY_TYPE,
-						},
-						{
-							label: this.$locale.baseText('personalizationModal.imNotUsingN8nForWork'),
-							value: PERSONAL_COMPANY_TYPE,
-						},
-					],
-				},
-			},
-			{
-				name: CUSTOMER_TYPE_KEY,
-				properties: {
-					label: this.$locale.baseText('personalizationModal.whatKindOfCustomersDoYouServe'),
-					type: 'select',
-					placeholder: this.$locale.baseText('personalizationModal.select'),
-					options: [
-						{
-							label: this.$locale.baseText('personalizationModal.individualConsumers'),
-							value: INDIVIDUAL_CUSTOMER_TYPE,
-						},
-						{
-							label: this.$locale.baseText('personalizationModal.smallBusinesses'),
-							value: SMALL_CUSTOMER_TYPE,
-						},
-						{
-							label: this.$locale.baseText('personalizationModal.mediumBusinesses'),
-							value: MEDIUM_CUSTOMER_TYPE,
-						},
-						{
-							label: this.$locale.baseText('personalizationModal.largeBusinesses'),
-							value: LARGE_CUSTOMER_TYPE,
-						},
-					],
-				},
-			},
-			{
-				name: MSP_FOCUS_KEY,
-				properties: {
-					label: this.$locale.baseText('personalizationModal.whatDoesYourCompanyFocusOn'),
-					type: 'select',
-					placeholder: this.$locale.baseText('personalizationModal.select'),
-					options: [
-						{
-							label: this.$locale.baseText('personalizationModal.cloudInfrastructure'),
-							value: CLOUD_INFRA_FOCUS,
-						},
-						{
-							label: this.$locale.baseText('personalizationModal.itSupport'),
-							value: IT_SUPPORT_FOCUS,
-						},
-						{
-							label: this.$locale.baseText('personalizationModal.networkingOrCommunication'),
-							value: NETWORKING_COMMUNICATION_FOCUS,
-						},
-						{
-							label: this.$locale.baseText('personalizationModal.security'),
-							value: SECURITY_FOCUS,
-						},
-						{
-							label: this.$locale.baseText('personalizationModal.otherPleaseSpecify'),
-							value: OTHER_FOCUS,
-						},
-					],
-				},
-			},
-			{
-				name: MSP_FOCUS_OTHER_KEY,
-				properties: {
-					placeholder: this.$locale.baseText('personalizationModal.pleaseSpecifyYourCompanyFocus'),
-				},
-			},
-			{
-				name: COMPANY_INDUSTRY_KEY,
-				properties: {
-					type: 'multi-select',
-					label: this.$locale.baseText('personalizationModal.whichIndustriesIsYourCompanyIn'),
-					placeholder: this.$locale.baseText('personalizationModal.select'),
-					options: [
-						{
-							value: EDUCATION_INDUSTRY,
-							label: this.$locale.baseText('personalizationModal.education'),
-						},
-						{
-							value: FINANCE_INSURANCE_INDUSTRY,
-							label: this.$locale.baseText('personalizationModal.financeOrInsurance'),
-						},
-						{
-							value: GOVERNMENT_INDUSTRY,
-							label: this.$locale.baseText('personalizationModal.government'),
-						},
-						{
-							value: HEALTHCARE_INDUSTRY,
-							label: this.$locale.baseText('personalizationModal.healthcare'),
-						},
-						{
-							value: IT_INDUSTRY,
-							label: this.$locale.baseText('personalizationModal.it'),
-						},
-						{
-							value: LEGAL_INDUSTRY,
-							label: this.$locale.baseText('personalizationModal.legal'),
-						},
-						{
-							value: MARKETING_INDUSTRY,
-							label: this.$locale.baseText('personalizationModal.marketing'),
-						},
-						{
-							value: MEDIA_INDUSTRY,
-							label: this.$locale.baseText('personalizationModal.media'),
-						},
-						{
-							value: MANUFACTURING_INDUSTRY,
-							label: this.$locale.baseText('personalizationModal.manufacturing'),
-						},
-						{
-							value: PHYSICAL_RETAIL_OR_SERVICES,
-							label: this.$locale.baseText('personalizationModal.physicalRetailOrServices'),
-						},
-						{
-							value: REAL_ESTATE_OR_CONSTRUCTION,
-							label: this.$locale.baseText('personalizationModal.realEstateOrConstruction'),
-						},
-						{
-							value: SECURITY_INDUSTRY,
-							label: this.$locale.baseText('personalizationModal.security'),
-						},
-						{
-							value: TELECOMS_INDUSTRY,
-							label: this.$locale.baseText('personalizationModal.telecoms'),
-						},
-						{
-							value: OTHER_INDUSTRY_OPTION,
-							label: this.$locale.baseText('personalizationModal.otherPleaseSpecify'),
-						},
-					],
-				},
-			},
-			{
-				name: OTHER_COMPANY_INDUSTRY_KEY,
-				properties: {
-					placeholder: this.$locale.baseText('personalizationModal.specifyYourCompanysIndustry'),
-				},
-			},
-			{
-				name: AUTOMATION_GOAL_KEY,
-				properties: {
-					type: 'select',
-					label: this.$locale.baseText('personalizationModal.whatAreYouLookingToAutomate'),
-					placeholder: this.$locale.baseText('personalizationModal.select'),
-					options: [
-						{
-							value: CUSTOMER_INTEGRATIONS_GOAL,
-							label: this.$locale.baseText('personalizationModal.customerIntegrations'),
-						},
-						{
-							value: CUSTOMER_SUPPORT_GOAL,
-							label: this.$locale.baseText('personalizationModal.customerSupport'),
-						},
-						{
-							value: FINANCE_ACCOUNTING_GOAL,
-							label: this.$locale.baseText('personalizationModal.financeOrAccounting'),
-						},
-						{
-							value: HR_GOAL,
-							label: this.$locale.baseText('personalizationModal.hr'),
-						},
-						{
-							value: OPERATIONS_GOAL,
-							label: this.$locale.baseText('personalizationModal.operations'),
-						},
-						{
-							value: PRODUCT_GOAL,
-							label: this.$locale.baseText('personalizationModal.product'),
-						},
-						{
-							value: SALES_MARKETING_GOAL,
-							label: this.$locale.baseText('personalizationModal.salesAndMarketing'),
-						},
-						{
-							value: SECURITY_GOAL,
-							label: this.$locale.baseText('personalizationModal.security'),
-						},
-						{
-							value: OTHER_AUTOMATION_GOAL,
-							label: this.$locale.baseText('personalizationModal.otherPleaseSpecify'),
-						},
-						{
-							value: NOT_SURE_YET_GOAL,
-							label: this.$locale.baseText('personalizationModal.notSureYet'),
-						},
-					],
-				},
-			},
-			{
-				name: AUTOMATION_GOAL_OTHER_KEY,
-				properties: {
-					placeholder: this.$locale.baseText('personalizationModal.specifyYourAutomationGoal'),
-				},
-			},
-			{
-				name: COMPANY_SIZE_KEY,
-				properties: {
-					type: 'select',
-					label: this.$locale.baseText('personalizationModal.howBigIsYourCompany'),
-					placeholder: this.$locale.baseText('personalizationModal.select'),
-					options: [
-						{
-							label: this.$locale.baseText('personalizationModal.lessThan20People'),
-							value: COMPANY_SIZE_20_OR_LESS,
-						},
-						{
-							label: `20-99 ${this.$locale.baseText('personalizationModal.people')}`,
-							value: COMPANY_SIZE_20_99,
-						},
-						{
-							label: `100-499 ${this.$locale.baseText('personalizationModal.people')}`,
-							value: COMPANY_SIZE_100_499,
-						},
-						{
-							label: `500-999 ${this.$locale.baseText('personalizationModal.people')}`,
-							value: COMPANY_SIZE_500_999,
-						},
-						{
-							label: `1000+ ${this.$locale.baseText('personalizationModal.people')}`,
-							value: COMPANY_SIZE_1000_OR_MORE,
-						},
-						{
-							label: this.$locale.baseText('personalizationModal.imNotUsingN8nForWork'),
-							value: COMPANY_SIZE_PERSONAL_USE,
-						},
-					],
-				},
-			},
-		];
-
 		return {
-			survey,
 			submitted: false,
 			isSaving: false,
 			PERSONALIZATION_MODAL_KEY,
@@ -436,33 +127,369 @@ export default mixins(showMessage, workflowHelpers).extend({
 			otherCompanyIndustryFieldVisible: false,
 			showAllIndustryQuestions: true,
 			modalBus: new Vue(),
-			values: {
-				[WORK_AREA_KEY]: [],
-				[COMPANY_SIZE_KEY]: null,
-				[CODING_SKILL_KEY]: null,
-				[OTHER_WORK_AREA_KEY]: null,
-				[COMPANY_INDUSTRY_KEY]: [],
-				[OTHER_COMPANY_INDUSTRY_KEY]: null,
-			} as IPersonalizationSurveyAnswers,
+			values: {} as IPersonalizationSurveyAnswers,
 		};
 	},
 	computed: {
 		...mapGetters({
 			baseUrl: 'getBaseUrl',
 		}),
+		survey() {
+			const survey: IFormInputs = [
+				{
+					name: CODING_SKILL_KEY,
+					properties: {
+						label: this.$locale.baseText('personalizationModal.howAreYourCodingSkills'),
+						type: 'select',
+						placeholder: this.$locale.baseText('personalizationModal.select'),
+						options: [
+							{
+								label: this.$locale.baseText('personalizationModal.neverCoded'),
+								value: '0',
+							},
+							{
+								label: this.$locale.baseText(
+									'personalizationModal.iGetStuckTooQuicklyToAchieveMuch',
+								),
+								value: '1',
+							},
+							{
+								label: this.$locale.baseText('personalizationModal.iCanCodeSomeUsefulThingsBut'),
+								value: '2',
+							},
+							{
+								label: this.$locale.baseText('personalizationModal.iKnowEnoughToBeDangerousBut'),
+								value: '3',
+							},
+							{
+								label: this.$locale.baseText('personalizationModal.iCanFigureMostThingsOut'),
+								value: '4',
+							},
+							{
+								label: this.$locale.baseText('personalizationModal.iCanDoAlmostAnythingIWant'),
+								value: '5',
+							},
+						],
+					},
+				},
+				{
+					name: COMPANY_TYPE_KEY,
+					properties: {
+						label: this.$locale.baseText('personalizationModal.whatBestDescribesYourCompany'),
+						type: 'select',
+						placeholder: this.$locale.baseText('personalizationModal.select'),
+						options: [
+							{
+								label: this.$locale.baseText('personalizationModal.saas'),
+								value: SAAS_COMPANY_TYPE,
+							},
+							{
+								label: this.$locale.baseText('personalizationModal.eCommerce'),
+								value: ECOMMERCE_COMPANY_TYPE,
+							},
+							{
+								label: this.$locale.baseText('personalizationModal.managedServiceProvider'),
+								value: MSP_COMPANY_TYPE,
+							},
+							{
+								label: this.$locale.baseText('personalizationModal.digitalAgencyOrConsultant'),
+								value: DIGITAL_AGENCY_COMPANY_TYPE,
+							},
+							{
+								label: this.$locale.baseText('personalizationModal.automationAgencyOrConsultant'),
+								value: AUTOMATION_AGENCY_COMPANY_TYPE,
+							},
+							{
+								label: this.$locale.baseText('personalizationModal.systemsIntegrator'),
+								value: SYSTEMS_INTEGRATOR_COMPANY_TYPE,
+							},
+							{
+								label: this.$locale.baseText('personalizationModal.other'),
+								value: OTHER_COMPANY_TYPE,
+							},
+							{
+								label: this.$locale.baseText('personalizationModal.imNotUsingN8nForWork'),
+								value: PERSONAL_COMPANY_TYPE,
+							},
+						],
+					},
+				},
+				{
+					name: CUSTOMER_TYPE_KEY,
+					properties: {
+						label: this.$locale.baseText('personalizationModal.whatKindOfCustomersDoYouServe'),
+						type: 'select',
+						placeholder: this.$locale.baseText('personalizationModal.select'),
+						options: [
+							{
+								label: this.$locale.baseText('personalizationModal.individualConsumers'),
+								value: INDIVIDUAL_CUSTOMER_TYPE,
+							},
+							{
+								label: this.$locale.baseText('personalizationModal.smallBusinesses'),
+								value: SMALL_CUSTOMER_TYPE,
+							},
+							{
+								label: this.$locale.baseText('personalizationModal.mediumBusinesses'),
+								value: MEDIUM_CUSTOMER_TYPE,
+							},
+							{
+								label: this.$locale.baseText('personalizationModal.largeBusinesses'),
+								value: LARGE_CUSTOMER_TYPE,
+							},
+						],
+					},
+				},
+				{
+					name: MSP_FOCUS_KEY,
+					properties: {
+						label: this.$locale.baseText('personalizationModal.whatDoesYourCompanyFocusOn'),
+						type: 'multi-select',
+						placeholder: this.$locale.baseText('personalizationModal.select'),
+						options: [
+							{
+								label: this.$locale.baseText('personalizationModal.cloudInfrastructure'),
+								value: CLOUD_INFRA_FOCUS,
+							},
+							{
+								label: this.$locale.baseText('personalizationModal.itSupport'),
+								value: IT_SUPPORT_FOCUS,
+							},
+							{
+								label: this.$locale.baseText('personalizationModal.networkingOrCommunication'),
+								value: NETWORKING_COMMUNICATION_FOCUS,
+							},
+							{
+								label: this.$locale.baseText('personalizationModal.security'),
+								value: SECURITY_FOCUS,
+							},
+							{
+								label: this.$locale.baseText('personalizationModal.otherPleaseSpecify'),
+								value: OTHER_FOCUS,
+							},
+						],
+					},
+				},
+				{
+					name: MSP_FOCUS_OTHER_KEY,
+					properties: {
+						placeholder: this.$locale.baseText(
+							'personalizationModal.pleaseSpecifyYourCompanyFocus',
+						),
+					},
+				},
+				{
+					name: COMPANY_INDUSTRY_EXTENDED_KEY,
+					properties: {
+						type: 'multi-select',
+						label: this.$locale.baseText('personalizationModal.whichIndustriesIsYourCompanyIn'),
+						placeholder: this.$locale.baseText('personalizationModal.select'),
+						options: [
+							{
+								value: EDUCATION_INDUSTRY,
+								label: this.$locale.baseText('personalizationModal.education'),
+							},
+							{
+								value: FINANCE_INSURANCE_INDUSTRY,
+								label: this.$locale.baseText('personalizationModal.financeOrInsurance'),
+							},
+							{
+								value: GOVERNMENT_INDUSTRY,
+								label: this.$locale.baseText('personalizationModal.government'),
+							},
+							{
+								value: HEALTHCARE_INDUSTRY,
+								label: this.$locale.baseText('personalizationModal.healthcare'),
+							},
+							{
+								value: IT_INDUSTRY,
+								label: this.$locale.baseText('personalizationModal.it'),
+							},
+							{
+								value: LEGAL_INDUSTRY,
+								label: this.$locale.baseText('personalizationModal.legal'),
+							},
+							{
+								value: MARKETING_INDUSTRY,
+								label: this.$locale.baseText('personalizationModal.marketing'),
+							},
+							{
+								value: MEDIA_INDUSTRY,
+								label: this.$locale.baseText('personalizationModal.media'),
+							},
+							{
+								value: MANUFACTURING_INDUSTRY,
+								label: this.$locale.baseText('personalizationModal.manufacturing'),
+							},
+							{
+								value: PHYSICAL_RETAIL_OR_SERVICES,
+								label: this.$locale.baseText('personalizationModal.physicalRetailOrServices'),
+							},
+							{
+								value: REAL_ESTATE_OR_CONSTRUCTION,
+								label: this.$locale.baseText('personalizationModal.realEstateOrConstruction'),
+							},
+							{
+								value: SECURITY_INDUSTRY,
+								label: this.$locale.baseText('personalizationModal.security'),
+							},
+							{
+								value: TELECOMS_INDUSTRY,
+								label: this.$locale.baseText('personalizationModal.telecoms'),
+							},
+							{
+								value: OTHER_INDUSTRY_OPTION,
+								label: this.$locale.baseText('personalizationModal.otherPleaseSpecify'),
+							},
+						],
+					},
+				},
+				{
+					name: OTHER_COMPANY_INDUSTRY_EXTENDED_KEY,
+					properties: {
+						placeholder: this.$locale.baseText('personalizationModal.specifyYourCompanysIndustry'),
+					},
+				},
+				{
+					name: AUTOMATION_GOAL_KEY,
+					properties: {
+						type: 'select',
+						label: this.$locale.baseText('personalizationModal.whatAreYouLookingToAutomate'),
+						placeholder: this.$locale.baseText('personalizationModal.select'),
+						options: [
+							{
+								value: CUSTOMER_INTEGRATIONS_GOAL,
+								label: this.$locale.baseText('personalizationModal.customerIntegrations'),
+							},
+							{
+								value: CUSTOMER_SUPPORT_GOAL,
+								label: this.$locale.baseText('personalizationModal.customerSupport'),
+							},
+							{
+								value: FINANCE_ACCOUNTING_GOAL,
+								label: this.$locale.baseText('personalizationModal.financeOrAccounting'),
+							},
+							{
+								value: HR_GOAL,
+								label: this.$locale.baseText('personalizationModal.hr'),
+							},
+							{
+								value: OPERATIONS_GOAL,
+								label: this.$locale.baseText('personalizationModal.operations'),
+							},
+							{
+								value: PRODUCT_GOAL,
+								label: this.$locale.baseText('personalizationModal.product'),
+							},
+							{
+								value: SALES_MARKETING_GOAL,
+								label: this.$locale.baseText('personalizationModal.salesAndMarketing'),
+							},
+							{
+								value: SECURITY_GOAL,
+								label: this.$locale.baseText('personalizationModal.security'),
+							},
+							{
+								value: OTHER_AUTOMATION_GOAL,
+								label: this.$locale.baseText('personalizationModal.otherPleaseSpecify'),
+							},
+							{
+								value: NOT_SURE_YET_GOAL,
+								label: this.$locale.baseText('personalizationModal.notSureYet'),
+							},
+						],
+					},
+				},
+				{
+					name: AUTOMATION_GOAL_OTHER_KEY,
+					properties: {
+						placeholder: this.$locale.baseText('personalizationModal.specifyYourAutomationGoal'),
+					},
+				},
+				{
+					name: COMPANY_SIZE_KEY,
+					properties: {
+						type: 'select',
+						label: this.$locale.baseText('personalizationModal.howBigIsYourCompany'),
+						placeholder: this.$locale.baseText('personalizationModal.select'),
+						options: [
+							{
+								label: this.$locale.baseText('personalizationModal.lessThan20People'),
+								value: COMPANY_SIZE_20_OR_LESS,
+							},
+							{
+								label: `20-99 ${this.$locale.baseText('personalizationModal.people')}`,
+								value: COMPANY_SIZE_20_99,
+							},
+							{
+								label: `100-499 ${this.$locale.baseText('personalizationModal.people')}`,
+								value: COMPANY_SIZE_100_499,
+							},
+							{
+								label: `500-999 ${this.$locale.baseText('personalizationModal.people')}`,
+								value: COMPANY_SIZE_500_999,
+							},
+							{
+								label: `1000+ ${this.$locale.baseText('personalizationModal.people')}`,
+								value: COMPANY_SIZE_1000_OR_MORE,
+							},
+							{
+								label: this.$locale.baseText('personalizationModal.imNotUsingN8nForWork'),
+								value: COMPANY_SIZE_PERSONAL_USE,
+							},
+						],
+					},
+				},
+			];
+
+			return survey;
+		},
 	},
 	methods: {
 		closeDialog() {
 			this.modalBus.$emit('close');
 		},
-		onMultiInput(name: IPersonalizationSurveyKeys, value: string[]) {
-			if (name === COMPANY_INDUSTRY_KEY) {
-				this.otherCompanyIndustryFieldVisible = value.includes(OTHER_INDUSTRY_OPTION);
-				this.values[OTHER_COMPANY_INDUSTRY_KEY] = value.includes(OTHER_INDUSTRY_OPTION)
-					? this.values[OTHER_COMPANY_INDUSTRY_KEY]
-					: null;
-				this.values[COMPANY_INDUSTRY_KEY] = value;
+		filterInput(input: IFormInput, values: IPersonalizationSurveyAnswers) {
+			const companyType = values[COMPANY_TYPE_KEY];
+			if (input.name === CUSTOMER_TYPE_KEY) {
+				return (
+					companyType &&
+					![
+						OTHER_COMPANY_TYPE,
+						PERSONAL_COMPANY_TYPE,
+						ECOMMERCE_COMPANY_TYPE,
+						MSP_COMPANY_TYPE,
+					].includes(companyType)
+				);
+			}
+
+			if (input.name === MSP_FOCUS_KEY) {
+				return companyType === MSP_COMPANY_TYPE;
+			}
+
+			if (input.name === MSP_FOCUS_OTHER_KEY) {
+				const mspFocus = values[MSP_FOCUS_KEY];
+				return mspFocus && mspFocus.includes(OTHER_FOCUS);
 			}
+
+			if (input.name === COMPANY_INDUSTRY_EXTENDED_KEY) {
+				return companyType === OTHER_COMPANY_TYPE;
+			}
+
+			if (input.name === OTHER_COMPANY_INDUSTRY_EXTENDED_KEY) {
+				const companyIndustry = values[COMPANY_INDUSTRY_KEY];
+				return companyIndustry && companyIndustry.includes(OTHER_INDUSTRY_OPTION);
+			}
+
+			if (input.name === AUTOMATION_GOAL_KEY || input.name === COMPANY_SIZE_KEY) {
+				return companyType !== PERSONAL_COMPANY_TYPE;
+			}
+
+			if (input.name === AUTOMATION_GOAL_OTHER_KEY) {
+				return values[AUTOMATION_GOAL_KEY] === OTHER_AUTOMATION_GOAL;
+			}
+
+			return true;
 		},
 		async save(): Promise<void> {
 			this.$data.isSaving = true;
@@ -470,11 +497,7 @@ export default mixins(showMessage, workflowHelpers).extend({
 			try {
 				await this.$store.dispatch('users/submitPersonalizationSurvey', this.values);
 
-				if (
-					this.values[WORK_AREA_KEY] === null &&
-					this.values[COMPANY_SIZE_KEY] === null &&
-					this.values[CODING_SKILL_KEY] === null
-				) {
+				if (Object.keys(this.values).length === 0) {
 					this.closeDialog();
 				}
 
diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index 86d2a12d30269..89c420a2690e1 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -142,6 +142,7 @@ export const OTHER_FOCUS = 'other';
 export const MSP_FOCUS_OTHER_KEY = 'mspFocusOther';
 
 export const COMPANY_INDUSTRY_KEY = 'companyIndustry';
+export const COMPANY_INDUSTRY_EXTENDED_KEY = 'companyIndustryExtended';
 export const EDUCATION_INDUSTRY = 'education';
 export const AUTOMATION_CONSULTING_INDUSTRY = 'automation-consulting';
 export const PHYSICAL_RETAIL_OR_SERVICES = 'physical-retail-or-services';
@@ -171,9 +172,10 @@ export const COMPANY_SIZE_PERSONAL_USE = 'personalUser';
 export const CODING_SKILL_KEY = 'codingSkill';
 export const OTHER_WORK_AREA_KEY = 'otherWorkArea';
 export const OTHER_COMPANY_INDUSTRY_KEY = 'otherCompanyIndustry';
+export const OTHER_COMPANY_INDUSTRY_EXTENDED_KEY = 'otherCompanyIndustryExtended';
 
-export const AUTOMATION_GOAL_KEY = 'automationGoalKey';
-export const AUTOMATION_GOAL_OTHER_KEY = 'automationGoalOtherKey';
+export const AUTOMATION_GOAL_KEY = 'automationGoal';
+export const AUTOMATION_GOAL_OTHER_KEY = 'otherAutomationGoal';
 export const CUSTOMER_INTEGRATIONS_GOAL = 'customer-integrations';
 export const CUSTOMER_SUPPORT_GOAL = 'customer-support';
 export const FINANCE_ACCOUNTING_GOAL = 'finance-accounting';
diff --git a/packages/editor-ui/src/modules/userHelpers.ts b/packages/editor-ui/src/modules/userHelpers.ts
index 87d093a25e3e3..30ea2bdc40070 100644
--- a/packages/editor-ui/src/modules/userHelpers.ts
+++ b/packages/editor-ui/src/modules/userHelpers.ts
@@ -176,7 +176,7 @@ export function getPersonalizedNodeTypes(answers: IPersonalizationSurveyAnswers)
 		}
 	}
 
-	const workAreaIsEmpty = workArea === null || workArea.length === 0;
+	const workAreaIsEmpty = !workArea|| workArea.length === 0;
 
 	if (companySize === null && workAreaIsEmpty && answers[CODING_SKILL_KEY] === null) {
 		return [];

From 2b7e6d3fdfc46fbea7d38ac339f448dea64a2012 Mon Sep 17 00:00:00 2001
From: Mutasem <mutdmour@gmail.com>
Date: Mon, 28 Feb 2022 13:04:53 +0300
Subject: [PATCH 04/15] fix recommendation logic

---
 packages/editor-ui/src/Interface.ts           |  19 +--
 packages/editor-ui/src/api/users.ts           |   4 +-
 .../src/components/PersonalizationModal.vue   |  26 +++--
 packages/editor-ui/src/constants.ts           |   9 ++
 packages/editor-ui/src/modules/userHelpers.ts | 109 +++++++++++++++++-
 packages/editor-ui/src/modules/users.ts       |   6 +-
 6 files changed, 147 insertions(+), 26 deletions(-)

diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index 1a6744b637e90..33afe3f43fce7 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -483,21 +483,26 @@ export interface IVersionNotificationSettings {
 	infoUrl: string;
 }
 
-// must remain backwards compatible even as survey changes
-export type IPersonalizationSurveyAnswers = {
-	automationGoal?: string | null;
+export type IPersonalizationSurveyAnswersV1 = {
 	codingSkill?: string | null;
 	companyIndustry?: string[] | null;
+	companySize?: string | null;
+	otherCompanyIndustry?: string | null;
+	otherWorkArea?: string | null;
+	workArea?: string[] | string | null;
+};
+
+export type IPersonalizationSurveyAnswersV2 = {
+	version: 'v2';
+	automationGoal?: string | null;
+	codingSkill?: string | null;
 	companyIndustryExtended?: string[] | null;
 	companySize?: string | null;
 	companyType?: string | null;
 	mspFocus?: string[] | null;
 	mspFocusOther?: string | null;
 	otherAutomationGoal?: string | null;
-	otherCompanyIndustry?: string | null;
 	otherCompanyIndustryExtended?: string[] | null;
-	otherWorkArea?: string | null;
-	workArea?: string[] | string | null;
 };
 
 export interface IN8nPrompts {
@@ -798,7 +803,7 @@ export interface IUserResponse {
 		name: IRole;
 		id: string;
 	};
-	personalizationAnswers?: IPersonalizationSurveyAnswers | null;
+	personalizationAnswers?: IPersonalizationSurveyAnswersV1 | IPersonalizationSurveyAnswersV2 | null;
 }
 
 export interface IInviteResponse {
diff --git a/packages/editor-ui/src/api/users.ts b/packages/editor-ui/src/api/users.ts
index ce194fb85e6ad..7e8a3cef2aec6 100644
--- a/packages/editor-ui/src/api/users.ts
+++ b/packages/editor-ui/src/api/users.ts
@@ -1,4 +1,4 @@
-import { IInviteResponse, IPersonalizationSurveyAnswers, IRestApiContext, IUserResponse } from '@/Interface';
+import { IInviteResponse, IPersonalizationSurveyAnswersV2, IRestApiContext, IUserResponse } from '@/Interface';
 import { IDataObject } from 'n8n-workflow';
 import { makeRestApiRequest } from './helpers';
 
@@ -67,6 +67,6 @@ export async function reinvite(context: IRestApiContext, {id}: {id: string}): Pr
 	await makeRestApiRequest(context, 'POST', `/users/${id}/reinvite`);
 }
 
-export async function submitPersonalizationSurvey(context: IRestApiContext, params: IPersonalizationSurveyAnswers): Promise<void> {
+export async function submitPersonalizationSurvey(context: IRestApiContext, params: IPersonalizationSurveyAnswersV2): Promise<void> {
 	await makeRestApiRequest(context, 'POST', '/me/survey', params as unknown as IDataObject);
 }
diff --git a/packages/editor-ui/src/components/PersonalizationModal.vue b/packages/editor-ui/src/components/PersonalizationModal.vue
index ea302cc8b8714..424d595da8208 100644
--- a/packages/editor-ui/src/components/PersonalizationModal.vue
+++ b/packages/editor-ui/src/components/PersonalizationModal.vue
@@ -13,7 +13,7 @@
 		:closeOnClickModal="false"
 		:closeOnPressEscape="false"
 		width="460px"
-		@enter="save"
+		@enter="onSave"
 	>
 		<template v-slot:content>
 			<div v-if="submitted" :class="$style.submittedContainer">
@@ -21,7 +21,7 @@
 				<n8n-text>{{ $locale.baseText('personalizationModal.lookOutForThingsMarked') }}</n8n-text>
 			</div>
 			<div :class="$style.container" v-else>
-				<n8n-form-inputs :inputs="survey" :columnView="true" :filterInput="filterInput" />
+				<n8n-form-inputs :inputs="survey" :columnView="true" :eventBus="formBus" :filterInput="filterInput" @submit="onSubmit"/>
 			</div>
 		</template>
 		<template v-slot:footer>
@@ -34,7 +34,7 @@
 				/>
 				<n8n-button
 					v-else
-					@click="save"
+					@click="onSave"
 					:loading="isSaving"
 					:label="$locale.baseText('personalizationModal.continue')"
 					float="right"
@@ -47,6 +47,8 @@
 <script lang="ts">
 import mixins from 'vue-typed-mixins';
 
+const SURVEY_VERSION = 'v2';
+
 import {
 	CODING_SKILL_KEY,
 	COMPANY_SIZE_100_499,
@@ -106,12 +108,11 @@ import {
 	OTHER_FOCUS,
 	COMPANY_INDUSTRY_EXTENDED_KEY,
 	OTHER_COMPANY_INDUSTRY_EXTENDED_KEY,
-	COMPANY_INDUSTRY_KEY,
 } from '../constants';
 import { workflowHelpers } from '@/components/mixins/workflowHelpers';
 import { showMessage } from '@/components/mixins/showMessage';
 import Modal from './Modal.vue';
-import { IFormInput, IFormInputs, IPersonalizationSurveyAnswers } from '@/Interface';
+import { IFormInput, IFormInputs, IPersonalizationSurveyAnswersV2 } from '@/Interface';
 import Vue from 'vue';
 import { mapGetters } from 'vuex';
 
@@ -127,7 +128,7 @@ export default mixins(showMessage, workflowHelpers).extend({
 			otherCompanyIndustryFieldVisible: false,
 			showAllIndustryQuestions: true,
 			modalBus: new Vue(),
-			values: {} as IPersonalizationSurveyAnswers,
+			formBus: new Vue(),
 		};
 	},
 	computed: {
@@ -449,7 +450,7 @@ export default mixins(showMessage, workflowHelpers).extend({
 		closeDialog() {
 			this.modalBus.$emit('close');
 		},
-		filterInput(input: IFormInput, values: IPersonalizationSurveyAnswers) {
+		filterInput(input: IFormInput, values: IPersonalizationSurveyAnswersV2) {
 			const companyType = values[COMPANY_TYPE_KEY];
 			if (input.name === CUSTOMER_TYPE_KEY) {
 				return (
@@ -477,7 +478,7 @@ export default mixins(showMessage, workflowHelpers).extend({
 			}
 
 			if (input.name === OTHER_COMPANY_INDUSTRY_EXTENDED_KEY) {
-				const companyIndustry = values[COMPANY_INDUSTRY_KEY];
+				const companyIndustry = values[COMPANY_INDUSTRY_EXTENDED_KEY];
 				return companyIndustry && companyIndustry.includes(OTHER_INDUSTRY_OPTION);
 			}
 
@@ -491,13 +492,16 @@ export default mixins(showMessage, workflowHelpers).extend({
 
 			return true;
 		},
-		async save(): Promise<void> {
+		onSave() {
+			this.formBus.$emit('submit');
+		},
+		async onSubmit(values: IPersonalizationSurveyAnswersV2): Promise<void> {
 			this.$data.isSaving = true;
 
 			try {
-				await this.$store.dispatch('users/submitPersonalizationSurvey', this.values);
+				await this.$store.dispatch('users/submitPersonalizationSurvey', {...values, version: SURVEY_VERSION});
 
-				if (Object.keys(this.values).length === 0) {
+				if (Object.keys(values).length === 0) {
 					this.closeDialog();
 				}
 
diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index 89c420a2690e1..5fbc7c862cde9 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -56,23 +56,32 @@ export const ELASTIC_SECURITY_NODE_TYPE = 'n8n-nodes-base.elasticSecurity';
 export const EMAIL_SEND_NODE_TYPE = 'n8n-nodes-base.emailSend';
 export const EXECUTE_COMMAND_NODE_TYPE = 'n8n-nodes-base.executeCommand';
 export const HTTP_REQUEST_NODE_TYPE = 'n8n-nodes-base.httpRequest';
+export const HUBSPOT_TRIGGER_NODE_TYPE = 'n8n-nodes-base.hubspotTrigger';
 export const IF_NODE_TYPE = 'n8n-nodes-base.if';
 export const ITEM_LISTS_NODE_TYPE = 'n8n-nodes-base.itemLists';
+export const JIRA_NODE_TYPE = 'n8n-nodes-base.jira';
 export const JIRA_TRIGGER_NODE_TYPE = 'n8n-nodes-base.jiraTrigger';
 export const MICROSOFT_EXCEL_NODE_TYPE = 'n8n-nodes-base.microsoftExcel';
 export const MICROSOFT_TEAMS_NODE_TYPE = 'n8n-nodes-base.microsoftTeams';
 export const NO_OP_NODE_TYPE = 'n8n-nodes-base.noOp';
+export const NOTION_TRIGGER_NODE_TYPE = 'n8n-nodes-base.notionTrigger';
 export const PAGERDUTY_NODE_TYPE = 'n8n-nodes-base.pagerDuty';
 export const SALESFORCE_NODE_TYPE = 'n8n-nodes-base.salesforce';
 export const SEGMENT_NODE_TYPE = 'n8n-nodes-base.segment';
 export const SET_NODE_TYPE = 'n8n-nodes-base.set';
+export const SERVICENOW_NODE_TYPE = 'n8n-nodes-base.serviceNow';
 export const SLACK_NODE_TYPE = 'n8n-nodes-base.slack';
 export const SPREADSHEET_FILE_NODE_TYPE = 'n8n-nodes-base.spreadsheetFile';
 export const START_NODE_TYPE = 'n8n-nodes-base.start';
 export const SWITCH_NODE_TYPE = 'n8n-nodes-base.switch';
+export const THE_HIVE_TRIGGER_NODE_TYPE = 'n8n-nodes-base.theHiveTrigger';
 export const QUICKBOOKS_NODE_TYPE = 'n8n-nodes-base.quickbooks';
 export const WEBHOOK_NODE_TYPE = 'n8n-nodes-base.webhook';
+export const WORKABLE_TRIGGER_NODE_TYPE = 'n8n-nodes-base.workableTrigger';
+export const WOOCOMMERCE_TRIGGER_NODE_TYPE = 'n8n-nodes-base.wooCommerceTrigger';
 export const XERO_NODE_TYPE = 'n8n-nodes-base.xero';
+export const ZENDESK_NODE_TYPE = 'n8n-nodes-base.zendesk';
+export const ZENDESK_TRIGGER_NODE_TYPE = 'n8n-nodes-base.zendeskTrigger';
 
 // Node creator
 export const CORE_NODES_CATEGORY = 'Core Nodes';
diff --git a/packages/editor-ui/src/modules/userHelpers.ts b/packages/editor-ui/src/modules/userHelpers.ts
index 30ea2bdc40070..7b4d080338724 100644
--- a/packages/editor-ui/src/modules/userHelpers.ts
+++ b/packages/editor-ui/src/modules/userHelpers.ts
@@ -1,6 +1,6 @@
 
-import { CALENDLY_TRIGGER_NODE_TYPE, CLEARBIT_NODE_TYPE, COMPANY_SIZE_1000_OR_MORE, COMPANY_SIZE_500_999, CRON_NODE_TYPE, ELASTIC_SECURITY_NODE_TYPE, EMAIL_SEND_NODE_TYPE, EXECUTE_COMMAND_NODE_TYPE, FINANCE_WORK_AREA, FUNCTION_NODE_TYPE, GITHUB_TRIGGER_NODE_TYPE, HTTP_REQUEST_NODE_TYPE, IF_NODE_TYPE, ITEM_LISTS_NODE_TYPE, IT_ENGINEERING_WORK_AREA, JIRA_TRIGGER_NODE_TYPE, MICROSOFT_EXCEL_NODE_TYPE, MICROSOFT_TEAMS_NODE_TYPE, PERSONALIZATION_MODAL_KEY, PAGERDUTY_NODE_TYPE, PRODUCT_WORK_AREA, QUICKBOOKS_NODE_TYPE, SALESFORCE_NODE_TYPE, SALES_BUSINESSDEV_WORK_AREA, SECURITY_WORK_AREA, SEGMENT_NODE_TYPE, SET_NODE_TYPE, SLACK_NODE_TYPE, SPREADSHEET_FILE_NODE_TYPE, SWITCH_NODE_TYPE, WEBHOOK_NODE_TYPE, XERO_NODE_TYPE, COMPANY_SIZE_KEY, WORK_AREA_KEY, CODING_SKILL_KEY } from '@/constants';
-import { IPermissions, IPersonalizationSurveyAnswers, IUser } from '@/Interface';
+import { CALENDLY_TRIGGER_NODE_TYPE, CLEARBIT_NODE_TYPE, COMPANY_SIZE_1000_OR_MORE, COMPANY_SIZE_500_999, CRON_NODE_TYPE, ELASTIC_SECURITY_NODE_TYPE, EMAIL_SEND_NODE_TYPE, EXECUTE_COMMAND_NODE_TYPE, FINANCE_WORK_AREA, FUNCTION_NODE_TYPE, GITHUB_TRIGGER_NODE_TYPE, HTTP_REQUEST_NODE_TYPE, IF_NODE_TYPE, ITEM_LISTS_NODE_TYPE, IT_ENGINEERING_WORK_AREA, JIRA_TRIGGER_NODE_TYPE, MICROSOFT_EXCEL_NODE_TYPE, MICROSOFT_TEAMS_NODE_TYPE, PERSONALIZATION_MODAL_KEY, PAGERDUTY_NODE_TYPE, PRODUCT_WORK_AREA, QUICKBOOKS_NODE_TYPE, SALESFORCE_NODE_TYPE, SALES_BUSINESSDEV_WORK_AREA, SECURITY_WORK_AREA, SEGMENT_NODE_TYPE, SET_NODE_TYPE, SLACK_NODE_TYPE, SPREADSHEET_FILE_NODE_TYPE, SWITCH_NODE_TYPE, WEBHOOK_NODE_TYPE, XERO_NODE_TYPE, COMPANY_SIZE_KEY, WORK_AREA_KEY, CODING_SKILL_KEY, COMPANY_TYPE_KEY, ECOMMERCE_COMPANY_TYPE, MSP_COMPANY_TYPE, PERSONAL_COMPANY_TYPE, AUTOMATION_GOAL_KEY, OTHER_AUTOMATION_GOAL, NOT_SURE_YET_GOAL, CUSTOMER_INTEGRATIONS_GOAL, CUSTOMER_SUPPORT_GOAL, FINANCE_ACCOUNTING_GOAL, ZENDESK_TRIGGER_NODE_TYPE, WOOCOMMERCE_TRIGGER_NODE_TYPE, SALES_MARKETING_GOAL, HUBSPOT_TRIGGER_NODE_TYPE, HR_GOAL, WORKABLE_TRIGGER_NODE_TYPE, OPERATIONS_GOAL, PRODUCT_GOAL, NOTION_TRIGGER_NODE_TYPE, SECURITY_GOAL, THE_HIVE_TRIGGER_NODE_TYPE, ZENDESK_NODE_TYPE, SERVICENOW_NODE_TYPE, JIRA_NODE_TYPE } from '@/constants';
+import { IPermissions, IPersonalizationSurveyAnswersV1, IPersonalizationSurveyAnswersV2, IUser } from '@/Interface';
 
 import { ILogInStatus, IRole, IUserPermissions } from "@/Interface";
 
@@ -164,7 +164,110 @@ export const isAuthorized = (permissions: IPermissions, {currentUser, isUMEnable
 	return false;
 };
 
-export function getPersonalizedNodeTypes(answers: IPersonalizationSurveyAnswers) {
+export function getPersonalizedNodeTypes(answers: IPersonalizationSurveyAnswersV1 | IPersonalizationSurveyAnswersV2 | null): string[] {
+	if (!answers) {
+		return [];
+	}
+
+	// @ts-ignore
+	if (answers.version === 'v2') {
+		return getPersonalizationV2(answers as IPersonalizationSurveyAnswersV2);
+	}
+
+	return getPersonalizationV1(answers as IPersonalizationSurveyAnswersV1);
+}
+
+function getPersonalizationV2(answers: IPersonalizationSurveyAnswersV2) {
+	let nodeTypes: string[] = [];
+
+	const companySize = answers[COMPANY_SIZE_KEY];
+	const companyType = answers[COMPANY_TYPE_KEY];
+	const automationGoal = answers[AUTOMATION_GOAL_KEY];
+
+	let codingSkill = null;
+	if (answers[CODING_SKILL_KEY]) {
+		codingSkill = parseInt(answers[CODING_SKILL_KEY] as string, 10);
+		codingSkill = isNaN(codingSkill)? 0 : codingSkill;
+	}
+
+	// slot 1 trigger
+	if (companyType === ECOMMERCE_COMPANY_TYPE) {
+		nodeTypes = nodeTypes.concat(WOOCOMMERCE_TRIGGER_NODE_TYPE);
+	} else if (companyType === MSP_COMPANY_TYPE) {
+		nodeTypes = nodeTypes.concat(JIRA_TRIGGER_NODE_TYPE);
+	} else if((companyType === PERSONAL_COMPANY_TYPE || automationGoal === OTHER_AUTOMATION_GOAL ||  automationGoal === NOT_SURE_YET_GOAL) && codingSkill !== null && codingSkill >= 4) {
+		nodeTypes = nodeTypes.concat(WEBHOOK_NODE_TYPE);
+	} else if((companyType === PERSONAL_COMPANY_TYPE || automationGoal === OTHER_AUTOMATION_GOAL ||  automationGoal === NOT_SURE_YET_GOAL) && codingSkill !== null && codingSkill < 3) {
+		nodeTypes = nodeTypes.concat(CRON_NODE_TYPE);
+	} else if (automationGoal === CUSTOMER_INTEGRATIONS_GOAL) {
+		nodeTypes = nodeTypes.concat(WEBHOOK_NODE_TYPE);
+	} else if (automationGoal === CUSTOMER_SUPPORT_GOAL || automationGoal === FINANCE_ACCOUNTING_GOAL) {
+		nodeTypes = nodeTypes.concat(ZENDESK_TRIGGER_NODE_TYPE);
+	} else if (automationGoal === SALES_MARKETING_GOAL) {
+		nodeTypes = nodeTypes.concat(HUBSPOT_TRIGGER_NODE_TYPE);
+	} else if (automationGoal === HR_GOAL) {
+		nodeTypes = nodeTypes.concat(WORKABLE_TRIGGER_NODE_TYPE);
+	} else if (automationGoal === OPERATIONS_GOAL) {
+		nodeTypes = nodeTypes.concat(CRON_NODE_TYPE);
+	} else if (automationGoal === PRODUCT_GOAL) {
+		nodeTypes = nodeTypes.concat(NOTION_TRIGGER_NODE_TYPE);
+	} else if (automationGoal === SECURITY_GOAL) {
+		nodeTypes = nodeTypes.concat(THE_HIVE_TRIGGER_NODE_TYPE);
+	} else {
+		nodeTypes = nodeTypes.concat(WEBHOOK_NODE_TYPE);
+	}
+
+	// slot 2 data transformation
+	if (codingSkill !== null && codingSkill >= 4) {
+		nodeTypes = nodeTypes.concat(FUNCTION_NODE_TYPE);
+	} else {
+		nodeTypes = nodeTypes.concat(ITEM_LISTS_NODE_TYPE);
+	}
+
+	// slot 3 logic node
+	if (codingSkill !== null && codingSkill < 3) {
+		nodeTypes = nodeTypes.concat(IF_NODE_TYPE);
+	}
+	else {
+		nodeTypes = nodeTypes.concat(SWITCH_NODE_TYPE);
+	}
+
+	// slot 4 usecase #1
+	if (companySize === COMPANY_SIZE_1000_OR_MORE || companySize === COMPANY_SIZE_1000_OR_MORE) {
+		switch (automationGoal) {
+			case CUSTOMER_INTEGRATIONS_GOAL:
+				nodeTypes = nodeTypes.concat(HTTP_REQUEST_NODE_TYPE);
+				break;
+			case CUSTOMER_SUPPORT_GOAL:
+				nodeTypes = nodeTypes.concat(ZENDESK_NODE_TYPE);
+				break;
+			case SALES_MARKETING_GOAL:
+				nodeTypes = nodeTypes.concat(SALESFORCE_NODE_TYPE);
+				break;
+			case HR_GOAL:
+				nodeTypes = nodeTypes.concat(SERVICENOW_NODE_TYPE);
+				break;
+			case PRODUCT_GOAL:
+				nodeTypes = nodeTypes.concat(JIRA_NODE_TYPE);
+				break;
+			case FINANCE_ACCOUNTING_GOAL:
+				nodeTypes = nodeTypes.concat(SPREADSHEET_FILE_NODE_TYPE);
+				break;
+			case SECURITY_GOAL:
+				nodeTypes = nodeTypes.concat(ELASTIC_SECURITY_NODE_TYPE);
+				break;
+			default:
+				nodeTypes = nodeTypes.concat(SLACK_NODE_TYPE);
+		}
+	}
+
+	// slot 4
+	nodeTypes = nodeTypes.concat(SET_NODE_TYPE);
+
+	return nodeTypes;
+}
+
+function getPersonalizationV1(answers: IPersonalizationSurveyAnswersV1) {
 	const companySize = answers[COMPANY_SIZE_KEY];
 	const workArea = answers[WORK_AREA_KEY];
 
diff --git a/packages/editor-ui/src/modules/users.ts b/packages/editor-ui/src/modules/users.ts
index c5e9164245ff2..67e0e4bff187f 100644
--- a/packages/editor-ui/src/modules/users.ts
+++ b/packages/editor-ui/src/modules/users.ts
@@ -5,7 +5,7 @@ import {  ActionContext, Module } from 'vuex';
 import {
 	IInviteResponse,
 	IPermissions,
-	IPersonalizationSurveyAnswers,
+	IPersonalizationSurveyAnswersV2,
 	IRootState,
 	IUser,
 	IUserResponse,
@@ -51,7 +51,7 @@ const module: Module<IUsersState, IRootState> = {
 		deleteUser: (state: IUsersState, userId: string) => {
 			Vue.delete(state.users, userId);
 		},
-		setPersonalizationAnswers(state: IUsersState, answers: IPersonalizationSurveyAnswers) {
+		setPersonalizationAnswers(state: IUsersState, answers: IPersonalizationSurveyAnswersV2) {
 			if (!state.currentUserId) {
 				return;
 			}
@@ -191,7 +191,7 @@ const module: Module<IUsersState, IRootState> = {
 		async reinviteUser(context: ActionContext<IUsersState, IRootState>, params: {id: string}) {
 			await reinvite(context.rootGetters.getRestApiContext, params);
 		},
-		async submitPersonalizationSurvey(context: ActionContext<IUsersState, IRootState>, results: IPersonalizationSurveyAnswers) {
+		async submitPersonalizationSurvey(context: ActionContext<IUsersState, IRootState>, results: IPersonalizationSurveyAnswersV2) {
 			await submitPersonalizationSurvey(context.rootGetters.getRestApiContext, results);
 
 			context.commit('setPersonalizationAnswers', results);

From 1a340b7af92f9109942f58739cbc2f7b73afbe8d Mon Sep 17 00:00:00 2001
From: Mutasem <mutdmour@gmail.com>
Date: Mon, 28 Feb 2022 13:05:30 +0300
Subject: [PATCH 05/15] set to false

---
 packages/editor-ui/src/modules/ui.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/src/modules/ui.ts b/packages/editor-ui/src/modules/ui.ts
index 094b028663672..bb015c4b927df 100644
--- a/packages/editor-ui/src/modules/ui.ts
+++ b/packages/editor-ui/src/modules/ui.ts
@@ -56,7 +56,7 @@ const module: Module<IUiState, IRootState> = {
 				open: false,
 			},
 			[PERSONALIZATION_MODAL_KEY]: {
-				open: true,
+				open: false,
 			},
 			[INVITE_USER_MODAL_KEY]: {
 				open: false,

From b7ee173b6da02ec8efafdf3d3e6fc583d06ca5af Mon Sep 17 00:00:00 2001
From: Mutasem <mutdmour@gmail.com>
Date: Tue, 1 Mar 2022 15:00:08 +0300
Subject: [PATCH 06/15] hide suggested nodes when empty

---
 packages/editor-ui/src/modules/userHelpers.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/editor-ui/src/modules/userHelpers.ts b/packages/editor-ui/src/modules/userHelpers.ts
index 85c8acccfc700..a8d5824d300bd 100644
--- a/packages/editor-ui/src/modules/userHelpers.ts
+++ b/packages/editor-ui/src/modules/userHelpers.ts
@@ -200,6 +200,11 @@ export function getPersonalizedNodeTypes(answers: IPersonalizationSurveyAnswersV
 function getPersonalizationV2(answers: IPersonalizationSurveyAnswersV2) {
 	let nodeTypes: string[] = [];
 
+	const {version, ...data} = answers;
+	if (Object.values(data).length === 0) {
+		return [];
+	}
+
 	const companySize = answers[COMPANY_SIZE_KEY];
 	const companyType = answers[COMPANY_TYPE_KEY];
 	const automationGoal = answers[AUTOMATION_GOAL_KEY];

From 06c98b5d9bcfa925769c546d329b92858d47b294 Mon Sep 17 00:00:00 2001
From: Mutasem <mutdmour@gmail.com>
Date: Tue, 1 Mar 2022 15:00:53 +0300
Subject: [PATCH 07/15] use keys

---
 packages/editor-ui/src/modules/userHelpers.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/src/modules/userHelpers.ts b/packages/editor-ui/src/modules/userHelpers.ts
index a8d5824d300bd..f84dcf8612267 100644
--- a/packages/editor-ui/src/modules/userHelpers.ts
+++ b/packages/editor-ui/src/modules/userHelpers.ts
@@ -201,7 +201,7 @@ function getPersonalizationV2(answers: IPersonalizationSurveyAnswersV2) {
 	let nodeTypes: string[] = [];
 
 	const {version, ...data} = answers;
-	if (Object.values(data).length === 0) {
+	if (Object.keys(data).length === 0) {
 		return [];
 	}
 

From acf1f8000d67db582bf4d0b3ea8937bfb9450515 Mon Sep 17 00:00:00 2001
From: Mutasem <mutdmour@gmail.com>
Date: Tue, 1 Mar 2022 15:15:00 +0300
Subject: [PATCH 08/15] add missing logic

---
 packages/editor-ui/src/constants.ts           |  2 ++
 packages/editor-ui/src/modules/userHelpers.ts | 28 ++++++++++++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index 78a0031520d09..2523743971591 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -45,11 +45,13 @@ export const BREAKPOINT_XL = 1920;
 export const N8N_IO_BASE_URL = `https://api.n8n.io/`;
 
 // node types
+export const BAMBOO_HR_NODE_TYPE = 'n8n-nodes-base.bambooHr';
 export const CALENDLY_TRIGGER_NODE_TYPE = 'n8n-nodes-base.calendlyTrigger';
 export const CRON_NODE_TYPE = 'n8n-nodes-base.cron';
 export const CLEARBIT_NODE_TYPE = 'n8n-nodes-base.clearbit';
 export const FUNCTION_NODE_TYPE = 'n8n-nodes-base.function';
 export const GITHUB_TRIGGER_NODE_TYPE = 'n8n-nodes-base.githubTrigger';
+export const GOOGLE_SHEETS_NODE_TYPE = 'n8n-nodes-base.googleSheets';
 export const ERROR_TRIGGER_NODE_TYPE = 'n8n-nodes-base.errorTrigger';
 export const ELASTIC_SECURITY_NODE_TYPE = 'n8n-nodes-base.elasticSecurity';
 export const EMAIL_SEND_NODE_TYPE = 'n8n-nodes-base.emailSend';
diff --git a/packages/editor-ui/src/modules/userHelpers.ts b/packages/editor-ui/src/modules/userHelpers.ts
index f84dcf8612267..7d8e728134336 100644
--- a/packages/editor-ui/src/modules/userHelpers.ts
+++ b/packages/editor-ui/src/modules/userHelpers.ts
@@ -1,5 +1,5 @@
 
-import { CALENDLY_TRIGGER_NODE_TYPE, CLEARBIT_NODE_TYPE, COMPANY_SIZE_1000_OR_MORE, COMPANY_SIZE_500_999, CRON_NODE_TYPE, ELASTIC_SECURITY_NODE_TYPE, EMAIL_SEND_NODE_TYPE, EXECUTE_COMMAND_NODE_TYPE, FINANCE_WORK_AREA, FUNCTION_NODE_TYPE, GITHUB_TRIGGER_NODE_TYPE, HTTP_REQUEST_NODE_TYPE, IF_NODE_TYPE, ITEM_LISTS_NODE_TYPE, IT_ENGINEERING_WORK_AREA, JIRA_TRIGGER_NODE_TYPE, MICROSOFT_EXCEL_NODE_TYPE, MICROSOFT_TEAMS_NODE_TYPE, PERSONALIZATION_MODAL_KEY, PAGERDUTY_NODE_TYPE, PRODUCT_WORK_AREA, QUICKBOOKS_NODE_TYPE, SALESFORCE_NODE_TYPE, SALES_BUSINESSDEV_WORK_AREA, SECURITY_WORK_AREA, SEGMENT_NODE_TYPE, SET_NODE_TYPE, SLACK_NODE_TYPE, SPREADSHEET_FILE_NODE_TYPE, SWITCH_NODE_TYPE, WEBHOOK_NODE_TYPE, XERO_NODE_TYPE, COMPANY_SIZE_KEY, WORK_AREA_KEY, CODING_SKILL_KEY, COMPANY_TYPE_KEY, ECOMMERCE_COMPANY_TYPE, MSP_COMPANY_TYPE, PERSONAL_COMPANY_TYPE, AUTOMATION_GOAL_KEY, OTHER_AUTOMATION_GOAL, NOT_SURE_YET_GOAL, CUSTOMER_INTEGRATIONS_GOAL, CUSTOMER_SUPPORT_GOAL, FINANCE_ACCOUNTING_GOAL, ZENDESK_TRIGGER_NODE_TYPE, WOOCOMMERCE_TRIGGER_NODE_TYPE, SALES_MARKETING_GOAL, HUBSPOT_TRIGGER_NODE_TYPE, HR_GOAL, WORKABLE_TRIGGER_NODE_TYPE, OPERATIONS_GOAL, PRODUCT_GOAL, NOTION_TRIGGER_NODE_TYPE, SECURITY_GOAL, THE_HIVE_TRIGGER_NODE_TYPE, ZENDESK_NODE_TYPE, SERVICENOW_NODE_TYPE, JIRA_NODE_TYPE } from '@/constants';
+import { CALENDLY_TRIGGER_NODE_TYPE, CLEARBIT_NODE_TYPE, COMPANY_SIZE_1000_OR_MORE, COMPANY_SIZE_500_999, CRON_NODE_TYPE, ELASTIC_SECURITY_NODE_TYPE, EMAIL_SEND_NODE_TYPE, EXECUTE_COMMAND_NODE_TYPE, FINANCE_WORK_AREA, FUNCTION_NODE_TYPE, GITHUB_TRIGGER_NODE_TYPE, HTTP_REQUEST_NODE_TYPE, IF_NODE_TYPE, ITEM_LISTS_NODE_TYPE, IT_ENGINEERING_WORK_AREA, JIRA_TRIGGER_NODE_TYPE, MICROSOFT_EXCEL_NODE_TYPE, MICROSOFT_TEAMS_NODE_TYPE, PERSONALIZATION_MODAL_KEY, PAGERDUTY_NODE_TYPE, PRODUCT_WORK_AREA, QUICKBOOKS_NODE_TYPE, SALESFORCE_NODE_TYPE, SALES_BUSINESSDEV_WORK_AREA, SECURITY_WORK_AREA, SEGMENT_NODE_TYPE, SET_NODE_TYPE, SLACK_NODE_TYPE, SPREADSHEET_FILE_NODE_TYPE, SWITCH_NODE_TYPE, WEBHOOK_NODE_TYPE, XERO_NODE_TYPE, COMPANY_SIZE_KEY, WORK_AREA_KEY, CODING_SKILL_KEY, COMPANY_TYPE_KEY, ECOMMERCE_COMPANY_TYPE, MSP_COMPANY_TYPE, PERSONAL_COMPANY_TYPE, AUTOMATION_GOAL_KEY, OTHER_AUTOMATION_GOAL, NOT_SURE_YET_GOAL, CUSTOMER_INTEGRATIONS_GOAL, CUSTOMER_SUPPORT_GOAL, FINANCE_ACCOUNTING_GOAL, ZENDESK_TRIGGER_NODE_TYPE, WOOCOMMERCE_TRIGGER_NODE_TYPE, SALES_MARKETING_GOAL, HUBSPOT_TRIGGER_NODE_TYPE, HR_GOAL, WORKABLE_TRIGGER_NODE_TYPE, OPERATIONS_GOAL, PRODUCT_GOAL, NOTION_TRIGGER_NODE_TYPE, SECURITY_GOAL, THE_HIVE_TRIGGER_NODE_TYPE, ZENDESK_NODE_TYPE, SERVICENOW_NODE_TYPE, JIRA_NODE_TYPE, BAMBOO_HR_NODE_TYPE, GOOGLE_SHEETS_NODE_TYPE } from '@/constants';
 import { IPermissions, IPersonalizationSurveyAnswersV1, IPersonalizationSurveyAnswersV2, IUser } from '@/Interface';
 
 import { ILogInStatus, IRole, IUserPermissions } from "@/Interface";
@@ -284,6 +284,32 @@ function getPersonalizationV2(answers: IPersonalizationSurveyAnswersV2) {
 			default:
 				nodeTypes = nodeTypes.concat(SLACK_NODE_TYPE);
 		}
+	} else {
+		switch (automationGoal) {
+			case CUSTOMER_INTEGRATIONS_GOAL:
+				nodeTypes = nodeTypes.concat(HTTP_REQUEST_NODE_TYPE);
+				break;
+			case CUSTOMER_SUPPORT_GOAL:
+				nodeTypes = nodeTypes.concat(ZENDESK_NODE_TYPE);
+				break;
+			case SALES_MARKETING_GOAL:
+				nodeTypes = nodeTypes.concat(QUICKBOOKS_NODE_TYPE);
+				break;
+			case HR_GOAL:
+				nodeTypes = nodeTypes.concat(BAMBOO_HR_NODE_TYPE);
+				break;
+			case PRODUCT_GOAL:
+				nodeTypes = nodeTypes.concat(JIRA_NODE_TYPE);
+				break;
+			case FINANCE_ACCOUNTING_GOAL:
+				nodeTypes = nodeTypes.concat(GOOGLE_SHEETS_NODE_TYPE);
+				break;
+			case SECURITY_GOAL:
+				nodeTypes = nodeTypes.concat(ELASTIC_SECURITY_NODE_TYPE);
+				break;
+			default:
+				nodeTypes = nodeTypes.concat(SLACK_NODE_TYPE);
+		}
 	}
 
 	// slot 4

From c42f68852e5fadc3083511e38a8e2c5bdf6b1dc2 Mon Sep 17 00:00:00 2001
From: Mutasem <mutdmour@gmail.com>
Date: Tue, 1 Mar 2022 15:28:27 +0300
Subject: [PATCH 09/15] switch types

---
 packages/editor-ui/src/modules/userHelpers.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/editor-ui/src/modules/userHelpers.ts b/packages/editor-ui/src/modules/userHelpers.ts
index 7d8e728134336..9661552c9cf1a 100644
--- a/packages/editor-ui/src/modules/userHelpers.ts
+++ b/packages/editor-ui/src/modules/userHelpers.ts
@@ -292,7 +292,7 @@ function getPersonalizationV2(answers: IPersonalizationSurveyAnswersV2) {
 			case CUSTOMER_SUPPORT_GOAL:
 				nodeTypes = nodeTypes.concat(ZENDESK_NODE_TYPE);
 				break;
-			case SALES_MARKETING_GOAL:
+			case FINANCE_ACCOUNTING_GOAL:
 				nodeTypes = nodeTypes.concat(QUICKBOOKS_NODE_TYPE);
 				break;
 			case HR_GOAL:
@@ -301,7 +301,7 @@ function getPersonalizationV2(answers: IPersonalizationSurveyAnswersV2) {
 			case PRODUCT_GOAL:
 				nodeTypes = nodeTypes.concat(JIRA_NODE_TYPE);
 				break;
-			case FINANCE_ACCOUNTING_GOAL:
+			case SALES_MARKETING_GOAL:
 				nodeTypes = nodeTypes.concat(GOOGLE_SHEETS_NODE_TYPE);
 				break;
 			case SECURITY_GOAL:

From e8386f67523bd0dd55ac2481e3e4534da0125446 Mon Sep 17 00:00:00 2001
From: Mutasem <mutdmour@gmail.com>
Date: Tue, 1 Mar 2022 16:59:38 +0300
Subject: [PATCH 10/15] Fix logic

---
 packages/editor-ui/src/modules/userHelpers.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/src/modules/userHelpers.ts b/packages/editor-ui/src/modules/userHelpers.ts
index 9661552c9cf1a..ec4b39e47492e 100644
--- a/packages/editor-ui/src/modules/userHelpers.ts
+++ b/packages/editor-ui/src/modules/userHelpers.ts
@@ -258,7 +258,7 @@ function getPersonalizationV2(answers: IPersonalizationSurveyAnswersV2) {
 	}
 
 	// slot 4 usecase #1
-	if (companySize === COMPANY_SIZE_1000_OR_MORE || companySize === COMPANY_SIZE_1000_OR_MORE) {
+	if (companySize === COMPANY_SIZE_500_999 || companySize === COMPANY_SIZE_1000_OR_MORE) {
 		switch (automationGoal) {
 			case CUSTOMER_INTEGRATIONS_GOAL:
 				nodeTypes = nodeTypes.concat(HTTP_REQUEST_NODE_TYPE);

From 7e803216dc1afa68b22c45aaf8f6d173937535be Mon Sep 17 00:00:00 2001
From: Mutasem <mutdmour@gmail.com>
Date: Tue, 1 Mar 2022 17:17:03 +0300
Subject: [PATCH 11/15] remove unused constants

---
 packages/editor-ui/src/constants.ts | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index 2523743971591..074ac4939681e 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -113,18 +113,10 @@ export const WAIT_TIME_UNLIMITED = '3000-01-01T00:00:00.000Z';
 
 export const WORK_AREA_KEY = 'workArea';
 export const FINANCE_WORK_AREA = 'finance';
-export const HR_WORK_AREA = 'HR';
 export const IT_ENGINEERING_WORK_AREA = 'IT-Engineering';
-export const LEGAL_WORK_AREA = 'legal';
-export const MARKETING_WORK_AREA = 'marketing-growth';
 export const PRODUCT_WORK_AREA = 'product';
 export const SALES_BUSINESSDEV_WORK_AREA = 'sales-businessDevelopment';
 export const SECURITY_WORK_AREA = 'security';
-export const SUPPORT_WORK_AREA = 'support';
-export const OPS_WORK_AREA = 'ops';
-export const EXECUTIVE_WORK_AREA = 'executive';
-export const OTHER_WORK_AREA_OPTION = 'other';
-export const NOT_APPLICABLE_WORK_AREA = 'n/a';
 
 export const COMPANY_TYPE_KEY = 'companyType';
 export const SAAS_COMPANY_TYPE = 'saas';
@@ -143,21 +135,18 @@ export const MEDIUM_CUSTOMER_TYPE = 'medium';
 export const LARGE_CUSTOMER_TYPE = 'large';
 
 export const MSP_FOCUS_KEY = 'mspFocus';
+export const MSP_FOCUS_OTHER_KEY = 'mspFocusOther';
 export const CLOUD_INFRA_FOCUS = 'cloud-infra';
 export const IT_SUPPORT_FOCUS = 'it-support';
 export const NETWORKING_COMMUNICATION_FOCUS = 'networking-communication';
 export const SECURITY_FOCUS = 'security';
 export const OTHER_FOCUS = 'other';
 
-export const MSP_FOCUS_OTHER_KEY = 'mspFocusOther';
-
-export const COMPANY_INDUSTRY_KEY = 'companyIndustry';
-export const COMPANY_INDUSTRY_EXTENDED_KEY = 'companyIndustryExtended';
+export const OTHER_COMPANY_INDUSTRY_KEY = 'otherCompanyIndustry';
+export const OTHER_COMPANY_INDUSTRY_EXTENDED_KEY = 'otherCompanyIndustryExtended';
 export const EDUCATION_INDUSTRY = 'education';
-export const AUTOMATION_CONSULTING_INDUSTRY = 'automation-consulting';
 export const PHYSICAL_RETAIL_OR_SERVICES = 'physical-retail-or-services';
 export const REAL_ESTATE_OR_CONSTRUCTION = 'real-estate-or-construction';
-export const SYSTEM_INTEGRATION_INDUSTRY = 'systems-integration';
 export const GOVERNMENT_INDUSTRY = 'government';
 export const LEGAL_INDUSTRY = 'legal-industry';
 export const MARKETING_INDUSTRY = 'marketing-industry';
@@ -167,7 +156,6 @@ export const HEALTHCARE_INDUSTRY= 'healthcare';
 export const FINANCE_INSURANCE_INDUSTRY = 'finance-insurance-industry';
 export const IT_INDUSTRY = 'it-industry';
 export const SECURITY_INDUSTRY = 'security-industry';
-export const SAAS_INDUSTRY = 'saas';
 export const TELECOMS_INDUSTRY = 'telecoms';
 export const OTHER_INDUSTRY_OPTION = 'other';
 
@@ -180,9 +168,6 @@ export const COMPANY_SIZE_1000_OR_MORE = '1000+';
 export const COMPANY_SIZE_PERSONAL_USE = 'personalUser';
 
 export const CODING_SKILL_KEY = 'codingSkill';
-export const OTHER_WORK_AREA_KEY = 'otherWorkArea';
-export const OTHER_COMPANY_INDUSTRY_KEY = 'otherCompanyIndustry';
-export const OTHER_COMPANY_INDUSTRY_EXTENDED_KEY = 'otherCompanyIndustryExtended';
 
 export const AUTOMATION_GOAL_KEY = 'automationGoal';
 export const AUTOMATION_GOAL_OTHER_KEY = 'otherAutomationGoal';

From ad066ba5d106163682feaddc59031befb3dbfc44 Mon Sep 17 00:00:00 2001
From: Mutasem <mutdmour@gmail.com>
Date: Tue, 1 Mar 2022 17:18:59 +0300
Subject: [PATCH 12/15] add back constant

---
 packages/editor-ui/src/constants.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index 074ac4939681e..ef239f7ef53b6 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -142,7 +142,7 @@ export const NETWORKING_COMMUNICATION_FOCUS = 'networking-communication';
 export const SECURITY_FOCUS = 'security';
 export const OTHER_FOCUS = 'other';
 
-export const OTHER_COMPANY_INDUSTRY_KEY = 'otherCompanyIndustry';
+export const COMPANY_INDUSTRY_EXTENDED_KEY = 'companyIndustryExtended';
 export const OTHER_COMPANY_INDUSTRY_EXTENDED_KEY = 'otherCompanyIndustryExtended';
 export const EDUCATION_INDUSTRY = 'education';
 export const PHYSICAL_RETAIL_OR_SERVICES = 'physical-retail-or-services';

From f7c32092ba2ae210ef88f680d9bc963a2c07a078 Mon Sep 17 00:00:00 2001
From: Mutasem <mutdmour@gmail.com>
Date: Tue, 1 Mar 2022 17:40:39 +0300
Subject: [PATCH 13/15] refactor filtering inputs

---
 .../components/N8nFormInputs/FormInputs.vue   |  9 +--
 packages/editor-ui/src/Interface.ts           |  3 +-
 .../src/components/PersonalizationModal.vue   | 74 ++++++++-----------
 3 files changed, 34 insertions(+), 52 deletions(-)

diff --git a/packages/design-system/src/components/N8nFormInputs/FormInputs.vue b/packages/design-system/src/components/N8nFormInputs/FormInputs.vue
index 8511a909c3044..253b6cfd9baae 100644
--- a/packages/design-system/src/components/N8nFormInputs/FormInputs.vue
+++ b/packages/design-system/src/components/N8nFormInputs/FormInputs.vue
@@ -51,9 +51,6 @@ export default Vue.extend({
 		columnView: {
 			type: Boolean,
 		},
-		filterInput: {
-			type: Function,
-		},
 	},
 	data() {
 		return {
@@ -75,11 +72,7 @@ export default Vue.extend({
 	},
 	computed: {
 		filteredInputs(): IFormInput[] {
-			if (!this.filterInput) {
-				return this.inputs;
-			}
-
-			return this.inputs.filter((input: IFormInput) => this.filterInput(input, this.values));
+			return this.inputs.filter((input: IFormInput) => typeof input.shouldDisplay === 'function'? input.shouldDisplay(this.values): true);
 		},
 		isReadyToSubmit(): boolean {
 			for (let key in this.validity) {
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index b798f68f031a1..a733968b5a9a6 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -942,7 +942,8 @@ export type IFormInput = {
 		placeholder?: string;
 		options?: Array<{label: string; value: string}>;
 		autocomplete?: 'off' | 'new-password' | 'current-password' | 'given-name' | 'family-name' | 'email'; // https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/autocomplete
-	}
+	};
+	shouldDisplay?: (values: {[key: string]: unknown}) => boolean;
 };
 
 export type IFormInputs = IFormInput[];
diff --git a/packages/editor-ui/src/components/PersonalizationModal.vue b/packages/editor-ui/src/components/PersonalizationModal.vue
index 424d595da8208..53db754da01a9 100644
--- a/packages/editor-ui/src/components/PersonalizationModal.vue
+++ b/packages/editor-ui/src/components/PersonalizationModal.vue
@@ -21,7 +21,7 @@
 				<n8n-text>{{ $locale.baseText('personalizationModal.lookOutForThingsMarked') }}</n8n-text>
 			</div>
 			<div :class="$style.container" v-else>
-				<n8n-form-inputs :inputs="survey" :columnView="true" :eventBus="formBus" :filterInput="filterInput" @submit="onSubmit"/>
+				<n8n-form-inputs :inputs="survey" :columnView="true" :eventBus="formBus" @submit="onSubmit"/>
 			</div>
 		</template>
 		<template v-slot:footer>
@@ -217,6 +217,12 @@ export default mixins(showMessage, workflowHelpers).extend({
 				},
 				{
 					name: CUSTOMER_TYPE_KEY,
+					shouldDisplay(values): boolean {
+						const companyType = (values as IPersonalizationSurveyAnswersV2)[COMPANY_TYPE_KEY];
+						return (
+							!!companyType && ![ OTHER_COMPANY_TYPE, PERSONAL_COMPANY_TYPE, ECOMMERCE_COMPANY_TYPE, MSP_COMPANY_TYPE].includes(companyType)
+						);
+					},
 					properties: {
 						label: this.$locale.baseText('personalizationModal.whatKindOfCustomersDoYouServe'),
 						type: 'select',
@@ -243,6 +249,10 @@ export default mixins(showMessage, workflowHelpers).extend({
 				},
 				{
 					name: MSP_FOCUS_KEY,
+					shouldDisplay(values): boolean {
+						const companyType = (values as IPersonalizationSurveyAnswersV2)[COMPANY_TYPE_KEY];
+						return companyType === MSP_COMPANY_TYPE;
+					},
 					properties: {
 						label: this.$locale.baseText('personalizationModal.whatDoesYourCompanyFocusOn'),
 						type: 'multi-select',
@@ -278,6 +288,10 @@ export default mixins(showMessage, workflowHelpers).extend({
 							'personalizationModal.pleaseSpecifyYourCompanyFocus',
 						),
 					},
+					shouldDisplay(values): boolean {
+						const mspFocus = (values as IPersonalizationSurveyAnswersV2)[MSP_FOCUS_KEY];
+						return !!mspFocus && mspFocus.includes(OTHER_FOCUS);
+					},
 				},
 				{
 					name: COMPANY_INDUSTRY_EXTENDED_KEY,
@@ -344,12 +358,20 @@ export default mixins(showMessage, workflowHelpers).extend({
 							},
 						],
 					},
+					shouldDisplay(values): boolean {
+						const companyType = (values as IPersonalizationSurveyAnswersV2)[COMPANY_TYPE_KEY];
+						return companyType === OTHER_COMPANY_TYPE;
+					},
 				},
 				{
 					name: OTHER_COMPANY_INDUSTRY_EXTENDED_KEY,
 					properties: {
 						placeholder: this.$locale.baseText('personalizationModal.specifyYourCompanysIndustry'),
 					},
+					shouldDisplay(values): boolean {
+						const companyIndustry = (values as IPersonalizationSurveyAnswersV2)[COMPANY_INDUSTRY_EXTENDED_KEY];
+						return !!companyIndustry && companyIndustry.includes(OTHER_INDUSTRY_OPTION);
+					},
 				},
 				{
 					name: AUTOMATION_GOAL_KEY,
@@ -400,12 +422,20 @@ export default mixins(showMessage, workflowHelpers).extend({
 							},
 						],
 					},
+					shouldDisplay(values): boolean {
+						const companyType = (values as IPersonalizationSurveyAnswersV2)[COMPANY_TYPE_KEY];
+						return companyType !== PERSONAL_COMPANY_TYPE;
+					},
 				},
 				{
 					name: AUTOMATION_GOAL_OTHER_KEY,
 					properties: {
 						placeholder: this.$locale.baseText('personalizationModal.specifyYourAutomationGoal'),
 					},
+					shouldDisplay(values): boolean {
+						const automationGoal = (values as IPersonalizationSurveyAnswersV2)[AUTOMATION_GOAL_KEY];
+						return automationGoal === OTHER_AUTOMATION_GOAL;
+					},
 				},
 				{
 					name: COMPANY_SIZE_KEY,
@@ -450,48 +480,6 @@ export default mixins(showMessage, workflowHelpers).extend({
 		closeDialog() {
 			this.modalBus.$emit('close');
 		},
-		filterInput(input: IFormInput, values: IPersonalizationSurveyAnswersV2) {
-			const companyType = values[COMPANY_TYPE_KEY];
-			if (input.name === CUSTOMER_TYPE_KEY) {
-				return (
-					companyType &&
-					![
-						OTHER_COMPANY_TYPE,
-						PERSONAL_COMPANY_TYPE,
-						ECOMMERCE_COMPANY_TYPE,
-						MSP_COMPANY_TYPE,
-					].includes(companyType)
-				);
-			}
-
-			if (input.name === MSP_FOCUS_KEY) {
-				return companyType === MSP_COMPANY_TYPE;
-			}
-
-			if (input.name === MSP_FOCUS_OTHER_KEY) {
-				const mspFocus = values[MSP_FOCUS_KEY];
-				return mspFocus && mspFocus.includes(OTHER_FOCUS);
-			}
-
-			if (input.name === COMPANY_INDUSTRY_EXTENDED_KEY) {
-				return companyType === OTHER_COMPANY_TYPE;
-			}
-
-			if (input.name === OTHER_COMPANY_INDUSTRY_EXTENDED_KEY) {
-				const companyIndustry = values[COMPANY_INDUSTRY_EXTENDED_KEY];
-				return companyIndustry && companyIndustry.includes(OTHER_INDUSTRY_OPTION);
-			}
-
-			if (input.name === AUTOMATION_GOAL_KEY || input.name === COMPANY_SIZE_KEY) {
-				return companyType !== PERSONAL_COMPANY_TYPE;
-			}
-
-			if (input.name === AUTOMATION_GOAL_OTHER_KEY) {
-				return values[AUTOMATION_GOAL_KEY] === OTHER_AUTOMATION_GOAL;
-			}
-
-			return true;
-		},
 		onSave() {
 			this.formBus.$emit('submit');
 		},

From 3a8bb3148ef7686e7aa94624cd3f3b9db78cc7d3 Mon Sep 17 00:00:00 2001
From: Mutasem <mutdmour@gmail.com>
Date: Tue, 1 Mar 2022 17:42:07 +0300
Subject: [PATCH 14/15] hide last input on personal

---
 packages/editor-ui/src/components/PersonalizationModal.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/editor-ui/src/components/PersonalizationModal.vue b/packages/editor-ui/src/components/PersonalizationModal.vue
index 53db754da01a9..93509305fdeb2 100644
--- a/packages/editor-ui/src/components/PersonalizationModal.vue
+++ b/packages/editor-ui/src/components/PersonalizationModal.vue
@@ -470,6 +470,10 @@ export default mixins(showMessage, workflowHelpers).extend({
 							},
 						],
 					},
+					shouldDisplay(values): boolean {
+						const companyType = (values as IPersonalizationSurveyAnswersV2)[COMPANY_TYPE_KEY];
+						return companyType !== PERSONAL_COMPANY_TYPE;
+					},
 				},
 			];
 

From c304e668f766e00753861aa92313518a55957b5b Mon Sep 17 00:00:00 2001
From: Mutasem <mutdmour@gmail.com>
Date: Tue, 1 Mar 2022 18:12:30 +0300
Subject: [PATCH 15/15] fix other

---
 .../editor-ui/src/components/PersonalizationModal.vue    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/editor-ui/src/components/PersonalizationModal.vue b/packages/editor-ui/src/components/PersonalizationModal.vue
index 93509305fdeb2..0959b741d2288 100644
--- a/packages/editor-ui/src/components/PersonalizationModal.vue
+++ b/packages/editor-ui/src/components/PersonalizationModal.vue
@@ -289,8 +289,9 @@ export default mixins(showMessage, workflowHelpers).extend({
 						),
 					},
 					shouldDisplay(values): boolean {
+						const companyType = (values as IPersonalizationSurveyAnswersV2)[COMPANY_TYPE_KEY];
 						const mspFocus = (values as IPersonalizationSurveyAnswersV2)[MSP_FOCUS_KEY];
-						return !!mspFocus && mspFocus.includes(OTHER_FOCUS);
+						return companyType === MSP_COMPANY_TYPE && !!mspFocus && mspFocus.includes(OTHER_FOCUS);
 					},
 				},
 				{
@@ -369,8 +370,9 @@ export default mixins(showMessage, workflowHelpers).extend({
 						placeholder: this.$locale.baseText('personalizationModal.specifyYourCompanysIndustry'),
 					},
 					shouldDisplay(values): boolean {
+						const companyType = (values as IPersonalizationSurveyAnswersV2)[COMPANY_TYPE_KEY];
 						const companyIndustry = (values as IPersonalizationSurveyAnswersV2)[COMPANY_INDUSTRY_EXTENDED_KEY];
-						return !!companyIndustry && companyIndustry.includes(OTHER_INDUSTRY_OPTION);
+						return companyType === OTHER_COMPANY_TYPE && !!companyIndustry && companyIndustry.includes(OTHER_INDUSTRY_OPTION);
 					},
 				},
 				{
@@ -433,8 +435,9 @@ export default mixins(showMessage, workflowHelpers).extend({
 						placeholder: this.$locale.baseText('personalizationModal.specifyYourAutomationGoal'),
 					},
 					shouldDisplay(values): boolean {
+						const companyType = (values as IPersonalizationSurveyAnswersV2)[COMPANY_TYPE_KEY];
 						const automationGoal = (values as IPersonalizationSurveyAnswersV2)[AUTOMATION_GOAL_KEY];
-						return automationGoal === OTHER_AUTOMATION_GOAL;
+						return companyType !== PERSONAL_COMPANY_TYPE && automationGoal === OTHER_AUTOMATION_GOAL;
 					},
 				},
 				{