Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

21134 Added continuation in types for restoration + updated Iran and Turkey #768

Merged
merged 2 commits into from
Jun 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "name-request",
"version": "5.5.3",
"version": "5.5.4",
"private": true,
"appName": "Name Request UI",
"sbcName": "SBC Common Components",
Expand Down
2 changes: 1 addition & 1 deletion src/components/dialogs/nr-not-required.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<li class="my-3">
<b>You want to incorporate a numbered company.</b><br>
Select the action and the company type you want in the Name Request application and follow the instructions
to complete your incorporation.
to complete your incorporation.
</li>
<li>
<b>You are using your own legal name as the business name.</b><br>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<v-data-table
v-model:expanded="expanded"

Check warning on line 3 in src/components/new-request/name-check/name-check-conflicts.vue

View workflow job for this annotation

GitHub Actions / namerequest-ci / linting-pnpm (21, 9)

'v-model' directives require no argument

Check warning on line 3 in src/components/new-request/name-check/name-check-conflicts.vue

View workflow job for this annotation

GitHub Actions / namerequest-ci / verify-build (21, 9)

'v-model' directives require no argument
:headers="headers"
fixed
hide-default-header
Expand Down Expand Up @@ -369,8 +369,11 @@
// Global getter
@Getter isMobile!: boolean

@Emit() clearError (value: string) { }
@Emit() retry (value: string) { }
// eslint-disable-next-line @typescript-eslint/no-unused-vars
@Emit() clearError (value: string) {}

// eslint-disable-next-line @typescript-eslint/no-unused-vars
@Emit() retry (value: string) {}

expanded: Array<NameCheckItemIF> = []
headers = [
Expand Down
8 changes: 4 additions & 4 deletions src/list-data/intl-jurisdictions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -682,8 +682,8 @@ const Other: JurisdictionI[] = [
},
{
value: 'IR',
SHORT_DESC: 'Iran',
text: 'Iran'
SHORT_DESC: 'Iran, Islamic R',
text: 'Iran, Islamic Republic Of'
},
{
value: 'IQ',
Expand Down Expand Up @@ -1262,8 +1262,8 @@ const Other: JurisdictionI[] = [
},
{
value: 'TR',
SHORT_DESC: 'Turkey',
text: 'Turkey'
SHORT_DESC: 'Türkiye',
text: 'Türkiye, Republic Of'
}
]

Expand Down
61 changes: 35 additions & 26 deletions src/list-data/request-action-mapping.ts
Original file line number Diff line number Diff line change
@@ -1,23 +1,6 @@
import { EntityTypes, NrRequestActionCodes } from '@/enums'
import { RequestActionMappingI } from '@/interfaces'

const EntityTypesBC = [
EntityTypes.FR,
EntityTypes.DBA,
EntityTypes.CR,
EntityTypes.UL,
EntityTypes.GP,
EntityTypes.LP,
EntityTypes.LL,
EntityTypes.CP,
EntityTypes.BC,
EntityTypes.CC,
EntityTypes.SO,
EntityTypes.PA,
EntityTypes.FI,
EntityTypes.PAR
]
Copy link
Collaborator Author

@severinbeauvais severinbeauvais Jun 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was only used in one place so I moved it to lines 41-60.


// maps request_action_cd (key) to array of allowable entities (value)
// { [request_action_cd]: entity_type_cd[] }
export const BcMapping: RequestActionMappingI = {
Expand All @@ -42,17 +25,39 @@ export const BcMapping: RequestActionMappingI = {
],
// Restore
REH: [
EntityTypes.CR,
EntityTypes.CR, // maps to BC Limited Company
EntityTypes.CP,
EntityTypes.CC,
EntityTypes.UL,
EntityTypes.UL, // maps to ULC
EntityTypes.FI,
EntityTypes.BC,
EntityTypes.SO
EntityTypes.BC, // maps to Benefit Company
EntityTypes.SO,
EntityTypes.C,
EntityTypes.CBEN,
EntityTypes.CCC,
EntityTypes.CUL
],
// Change Name
// (every entity type except Parishes and Private Act)
CHG: EntityTypesBC.filter(ent => ent !== EntityTypes.PAR && ent !== EntityTypes.PA),
CHG: [
EntityTypes.FR,
EntityTypes.DBA,
EntityTypes.CR,
EntityTypes.UL,
EntityTypes.GP,
EntityTypes.LP,
EntityTypes.LL,
EntityTypes.CP,
EntityTypes.BC,
EntityTypes.CC,
EntityTypes.SO,
EntityTypes.PA,
EntityTypes.FI,
EntityTypes.PAR,
EntityTypes.C,
EntityTypes.CBEN,
EntityTypes.CCC,
EntityTypes.CUL
],
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm pretty sure only the REH and CHG arrays are used from here, so those are the only ones I updated.

// MVE = Continuation In
MVE: [
EntityTypes.CR, // will become CorpTypeCd.CONTINUE_IN
Expand Down Expand Up @@ -107,6 +112,7 @@ export const BusinessLookupEntityTypes = [
EntityTypes.BC, // Benefit Company
EntityTypes.BEN, // invalid?
EntityTypes.C,
EntityTypes.CBEN,
EntityTypes.CC,
EntityTypes.CCC,
EntityTypes.CUL,
Expand All @@ -130,9 +136,12 @@ export const BusinessLookupEntityTypes = [

/** Entity types that support the numbered company option. */
export const NumberedEntityTypes = [
EntityTypes.BC,
EntityTypes.BC, // Benefit Company
EntityTypes.CC,
EntityTypes.CR,
EntityTypes.CR, // BC Limited Company
EntityTypes.UL,
EntityTypes.C
EntityTypes.C,
EntityTypes.CBEN,
EntityTypes.CCC,
EntityTypes.CUL
]
2 changes: 1 addition & 1 deletion src/services/business-lookup-services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export default class BusinessLookupServices {
* @returns a promise to return the search results
*/
static async search (query: string, status = ''): Promise<BusinessLookupResultIF[]> {
const legalType = 'A,BC,BEN,C,CC,CCC,CP,CUL,FI,GP,LL,LLC,LP,PA,S,SP,ULC,XCP,XL,XP,XS'
const legalType = 'A,BC,BEN,C,CBEN,CC,CCC,CP,CUL,FI,GP,LL,LLC,LP,PA,S,SP,ULC,XCP,XL,XP,XS'

let url = this.registriesSearchApiUrl + 'businesses/search/facets?start=0&rows=20'
url += `&categories=legalType:${legalType}${status ? '::status:' + status : ''}`
Expand Down
Loading