-
Notifications
You must be signed in to change notification settings - Fork 47
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
19036 Added "must include" checklist + refactored validation #635
Conversation
@@ -1,29 +1,81 @@ | |||
<template> | |||
<div id="amalgamating-businesses"> | |||
<v-btn |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I recommend you go to the ⚙️ icon and hide whitespace, to better see what I did here.
<span class="rule-item-txt">Amalgamating businesses</span> | ||
</li> | ||
</ul> | ||
</section> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Getter(useStore) getShowErrors!: boolean | ||
// @Getter(useStore) isAmalgamationFilingHorizontal!: boolean | ||
// @Getter(useStore) isAmalgamationFilingRegular!: boolean | ||
// @Getter(useStore) isAmalgamationFilingVertical!: boolean |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As in other places, these are imported via some mixins, but I like to have the declarations here anyways.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See screenshots above for regular/short-form updated layouts.
- added checklist section + computeds - changed Business Table "valid" to "allOk" - refactored Amalgamating Businesses validation - cleaned up Information page layout - fixed bug where holding company is changed to amalgamating - fixed/updated unit tests
b04b344
to
4eba431
Compare
corpNumber: item.corpNumber, | ||
legalName: item.legalName, | ||
foreignJurisdiction: item.foreignJurisdiction | ||
} as AmalgamatingBusinessIF | ||
} else { | ||
return { | ||
type: AmlTypes.LEAR, | ||
role: AmlRoles.AMALGAMATING, | ||
role: item.role, // amalgamating or holding |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Use the role from the item (which is what was restored from the draft).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
] | ||
|
||
for (let i = 0; i < businessTableValidTests.length; i++) { | ||
it.skip(`computes businessTableValid correctly - test ${i}`, () => { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In progress - I will submit another PR.
await wrapper.setData({ businessTableValid, isAddingAmalgamatingBusiness, isAddingAmalgamatingForeignBusiness }) | ||
expect(store.stateModel.amalgamation.amalgamatingBusinessesValid).toBe(expected) | ||
for (let i = 0; i < amalgamatingBusinessesValidTests.length; i++) { | ||
it.skip(`validates component - test ${i}`, async () => { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In progress - I will submit another PR.
/gcbrun |
Temporary Url for review: https://business-create-dev--pr-635-7gpbp65t.web.app |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM 👍
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
* - app version = 5.8.1 - added checklist section + computeds - changed Business Table "valid" to "allOk" - refactored Amalgamating Businesses validation - cleaned up Information page layout - fixed bug where holding company is changed to amalgamating - fixed/updated unit tests * wip --------- Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>
Issue #: bcgov/entity#19036
Description of changes:
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of the bcrs-entities-create-ui license (Apache 2.0).