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

23604 update logic for changing business name #599

Merged
merged 5 commits into from
Nov 19, 2024
Merged

23604 update logic for changing business name #599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8414e3e
update logic for changing business name
meawong Nov 18, 2024
71b5c31
update patch version
meawong Nov 19, 2024
40ceee6
simplify conditional
meawong Nov 19, 2024
6dffd0d
Add original watch back
meawong Nov 19, 2024
0c3c772
add check to see if there is a new nr
meawong Nov 19, 2024
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": "business-edit-ui",
"version": "4.11.6",
"version": "4.11.7",
"private": true,
"appName": "Edit UI",
"sbcName": "SBC Common Components",
Expand Down
22 changes: 12 additions & 10 deletions src/components/common/YourCompany/ChangeBusinessType.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,7 @@ export default class ChangeBusinessType extends Mixins(CommonMixin) {
@Getter(useStore) getEditedLabel!: string
@Getter(useStore) getEntityType!: CorpTypeCd
@Getter(useStore) getNameRequestLegalName!: string
@Getter(useStore) getNameRequestNumber!: string
@Getter(useStore) getNumberOfDirectors!: number
@Getter(useStore) getOriginalLegalName!: string
@Getter(useStore) getOriginalLegalType!: CorpTypeCd
Expand Down Expand Up @@ -415,6 +416,11 @@ export default class ChangeBusinessType extends Mixins(CommonMixin) {
return (this.isCommunityContribution && this.getNumberOfDirectors < 3)
}

/** True if a new NR number has been entered. */
get hasNewNr (): boolean {
return !!this.getNameRequestNumber
}

/** Reset company type values to original. */
resetType () {
this.setEntityType(this.getOriginalLegalType || null)
Expand All @@ -433,24 +439,20 @@ export default class ChangeBusinessType extends Mixins(CommonMixin) {
submitTypeChange () {
this.setEntityType(this.selectedEntityType)
this.isEditingType = false
if (this.shouldUpdateName()) {
Copy link
Collaborator Author

@meawong meawong Nov 19, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Using the old logic, we would only update the name and set the NR if the business name had NOT changed. This prevents the case when a user attempts to change the business type (and therefore the name) more than once, as the business name HAS changed in this case.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Does this logic work on a named company? With and without a new NR?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Since these changes still retain the check for a numbered business, as before, named companies should not be reaching this block of code below. There should be separate logic that handles named businesses (I can verify where this is if you like).

Copy link
Collaborator

@severinbeauvais severinbeauvais Nov 19, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Please verify and/or test if you haven't already.

I did a little test on a named BC Limited, and could not change the type to ULC without a NR.

As before, I could not change a named BC to a numbered ULC in one step -- it would take one alteration to change it to numbered, and a second one to change the type. But that's a future ticket so don't worry about it.

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 did a little test on a named BC Limited, and could not change the type to ULC without a NR.

I thought this was the expected behaviour for named businesses? Since altering the business type for a named business would require a name change and this requires an NR.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Yes, but what if wanted to change my named BC to a numbered ULC? Anyway, we discussed this previously and decided it was low priority right now.

if (this.isNumberedCompany && !this.hasNewNr) {
const originalName = this.getOriginalLegalName
const updatedName = this.getUpdatedName(originalName)
this.setNameRequest({
legalType: this.selectedEntityType,
nrNum: this.getOriginalNrNumber
severinbeauvais marked this conversation as resolved.
Show resolved Hide resolved
} as any)
this.setNameRequestLegalName(updatedName)
if (originalName !== updatedName) {
this.setNameRequest({
legalType: this.selectedEntityType,
nrNum: this.getOriginalNrNumber
} as any)
this.setNameRequestLegalName(updatedName)
this.setNameChangedByType(true)
}
}
}

shouldUpdateName (): boolean {
return this.isNumberedCompany && !this.hasBusinessNameChanged
}

getUpdatedName (originalName: string): string {
if (this.isUnlimitedLiability) {
originalName = originalName.replace(' LTD.', '')
Expand Down
3 changes: 2 additions & 1 deletion src/components/common/YourCompany/EntityName.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,8 +450,9 @@ export default class EntityName extends Mixins(CommonMixin, NameRequestMixin) {
} as any)
this.setNameRequestLegalName(this.getOriginalLegalName)

this.setEntityType(this.getOriginalLegalType || null)

if (this.isEntityTypeChangedByName) {
this.setEntityType(this.getOriginalLegalType || null)
this.setEntityTypeChangedByName(false)
}

Expand Down
1 change: 1 addition & 0 deletions src/views/Alteration.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ export default class Alteration extends Mixins(CommonMixin, FeeMixin, FilingTemp
}
}

@Watch('hasBusinessNameChanged')
severinbeauvais marked this conversation as resolved.
Show resolved Hide resolved
@Watch('hasBusinessTypeChanged')
onBusinessTypeChanged () {
const filingData = this.getFilingData
Expand Down
Loading