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.

Sign up for GitHub

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

18235 Fixed xpro mappings #732

Merged
merged 2 commits into from
Oct 19, 2023
Merged

18235 Fixed xpro mappings #732

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ef76f4
- app version = 5.2.13
severinbeauvais Oct 19, 2023
0da8eb5
- removed fallbacks
severinbeauvais Oct 19, 2023
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
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "name-request",
"version": "5.2.12",
"version": "5.2.13",
"private": true,
"appName": "Name Request UI",
"sbcName": "SBC Common Components",
Expand Down
7 changes: 0 additions & 7 deletions src/components/new-request/search.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,13 +560,6 @@ export default class Search extends Mixins(CommonMixin, NrAffiliationMixin, Sear
!this.isSupportedContinuationIn(this.getEntityTypeCd)
) return true

// Conditional for Continuation In Flow.
if (
this.isContinuationIn &&
this.isNumberedCompany &&
!this.isSupportedContinuationIn(this.getEntityTypeCd)
) return true

Copy link
Collaborator Author

@severinbeauvais severinbeauvais Oct 19, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Duplicate of lines 556-561 above. (Probably a merge issue some time ago.)

Or we really, really wanted to make sure we return True in this scenario.

Copy link
Collaborator

@JazzarKarim JazzarKarim Oct 19, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Hahahahahaha, might as well add a 3rd one. To be extra, extra, EXTRA sure 🤣

return false
}

Expand Down
2 changes: 1 addition & 1 deletion src/enums/entity-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ export enum EntityTypes {
RLC = CorpTypeCd.XPRO_LIMITED_LIABILITY_COMPANY,
XCP = CorpTypeCd.XPRO_COOP,
XCR = CorpTypeCd.XPRO_CORPORATION,
XL = CorpTypeCd.XPRO_LL_PARTNR,
XLL = CorpTypeCd.XPRO_LIMITED_LIABILITY_PARTNERSHIP,
XLP = CorpTypeCd.XPRO_LIMITED_PARTNERSHIP,
XL = CorpTypeCd.XPRO_LL_PARTNR,
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 sorted this.

XP = CorpTypeCd.XPRO_LIM_PARTNR,
XS = CorpTypeCd.XPRO_SOCIETY,
XSO = CorpTypeCd.XPRO_SOCIETY_NR,
Expand Down
35 changes: 17 additions & 18 deletions src/list-data/request-action-mapping.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,32 +61,31 @@ export const BcMapping: RequestActionMappingI = {

export const XproMapping: RequestActionMappingI = {
AML: [
EntityTypes.XCR,
EntityTypes.XCP
EntityTypes.XCP, // maps to Corp Type "XCP"
EntityTypes.XCR // maps to Corp Type "XCR"
],
ASSUMED: [
EntityTypes.XCR,
EntityTypes.RLC
EntityTypes.RLC, // maps to Corp Type "LLC"
EntityTypes.XCR // maps to Corp Type "XCR"
],
REN: [
EntityTypes.XCR,
EntityTypes.XCP,
EntityTypes.RLC
EntityTypes.RLC, // maps to Corp Type "LLC"
EntityTypes.XCP, // maps to Corp Type "XCP"
EntityTypes.XCR // maps to Corp Type "XCR"
],
REH: [
EntityTypes.A,
EntityTypes.LLC,
EntityTypes.XCP,
EntityTypes.XSO
EntityTypes.RLC, // maps to Corp Type "LLC"
EntityTypes.XCP, // maps to Corp Type "XCP"
EntityTypes.XSO, // maps to Corp Type "XS"
EntityTypes.XUL // maps to Corp Type "A"
],
CHG: [
EntityTypes.A,
EntityTypes.LLC,
EntityTypes.XCP,
EntityTypes.XL,
EntityTypes.XLL,
EntityTypes.XLP,
EntityTypes.XP
Copy link
Collaborator Author

@severinbeauvais severinbeauvais Oct 19, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

The bug ticket referred to name "722380 ALBERTA LTD.", which has corp type "A", so the list above needs to include "XUL". I have tested the new code and it's fine for this example.

Testing should also be done for:

  • restorations for businesses of type "A", "LLC" and "XS"
  • name changes for businesses of type "LLC", "XL", "XP" and "XS"

^^ I've documented the above in the ticket.

EntityTypes.RLC, // maps to Corp Type "LLC"
EntityTypes.XCP, // maps to Corp Type "XCP"
EntityTypes.XLL, // maps to Corp Type "XL"
EntityTypes.XLP, // maps to Corp Type "XP"
EntityTypes.XSO, // maps to Corp Type "XS"
EntityTypes.XUL // maps to Corp Type "A"
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

The root case of this bug is that these lists use Namerequest-specific codes, but we check the legal type (corp type) from the business search result, which is LEAR codes.

So we need to keep in mind this mapping between the codes 😒

Copy link
Collaborator

@JazzarKarim JazzarKarim Oct 19, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

I really really wish we didn't have this mismatch between EntityTypes and CorpTypeCd 😞 It's the source for a lot of confusion.

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 know. This will keep biting us.

I just created this ticket:
https://app.zenhub.com/workspaces/entities-team-space-6143567664fb320019b81f39/issues/gh/bcgov/entity/18241

Copy link
Collaborator

Choose a reason for hiding this comment

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

I agree as well, would be really nice to have the codes consistent.

]
}

Expand Down
22 changes: 11 additions & 11 deletions src/mixins/common-mixin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,12 +156,6 @@ export class CommonMixin extends Vue {
return (nr?.priorityCd === PriorityCode.YES)
}

/** Returns true if the specified entity type is allowed for Incorporation / Registration. */
isSupportedIncorporationRegistration (type: EntityTypes): boolean {
const supportedEntites = GetFeatureFlag('supported-incorporation-registration-entities')
return supportedEntites.includes(type)
}
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Moved down so it's beside the other FF getters.


/**
* Returns true if society NRs are enabled -- in case societies NRs need to be released
* separately from the Way of Navigating feature changes.
Expand All @@ -179,33 +173,39 @@ export class CommonMixin extends Vue {
].includes(nr?.legalType)
}

/** Returns true if the specified entity type is allowed for incorporation / registration. */
isSupportedIncorporationRegistration (type: EntityTypes): boolean {
const supportedEntites = GetFeatureFlag('supported-incorporation-registration-entities') || []
return supportedEntites.includes(type)
}

/** Returns true if the specified request type is allowed for alteration (conversion). */
isSupportedAlteration (type: NrRequestTypeCodes): boolean {
const supportedAlterationTypes = GetFeatureFlag('supported-alteration-types')
const supportedAlterationTypes = GetFeatureFlag('supported-alteration-types') || []
JazzarKarim marked this conversation as resolved.
Show resolved Hide resolved
return supportedAlterationTypes.includes(type)
}

/** Returns true if the specified entity type is allowed for amalgamation. */
isSupportedAmalgamation (type: EntityTypes): boolean {
const supportedAmalgamationEntities = GetFeatureFlag('supported-amalgamation-entities')
const supportedAmalgamationEntities = GetFeatureFlag('supported-amalgamation-entities') || []
return supportedAmalgamationEntities.includes(type)
}

/** Returns true if the specified entity type is allowed for name change. */
isSupportedChangeName (type: EntityTypes): boolean {
const supportedChangeNameEntities = GetFeatureFlag('supported-name-change-entities')
const supportedChangeNameEntities = GetFeatureFlag('supported-name-change-entities') || []
return supportedChangeNameEntities.includes(type)
}

/** Returns true if the specified entity type is allowed for continuation in. */
isSupportedContinuationIn (type: EntityTypes): boolean {
const supportedContInEntites = GetFeatureFlag('supported-continuation-in-entities')
const supportedContInEntites = GetFeatureFlag('supported-continuation-in-entities') || []
return supportedContInEntites.includes(type)
}

/** Returns true if the specified entity type is allowed for restoration/reinstatement. */
isSupportedRestoration (type: EntityTypes): boolean {
const supportedRestorationEntites = GetFeatureFlag('supported-restoration-entities')
const supportedRestorationEntites = GetFeatureFlag('supported-restoration-entities') || []
return supportedRestorationEntites.includes(type)
}

Expand Down
Loading