From 7b3b5c1ad692ebe2f5f6230ad56e31f283c8d4ed Mon Sep 17 00:00:00 2001 From: Kevin Zhang <54437031+kzdev420@users.noreply.github.com> Date: Tue, 19 Dec 2023 08:19:37 +0800 Subject: [PATCH] 18951 Change amalgamation to amalgamationApplication (#750) * change amalgamation to amalgamationApplication * update shared-component-enum version * update lint * revert auto changes --- package-lock.json | 40 +++++++++--------------------- package.json | 4 +-- src/interfaces/business.ts | 2 +- src/mixins/nr-affiliation-mixin.ts | 8 +++--- 4 files changed, 19 insertions(+), 35 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5625d1dcc..6daf3f03a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,17 +1,17 @@ { "name": "name-request", - "version": "5.3.11", + "version": "5.3.12", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "name-request", - "version": "5.3.11", + "version": "5.3.12", "dependencies": { "@babel/compat-data": "^7.21.5", "@bcrs-shared-components/breadcrumb": "2.1.24", "@bcrs-shared-components/corp-type-module": "1.0.13", - "@bcrs-shared-components/enums": "1.1.1", + "@bcrs-shared-components/enums": "1.1.4", "@bcrs-shared-components/genesys-web-message": "1.0.0", "@bcrs-shared-components/interfaces": "1.0.67", "@bcrs-shared-components/staff-payment": "1.0.29", @@ -1918,13 +1918,18 @@ "integrity": "sha512-Wa8H/bxo8GAlcG7YdiP4zl1wzqxewiCO0TC+pBaYUc4+eufuInlS3yYFa9MFg8+vIL/pDfamRtXqdg1I6C6QYA==" }, "node_modules/@bcrs-shared-components/enums": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@bcrs-shared-components/enums/-/enums-1.1.1.tgz", - "integrity": "sha512-EyjoIo5NkzdXeJ/bAtjVgPErH1qH5LhObBa5//uoQ45DYZlKUdAcg8HPC4XStMZVFvjVzABYPqrQkdB8Zhh/Mw==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@bcrs-shared-components/enums/-/enums-1.1.4.tgz", + "integrity": "sha512-EwHjFTfIiOJLzU3yWSPJnxfplF+cgQSPGFE+6T1jo/7aVpLPMw/cSSGi3cJIr3h7SjyQd8wTxsFP4QDVgCrH7A==", "dependencies": { - "@bcrs-shared-components/corp-type-module": "^1.0.13" + "@bcrs-shared-components/corp-type-module": "^1.0.14" } }, + "node_modules/@bcrs-shared-components/enums/node_modules/@bcrs-shared-components/corp-type-module": { + "version": "1.0.14", + "resolved": "https://registry.npmjs.org/@bcrs-shared-components/corp-type-module/-/corp-type-module-1.0.14.tgz", + "integrity": "sha512-SZhJw4hpqQT2BL3RuVB0Z1hmShhrv5byhH4gnaF1fVl9jsUGkjC/Ytic08UnEX4DIyR1/VWNyjTclNgxi9+0Bw==" + }, "node_modules/@bcrs-shared-components/folio-number-input": { "version": "1.1.28", "resolved": "https://registry.npmjs.org/@bcrs-shared-components/folio-number-input/-/folio-number-input-1.1.28.tgz", @@ -1934,14 +1939,6 @@ "vue": "^2.7.14" } }, - "node_modules/@bcrs-shared-components/folio-number-input/node_modules/@bcrs-shared-components/enums": { - "version": "1.0.46", - "resolved": "https://registry.npmjs.org/@bcrs-shared-components/enums/-/enums-1.0.46.tgz", - "integrity": "sha512-lrZjTvyDHwZ97Ujsro0pvdemi6n1xSDNeo1OzSGHgf/mokTSfFiVJ0EzuiPxlgBj8VtaPA9PZmGahdrodkPEMg==", - "dependencies": { - "@bcrs-shared-components/corp-type-module": "^1.0.13" - } - }, "node_modules/@bcrs-shared-components/folio-number-input/node_modules/@bcrs-shared-components/interfaces": { "version": "1.0.71", "resolved": "https://registry.npmjs.org/@bcrs-shared-components/interfaces/-/interfaces-1.0.71.tgz", @@ -1987,19 +1984,6 @@ "vue": "^2.7.14" } }, - "node_modules/@bcrs-shared-components/interfaces/node_modules/@bcrs-shared-components/corp-type-module": { - "version": "1.0.14", - "resolved": "https://registry.npmjs.org/@bcrs-shared-components/corp-type-module/-/corp-type-module-1.0.14.tgz", - "integrity": "sha512-SZhJw4hpqQT2BL3RuVB0Z1hmShhrv5byhH4gnaF1fVl9jsUGkjC/Ytic08UnEX4DIyR1/VWNyjTclNgxi9+0Bw==" - }, - "node_modules/@bcrs-shared-components/interfaces/node_modules/@bcrs-shared-components/enums": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@bcrs-shared-components/enums/-/enums-1.1.2.tgz", - "integrity": "sha512-ttgHwwnLZh9f75GlxpMU0hI22Nd98zzdq+vBEQd95U6k5UrZI0jGwKFYhtuyjoLLPwtiSsjtsLdSw/n/lJTfZw==", - "dependencies": { - "@bcrs-shared-components/corp-type-module": "^1.0.14" - } - }, "node_modules/@bcrs-shared-components/interfaces/node_modules/@vue/compiler-sfc": { "version": "2.7.14", "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.14.tgz", diff --git a/package.json b/package.json index 67b75b6ab..09c1d7dab 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "name-request", - "version": "5.3.11", + "version": "5.3.12", "private": true, "appName": "Name Request UI", "sbcName": "SBC Common Components", @@ -16,7 +16,7 @@ "@babel/compat-data": "^7.21.5", "@bcrs-shared-components/breadcrumb": "2.1.24", "@bcrs-shared-components/corp-type-module": "1.0.13", - "@bcrs-shared-components/enums": "1.1.1", + "@bcrs-shared-components/enums": "1.1.4", "@bcrs-shared-components/genesys-web-message": "1.0.0", "@bcrs-shared-components/interfaces": "1.0.67", "@bcrs-shared-components/staff-payment": "1.0.29", diff --git a/src/interfaces/business.ts b/src/interfaces/business.ts index 15dba6a55..3bff9a0f1 100644 --- a/src/interfaces/business.ts +++ b/src/interfaces/business.ts @@ -16,7 +16,7 @@ export interface BusinessRequest { nrNumber?: string } }, - amalgamation?: { + amalgamationApplication?: { nameRequest: { legalType: string nrNumber?: string diff --git a/src/mixins/nr-affiliation-mixin.ts b/src/mixins/nr-affiliation-mixin.ts index bd7ae0ae6..1815f9078 100644 --- a/src/mixins/nr-affiliation-mixin.ts +++ b/src/mixins/nr-affiliation-mixin.ts @@ -142,13 +142,13 @@ export class NrAffiliationMixin extends Mixins(CommonMixin) { const nrNumber = nr.nrNum if (!this.isFirm(nr)) { if (nr.request_action_cd === 'AML') { - name = FilingTypes.AMALGAMATION + name = FilingTypes.AMALGAMATION_APPLICATION legalType = nr.legalType businessRequest = { filing: { business: { legalType }, header: { accountId, name }, - amalgamation: { + amalgamationApplication: { type: AmalgamationTypes.REGULAR, nameRequest: { legalType, nrNumber } } @@ -244,13 +244,13 @@ export class NrAffiliationMixin extends Mixins(CommonMixin) { const businessRequest = { filing: { header: { - name: FilingTypes.AMALGAMATION, + name: FilingTypes.AMALGAMATION_APPLICATION, accountId: accountId }, business: { legalType: legalType }, - amalgamation: { + amalgamationApplication: { nameRequest: { legalType: legalType },