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

19036 Added "must include" checklist + refactored validation #635

Merged
merged 2 commits into from
Jan 26, 2024

Conversation

severinbeauvais
Copy link
Collaborator

@severinbeauvais severinbeauvais commented Jan 25, 2024

Issue #: bcgov/entity#19036

Description of changes:

  • 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
  • updated unit tests (fixes to come in a future PR)

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).

@severinbeauvais severinbeauvais self-assigned this Jan 25, 2024
@@ -1,29 +1,81 @@
<template>
<div id="amalgamating-businesses">
<v-btn
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 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>
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Example for regular amalgamation:

image

Copy link
Collaborator Author

@severinbeauvais severinbeauvais Jan 25, 2024

Choose a reason for hiding this comment

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

Example for short-form (horizontal) amalgamation:

image

@Getter(useStore) getShowErrors!: boolean
// @Getter(useStore) isAmalgamationFilingHorizontal!: boolean
// @Getter(useStore) isAmalgamationFilingRegular!: boolean
// @Getter(useStore) isAmalgamationFilingVertical!: boolean
Copy link
Collaborator Author

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.

Copy link
Collaborator Author

@severinbeauvais severinbeauvais Jan 25, 2024

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.

Severin Beauvais added 2 commits January 25, 2024 16:08
- 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
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
Copy link
Collaborator Author

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).

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Example after fix:

image

]

for (let i = 0; i < businessTableValidTests.length; i++) {
it.skip(`computes businessTableValid correctly - test ${i}`, () => {
Copy link
Collaborator Author

@severinbeauvais severinbeauvais Jan 26, 2024

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 () => {
Copy link
Collaborator Author

@severinbeauvais severinbeauvais Jan 26, 2024

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.

@severinbeauvais
Copy link
Collaborator Author

/gcbrun

@bcregistry-sre
Copy link
Collaborator

Temporary Url for review: https://business-create-dev--pr-635-7gpbp65t.web.app

Copy link
Collaborator

@ketaki-deodhar ketaki-deodhar left a comment

Choose a reason for hiding this comment

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

Looks good

Copy link
Collaborator

@JazzarKarim JazzarKarim left a comment

Choose a reason for hiding this comment

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

LGTM!

Copy link
Collaborator

@PaulGarewal PaulGarewal left a comment

Choose a reason for hiding this comment

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

LGTM 👍

Copy link
Contributor

@jamespaologarcia jamespaologarcia left a comment

Choose a reason for hiding this comment

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

LGTM!

@severinbeauvais severinbeauvais merged commit fd59c0c into bcgov:main Jan 26, 2024
5 checks passed
JazzarKarim pushed a commit to JazzarKarim/business-create-ui that referenced this pull request Feb 23, 2024
* - 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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants