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

18640 Amalgamating businesses structure + validations + etc #587

Merged
merged 2 commits into from
Dec 5, 2023

Conversation

severinbeauvais
Copy link
Collaborator

@severinbeauvais severinbeauvais commented Dec 4, 2023

Issue #: bcgov/entity#18640

Description of changes:
- app version = 5.6.6
- worked on amalgamating businesses data/types
- renamed some enums
- fixed table key
- added more BusinessTable logic (including foreign jurisdiction)
- updated static (test) data
- updated some imports in unit tests

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

- worked on amalgamating businesses data/types
- renamed some enums
- fixed table key
- added more BusinessTable logic (including foreign jurisdiction)
- updated static (test) data
- updated some imports in unit tests
@@ -46,6 +46,7 @@
"array-move": "^4.0.0",
"axios": "^0.27.2",
"core-js": "^3.30.1",
"country-list": "^2.2.0",
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

For converting country code to name.

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

This is super helpful, thanks! Will rebase and build on top of it.

@@ -15,27 +15,29 @@
<tbody>
<tr
v-for="(item, index) in businesses"
:key="item.businessId"
:key="item.identifier"
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 initially had this as :key="index" but if you delete an entry in the table, most of the indexes stay the same (eg, you go from 0-5 to 0-4) so the table doesn't render correctly. Now it does because each item is indexed by its unique value.

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 still have work to do in here. Not your concern :)

Copy link
Collaborator

Choose a reason for hiding this comment

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

Faced a similar issue when I was running the debug code for the array 🙏

@severinbeauvais severinbeauvais merged commit a57bd1c into bcgov:main Dec 5, 2023
4 of 5 checks passed
JazzarKarim pushed a commit to JazzarKarim/business-create-ui that referenced this pull request Jan 26, 2024
* - app version = 5.6.6
- worked on amalgamating businesses data/types
- renamed some enums
- fixed table key
- added more BusinessTable logic (including foreign jurisdiction)
- updated static (test) data
- updated some imports in unit tests

* - misc fixes
JazzarKarim added a commit that referenced this pull request Jan 26, 2024
* 18102 (#576)

Signed-off-by: Hongjing Chen <Hongjing.Chen@gov.bc.ca>

* Fixed Dissolution Date bug (#577)

* Fixed dissolution date bug

* Updated in response to Sev's comments + added unit tests

* Fixed unit test

* fixed unit test running locally but not with github ci

* Added test case + fixed test

* Added another test case

* another small fix

* trying something out

* Added a test line

* 17160 Update fetchNr with phone and email validation (#578)

* update fetchNr with phone and email validation

* fix small

* replace fetch NR func

* remove old fetch func

* 18536 Fixed lint warnings before further development (#581)

* - app version = 5.6.0
- fixed a whack of lint warnings

* - imported CorpTypeCd directly from module to avoid type confusion

* 18449 - GP/SP registration modify (#582)

* GP/SP regirstration modify

* package version

* fix linting

* unit tests

* clean up

* fix linting

* unit tests fix

* unit tests fixing 2

* fix linting

* reset back to previous one

* show old UI with registries staff only

* GP/SP regirstration modify

* fix linting

* unit tests

* clean up

* unit tests fix

* unit tests fixing 2

* fix UI and testing

* fix registries contact info messed up issue

* fix lint

* clean up help contact us

* clean up the getter, import etc..

* revert FirmContactInfo back

* remove obsolete component

* - app version = 5.6.2 (#583)

- imported latest shared enums
- imported latest shared interfaces
- imported latest shared mixins
- added route names to enum
- added views to enum
- added filing interface
- added resource interface
- updated state interface
- added amalgamation state interface
- updated filing template mixin
- added initial amalgamation resources
- added amalgamation steps
- added amalgamation routes
- added/updated getters/actions to  store
- updated state model
- added initial amalgamation views

- renamed some methods in App.vue
- added amalgamations to App.vue
- added amalgamations to Actions.vue
- added amalgamations to EntityInfo.vue
- added amalgamations to SaveErrorDialog.vue
- added fallbacks to amalgamations in filing-template-mixin.ts
- added amalgamations to BreadCrumbResource.ts
- added amalgamations to legal-services.ts
- added amalgamations to feature-flag-utils.ts
- misc cleanup

- initial updates to Business Info page
- initial updates to Information page

- added Expandable Help
- added error return links
- added amalg blocks to Summary Define Company
- added misc placeholders for future components

- moved SummaryDefineCompany to common folder
- moved ListShareClass to common folder
- moved ShareStructure to common folder

- updated validity in Stepper

* 18625 Fix validate nr func (#584)

* fix validate nr func

* update version

* 18535 - Add Amalgamating Businesses Part 1 (#585)

* 18535 - Add Amalgamating Businesses Part 1

* Fixed id name

* Cleanup + added fix for new note

* First set of fixes in response to Sev's comments

* fixed lint error

* Part fix in response to Sev's comments

* 18640 Amalgamating business table (initial) (#586)

* - app version = 5.6.5
- added global warning (orange) colour
- removed unnecessary re-export
- added initial BusinessTable component
- added initial validation code
- added Business Status sub-component
- added basic functionality to table
- added Business Statuses enum
- renamed property in amalg filing interface
- updated filing save/restore
- added businesses table to store (plus default initial state for now only)

* wip

* 18640 Amalgamating businesses structure + validations + etc (#587)

* - app version = 5.6.6
- worked on amalgamating businesses data/types
- renamed some enums
- fixed table key
- added more BusinessTable logic (including foreign jurisdiction)
- updated static (test) data
- updated some imports in unit tests

* - misc fixes

* 18640 More amalgamating business table work (#589)

* - app version = 5.6.7

* - changed break to return in App.vue
- always import CorpTypeCd from corp-type-module (never enums)
- added some TING business rules
- removed status from static data

* - more table logic
- more test data cleanup

* wip

* wip

* - deleted unneeded getters, etc
- added Business Table Summary

* wip

* wip

* 18535 Amalgamating Businesses Part 1 Continuation (#588)

* Refactored saveAmalgamatingBusiness + specified what to search for

* Setup AmalgamatingBusinesses validity

* fixed unit tests

* cleanup

* Populate the table using the business lookup

* Fixed in response to Sev's comments

* Small cleanup in response to Sev's comment

* updated package version

* 18535 - Save and Resume Draft Amalgamation (#592)

* Save and resume draft amalgamation

* Properly initialize array if continuing a draft

* updated package version

* 18538 Resulting Business Name and Type component (WIP) (#591)

* PR (TODO fix unit tests)

* Added unit tests for numbered am

* Fixed test case and update from comments

* Added additional test case

* Updated unit test formatting.

* Updated package.json

* Added bullet points for numberd AML

* Fixed test cases

* 18640 Incremental amalgamating businesses validations, etc (#590)

* - app version = 5.6.10
- updated some validity calculations
- moved ting validations to a mixin
- generalized status computation
- updated regular amalgation validity

* - updated to use temp copy of array (instead of local copy)

* wip

---------

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* 18640 More amalgamating fetch / validations work (#593)

* - app version = 5.6.11
- imported latest BusinessLookup shared component
- updated fetchBusinessInfo return object
- simplified Amalg Businesses button and panel logic
- added Cancel button to Foreign panel
- added snackbar for save business errors
- deleted debugging template code

* - added fetch for business filings (for more validations)
- renamed AmalgamatingStatuses -> AmlStatuses
- added AmlTypes enum and replaced strings
- added some properties to TING business object (for more validations)
- added LegalServices.fetchFilings()
- misc updates

* - changed all to allSettled so I can get partial fetches
- fall back to lookup properties if some fetches fail (eg, not amalgamated)
- added empty table message
- temporarily start with empty (instead of pre-populated) table

* wip

* wip

* - logic cleanup

* - added proper check for limited restoration
- now fetch only first filing (to check for FED)
- fixed fetchFirstOrOnlyFiling() (for use with array response)

* - fixed unit test

---------

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* 18971 Finished some TODOs and incremental work on amalgamating business validations (#596)

* - app version = 5.6.12
- finished stepper validity code
- cleaned up some store code
- misc cleanup
- named and sorted rules

* - added spinner (experimental)

* wip

---------

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* 18960 - Re-fetch businesses information when loading draft (#594)

* Refactored the code + centralized fetch calls

* fixed lint errors

* Rebased + fixed rebase issues + fixed some of Sev's comments

* 18722 Add ForeignBusiness component for amalgamating businesses (#595)

* Add ForeignBusiness component

* Fix rebase issues

* Update nested select value

* Fix lint error

* Add spaces between tags

* Move foreign business component code to parent

* Wrap btn text in span

* Use common jurisdiction component

* 18971 Updated TING validations (#597)

* - app version = 5.6.13
- added dotted underline class that works for multiple lines
- cleaned up BusinessStatus and changed tooltip activator
- added tooltip text cases
- added validation rules and getters (still WIP)
- moved static businesses code from state-model to filing-template-mixin

* - on app start, display app name and version

---------

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* Update foreign company error messages (#599)

* 18788 Updated amalgamation -> amalgamationApplication + business name options (WIP) (#598)

* - app version = 5.6.14
- added ResultingBusinessName component
- misc refactor and new code to handle 3 options
- still WIP

* - changed snackbar close text to a white icon

* - added random key to BusinessLookup to reset its state between calls

* - replaced local EntityState with shared EntityStates
- added validation for isHistorical

* - ResultingBusinessName WIP !!!

* - updated imported enums, etc
- updated some enums locally (amalgamation -> amalgamationApplication)
- ResultingBusinessName is still WIP (so don't use it)

---------

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* 18546 - add Folio Number to Review and Confirm step (#601)

* 18546-add folio number component

* 18546-validaions for folio number and unit test

* 18546-step validations

* 18546-fix spacing and change getter name

* 18546-update comments

* 18546-remove unused getter

* 18546-update package version

* 18546-premium account, label changes

* 18546-premium account check for validation

* 18847-update certify text for amalgamations (#603)

* 18722 - Update foreign business validation rules (#602)

* Update mras corp number rules

* Add test code

* Fix foreign jurisdiction validations

* Corp Number only required if Mras

* Update validation on jurisdiction change

* Update isForeignBusinessValid

* Fix typo

* Use common Mras list

* Add comments to foreign business validation

* Update != to !==

* Update version to 5.6.17

* 18848 - add court order / POA component on review page (#604)

* 18848-add Court order on review page

* 18848-update package version

* - app version = 5.6.19 (#600)

- imported updated shared correct-name and mixins
- updated some validations
- updated misc whitespace
- added additional options to ResultingBusinessName.vue
- added additional option to NameRequestInfo.vue
- fixed numbered company suffix
- added conditional links to return to proper steps
- updated save/resume name options
- updated more validations
- temporarily skipped some unit tests
- misc cleanup

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* 19019 Add extra-pro A TING companies (#605)

* Add extra-pro TING companies

* Updated in response to Sev's comments

* updated package version after rebasing

* Fixed in response to Sev's comments

* fixed name

* removed unneeded comment

* extra empty line

* - app version = 5.6.21 (#606)

- added fallback for drafts created without Correct Name Option

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* - app version = 5.6.22 (#607)

- updated base class to remove border radius (per UI designs)
- added message box to step 5

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* - app version = 5.6.23 (#610)

- fixed amalgamation information title

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* - app version = 5.6.24 (#611)

- reordered sections so amalgamations don't use generic section

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* fix unit test (#612)

Merging without updating app version since it's only a unit test change.

* 18749 - add amalgamation statement to review (#609)

* ui parts

* able to store, valid, and update

* update version

* ui parts

* able to store, valid, and update

* able to save

* still working on adding test file, fix other comments

* package conflict

* add unit text file

* lint and version

* add comments

* JSDoc syntax

* Final Framework Changes/Fixes for Regular Amalgamation (#608)

* Added unit tests for amalgamation views + lots of misc. fixes and cleanup

* Added test line for review and confirm page

* More and more fixes + cleanup

* Added return to step for business summary table

* Fixed in response to Sev's comments

* updated comment

* Fixed Amalgamation Statement test after rebase + updated package version

* 18749 - fix bug in reopen draft amalgamation file (#613)

* update version

* add validation to mounted function

* update version

* - app version = 5.6.28 (#615)

- misc fixes
- added Business Status unit tests
- added Business Table unit tests
- added Business Table Summary unit tests

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* 18689 More Amalgamation fixes/updates (#614)

* Fixed Review and Confirm page validation

* Re-fetch business table data on file and pay

* updated package version

* removed debug code

* Fixed re-fetching issue

* add account id header (#616)

* Fixed bug with certify if submitting the amalgamation failed (#617)

* 18641 More unit tests (#618)

* - app version = 5.6.32
- added Amalgamation Mixin unit tests
- updated some status messages (per Yui)
- updated some rules (per Yui)
- added more Business Table unit tests (disabled until future)
- misc updates

* - added missing rule to list

---------

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* - app version = 5.6.33 (#619)

- do not save numbered name
- do not restore numbered name

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* - app version = 5.6.34 (#620)

- fixed check for future effective filing
- added missing filing statuses to enum

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* - app version = 5.6.35 (#621)

- added check for pending dissolution filing
- moved checks as new functions in mixin
- added business status (message) for pending dissolution
- added enum value
- updated state interface
- added new rule in mixin
- misc clean and missing code
- updated unit tests

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* 19050 Changed pending dissolution check to pending filing check (#622)

* - app version = 5.6.36
- changed pending dissolution check to pending filing check

* - updated tooltip message

* - another tooltip message update

* - changed companies from title case to lower case

---------

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* 19201+19275+19216 More Amalgamation Fixes (#623)

* Lots and lots of amalgamation fixes

* fixed rebase issue + updated package version

* added unit test for frozen rule

* fixed rebase issue

* Fixed in response to Sev's comments

* updated package version after rebase

* Amalgamation stepper fix (#624)

* Amalgamation stepper fix

* Fixed spacing more after discussion with Yui

* fixed icon size

* - app version = 5.6.39 (#625)

- disabled incorporator/organization code for amalgamations

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* 19179 Added Amalgamating Businesses unit tests (#626)

* - app version = 5.6.40
- added element ids
- updated LEAR business duplicate check
- added foreign business duplicate check
- misc cleanup
- added test suite (WIP)

* wip

---------

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* - app version = 5.6.41 (#627)

- added rest of unit tests

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* - app version = 5.6.42 (#629)

- added isDraftTask to Amalgamating Business interface
- added business status tooltip for Draft Task error
- added amalgamation enum value
- added new test to amalgamation rules
- added fetch of first task
- added helper function to amalgamation mixin
- updated / added unit tests
- minor cleanup

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* Bump vite from 4.3.9 to 4.5.2 (#631)

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 4.3.9 to 4.5.2.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v4.5.2/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v4.5.2/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* 19359 - Amalgamating Businesses Table must have more than 1 (#628)

* Fixed amalgamating business length to be more than 1

* Rebased + fixed Sev's comment + added unit tests

* Fixed lint issues

* removed unneeded nextTick in tests

* 19040 Framework for short-form amalgamations (#630)

* - app version = 5.7.0
- updated App header/title
- added short-form amalgamation re-routing
- added short-form amalgamation resource loading
- updated Steppersimplified
- added short-form amalgamation return links, etc
- added short-form amalgamation route names
- delete unneeded data in regular amalgamation resources
- added short-form amalgamation resources and steps
- broke up routes in sub-files
- added short-form amalgamation routes
- updated some store getters
- combined views for regular + short-form
- added conditionals in views for differences
- added some computeds to keep template simple
- updated unit tests
- fixed missing effective date validity check

* - deleted unused incorporation agreement type

* - added option for Primary (vs Holding) Company

* - fixed unit tests

---------

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* - app version = 5.7.1 (#634)

- don't show Add Person for short-form amalgamation
- set initial OfficeAddresses validity
- deleted unneeded data from amalg IF
- finished short amalg Office Addresses layout

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* Implemented the Continuation In Framework (#633)

* Implemented the Continuation In Framework

* some fixes related to continuation in interfaces

* Rebased + fix rebase issues + fixed in response to comments

* Small fixes in response to Sev's comments

* Fixed typo

* updated package version

* major upgrade to package.json

---------

Signed-off-by: Hongjing Chen <Hongjing.Chen@gov.bc.ca>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Hongjing <60866283+chenhongjing@users.noreply.github.com>
Co-authored-by: Kevin Zhang <54437031+kzdev420@users.noreply.github.com>
Co-authored-by: Séverin Beauvais <severinbeauvais@users.noreply.github.com>
Co-authored-by: Shaoyun Tong <144159934+tshyun24@users.noreply.github.com>
Co-authored-by: jamespaologarcia <james.paolo.p.garcia@gmail.com>
Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>
Co-authored-by: leodube-aot <122323255+leodube-aot@users.noreply.github.com>
Co-authored-by: ketaki-deodhar <116035339+ketaki-deodhar@users.noreply.github.com>
Co-authored-by: Vysakh Menon <vysakh.menon@aot-technologies.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
JazzarKarim added a commit to JazzarKarim/business-create-ui that referenced this pull request Feb 1, 2024
* 18102 (bcgov#576)

Signed-off-by: Hongjing Chen <Hongjing.Chen@gov.bc.ca>

* Fixed Dissolution Date bug (bcgov#577)

* Fixed dissolution date bug

* Updated in response to Sev's comments + added unit tests

* Fixed unit test

* fixed unit test running locally but not with github ci

* Added test case + fixed test

* Added another test case

* another small fix

* trying something out

* Added a test line

* 17160 Update fetchNr with phone and email validation (bcgov#578)

* update fetchNr with phone and email validation

* fix small

* replace fetch NR func

* remove old fetch func

* 18536 Fixed lint warnings before further development (bcgov#581)

* - app version = 5.6.0
- fixed a whack of lint warnings

* - imported CorpTypeCd directly from module to avoid type confusion

* 18449 - GP/SP registration modify (bcgov#582)

* GP/SP regirstration modify

* package version

* fix linting

* unit tests

* clean up

* fix linting

* unit tests fix

* unit tests fixing 2

* fix linting

* reset back to previous one

* show old UI with registries staff only

* GP/SP regirstration modify

* fix linting

* unit tests

* clean up

* unit tests fix

* unit tests fixing 2

* fix UI and testing

* fix registries contact info messed up issue

* fix lint

* clean up help contact us

* clean up the getter, import etc..

* revert FirmContactInfo back

* remove obsolete component

* - app version = 5.6.2 (bcgov#583)

- imported latest shared enums
- imported latest shared interfaces
- imported latest shared mixins
- added route names to enum
- added views to enum
- added filing interface
- added resource interface
- updated state interface
- added amalgamation state interface
- updated filing template mixin
- added initial amalgamation resources
- added amalgamation steps
- added amalgamation routes
- added/updated getters/actions to  store
- updated state model
- added initial amalgamation views

- renamed some methods in App.vue
- added amalgamations to App.vue
- added amalgamations to Actions.vue
- added amalgamations to EntityInfo.vue
- added amalgamations to SaveErrorDialog.vue
- added fallbacks to amalgamations in filing-template-mixin.ts
- added amalgamations to BreadCrumbResource.ts
- added amalgamations to legal-services.ts
- added amalgamations to feature-flag-utils.ts
- misc cleanup

- initial updates to Business Info page
- initial updates to Information page

- added Expandable Help
- added error return links
- added amalg blocks to Summary Define Company
- added misc placeholders for future components

- moved SummaryDefineCompany to common folder
- moved ListShareClass to common folder
- moved ShareStructure to common folder

- updated validity in Stepper

* 18625 Fix validate nr func (bcgov#584)

* fix validate nr func

* update version

* 18535 - Add Amalgamating Businesses Part 1 (bcgov#585)

* 18535 - Add Amalgamating Businesses Part 1

* Fixed id name

* Cleanup + added fix for new note

* First set of fixes in response to Sev's comments

* fixed lint error

* Part fix in response to Sev's comments

* 18640 Amalgamating business table (initial) (bcgov#586)

* - app version = 5.6.5
- added global warning (orange) colour
- removed unnecessary re-export
- added initial BusinessTable component
- added initial validation code
- added Business Status sub-component
- added basic functionality to table
- added Business Statuses enum
- renamed property in amalg filing interface
- updated filing save/restore
- added businesses table to store (plus default initial state for now only)

* wip

* 18640 Amalgamating businesses structure + validations + etc (bcgov#587)

* - app version = 5.6.6
- worked on amalgamating businesses data/types
- renamed some enums
- fixed table key
- added more BusinessTable logic (including foreign jurisdiction)
- updated static (test) data
- updated some imports in unit tests

* - misc fixes

* 18640 More amalgamating business table work (bcgov#589)

* - app version = 5.6.7

* - changed break to return in App.vue
- always import CorpTypeCd from corp-type-module (never enums)
- added some TING business rules
- removed status from static data

* - more table logic
- more test data cleanup

* wip

* wip

* - deleted unneeded getters, etc
- added Business Table Summary

* wip

* wip

* 18535 Amalgamating Businesses Part 1 Continuation (bcgov#588)

* Refactored saveAmalgamatingBusiness + specified what to search for

* Setup AmalgamatingBusinesses validity

* fixed unit tests

* cleanup

* Populate the table using the business lookup

* Fixed in response to Sev's comments

* Small cleanup in response to Sev's comment

* updated package version

* 18535 - Save and Resume Draft Amalgamation (bcgov#592)

* Save and resume draft amalgamation

* Properly initialize array if continuing a draft

* updated package version

* 18538 Resulting Business Name and Type component (WIP) (bcgov#591)

* PR (TODO fix unit tests)

* Added unit tests for numbered am

* Fixed test case and update from comments

* Added additional test case

* Updated unit test formatting.

* Updated package.json

* Added bullet points for numberd AML

* Fixed test cases

* 18640 Incremental amalgamating businesses validations, etc (bcgov#590)

* - app version = 5.6.10
- updated some validity calculations
- moved ting validations to a mixin
- generalized status computation
- updated regular amalgation validity

* - updated to use temp copy of array (instead of local copy)

* wip

---------

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* 18640 More amalgamating fetch / validations work (bcgov#593)

* - app version = 5.6.11
- imported latest BusinessLookup shared component
- updated fetchBusinessInfo return object
- simplified Amalg Businesses button and panel logic
- added Cancel button to Foreign panel
- added snackbar for save business errors
- deleted debugging template code

* - added fetch for business filings (for more validations)
- renamed AmalgamatingStatuses -> AmlStatuses
- added AmlTypes enum and replaced strings
- added some properties to TING business object (for more validations)
- added LegalServices.fetchFilings()
- misc updates

* - changed all to allSettled so I can get partial fetches
- fall back to lookup properties if some fetches fail (eg, not amalgamated)
- added empty table message
- temporarily start with empty (instead of pre-populated) table

* wip

* wip

* - logic cleanup

* - added proper check for limited restoration
- now fetch only first filing (to check for FED)
- fixed fetchFirstOrOnlyFiling() (for use with array response)

* - fixed unit test

---------

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* 18971 Finished some TODOs and incremental work on amalgamating business validations (bcgov#596)

* - app version = 5.6.12
- finished stepper validity code
- cleaned up some store code
- misc cleanup
- named and sorted rules

* - added spinner (experimental)

* wip

---------

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* 18960 - Re-fetch businesses information when loading draft (bcgov#594)

* Refactored the code + centralized fetch calls

* fixed lint errors

* Rebased + fixed rebase issues + fixed some of Sev's comments

* 18722 Add ForeignBusiness component for amalgamating businesses (bcgov#595)

* Add ForeignBusiness component

* Fix rebase issues

* Update nested select value

* Fix lint error

* Add spaces between tags

* Move foreign business component code to parent

* Wrap btn text in span

* Use common jurisdiction component

* 18971 Updated TING validations (bcgov#597)

* - app version = 5.6.13
- added dotted underline class that works for multiple lines
- cleaned up BusinessStatus and changed tooltip activator
- added tooltip text cases
- added validation rules and getters (still WIP)
- moved static businesses code from state-model to filing-template-mixin

* - on app start, display app name and version

---------

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* Update foreign company error messages (bcgov#599)

* 18788 Updated amalgamation -> amalgamationApplication + business name options (WIP) (bcgov#598)

* - app version = 5.6.14
- added ResultingBusinessName component
- misc refactor and new code to handle 3 options
- still WIP

* - changed snackbar close text to a white icon

* - added random key to BusinessLookup to reset its state between calls

* - replaced local EntityState with shared EntityStates
- added validation for isHistorical

* - ResultingBusinessName WIP !!!

* - updated imported enums, etc
- updated some enums locally (amalgamation -> amalgamationApplication)
- ResultingBusinessName is still WIP (so don't use it)

---------

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* 18546 - add Folio Number to Review and Confirm step (bcgov#601)

* 18546-add folio number component

* 18546-validaions for folio number and unit test

* 18546-step validations

* 18546-fix spacing and change getter name

* 18546-update comments

* 18546-remove unused getter

* 18546-update package version

* 18546-premium account, label changes

* 18546-premium account check for validation

* 18847-update certify text for amalgamations (bcgov#603)

* 18722 - Update foreign business validation rules (bcgov#602)

* Update mras corp number rules

* Add test code

* Fix foreign jurisdiction validations

* Corp Number only required if Mras

* Update validation on jurisdiction change

* Update isForeignBusinessValid

* Fix typo

* Use common Mras list

* Add comments to foreign business validation

* Update != to !==

* Update version to 5.6.17

* 18848 - add court order / POA component on review page (bcgov#604)

* 18848-add Court order on review page

* 18848-update package version

* - app version = 5.6.19 (bcgov#600)

- imported updated shared correct-name and mixins
- updated some validations
- updated misc whitespace
- added additional options to ResultingBusinessName.vue
- added additional option to NameRequestInfo.vue
- fixed numbered company suffix
- added conditional links to return to proper steps
- updated save/resume name options
- updated more validations
- temporarily skipped some unit tests
- misc cleanup

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* 19019 Add extra-pro A TING companies (bcgov#605)

* Add extra-pro TING companies

* Updated in response to Sev's comments

* updated package version after rebasing

* Fixed in response to Sev's comments

* fixed name

* removed unneeded comment

* extra empty line

* - app version = 5.6.21 (bcgov#606)

- added fallback for drafts created without Correct Name Option

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* - app version = 5.6.22 (bcgov#607)

- updated base class to remove border radius (per UI designs)
- added message box to step 5

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* - app version = 5.6.23 (bcgov#610)

- fixed amalgamation information title

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* - app version = 5.6.24 (bcgov#611)

- reordered sections so amalgamations don't use generic section

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* fix unit test (bcgov#612)

Merging without updating app version since it's only a unit test change.

* 18749 - add amalgamation statement to review (bcgov#609)

* ui parts

* able to store, valid, and update

* update version

* ui parts

* able to store, valid, and update

* able to save

* still working on adding test file, fix other comments

* package conflict

* add unit text file

* lint and version

* add comments

* JSDoc syntax

* Final Framework Changes/Fixes for Regular Amalgamation (bcgov#608)

* Added unit tests for amalgamation views + lots of misc. fixes and cleanup

* Added test line for review and confirm page

* More and more fixes + cleanup

* Added return to step for business summary table

* Fixed in response to Sev's comments

* updated comment

* Fixed Amalgamation Statement test after rebase + updated package version

* 18749 - fix bug in reopen draft amalgamation file (bcgov#613)

* update version

* add validation to mounted function

* update version

* - app version = 5.6.28 (bcgov#615)

- misc fixes
- added Business Status unit tests
- added Business Table unit tests
- added Business Table Summary unit tests

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* 18689 More Amalgamation fixes/updates (bcgov#614)

* Fixed Review and Confirm page validation

* Re-fetch business table data on file and pay

* updated package version

* removed debug code

* Fixed re-fetching issue

* add account id header (bcgov#616)

* Fixed bug with certify if submitting the amalgamation failed (bcgov#617)

* 18641 More unit tests (bcgov#618)

* - app version = 5.6.32
- added Amalgamation Mixin unit tests
- updated some status messages (per Yui)
- updated some rules (per Yui)
- added more Business Table unit tests (disabled until future)
- misc updates

* - added missing rule to list

---------

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* - app version = 5.6.33 (bcgov#619)

- do not save numbered name
- do not restore numbered name

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* - app version = 5.6.34 (bcgov#620)

- fixed check for future effective filing
- added missing filing statuses to enum

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* - app version = 5.6.35 (bcgov#621)

- added check for pending dissolution filing
- moved checks as new functions in mixin
- added business status (message) for pending dissolution
- added enum value
- updated state interface
- added new rule in mixin
- misc clean and missing code
- updated unit tests

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* 19050 Changed pending dissolution check to pending filing check (bcgov#622)

* - app version = 5.6.36
- changed pending dissolution check to pending filing check

* - updated tooltip message

* - another tooltip message update

* - changed companies from title case to lower case

---------

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* 19201+19275+19216 More Amalgamation Fixes (bcgov#623)

* Lots and lots of amalgamation fixes

* fixed rebase issue + updated package version

* added unit test for frozen rule

* fixed rebase issue

* Fixed in response to Sev's comments

* updated package version after rebase

* Amalgamation stepper fix (bcgov#624)

* Amalgamation stepper fix

* Fixed spacing more after discussion with Yui

* fixed icon size

* - app version = 5.6.39 (bcgov#625)

- disabled incorporator/organization code for amalgamations

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* 19179 Added Amalgamating Businesses unit tests (bcgov#626)

* - app version = 5.6.40
- added element ids
- updated LEAR business duplicate check
- added foreign business duplicate check
- misc cleanup
- added test suite (WIP)

* wip

---------

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* - app version = 5.6.41 (bcgov#627)

- added rest of unit tests

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* - app version = 5.6.42 (bcgov#629)

- added isDraftTask to Amalgamating Business interface
- added business status tooltip for Draft Task error
- added amalgamation enum value
- added new test to amalgamation rules
- added fetch of first task
- added helper function to amalgamation mixin
- updated / added unit tests
- minor cleanup

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* Bump vite from 4.3.9 to 4.5.2 (bcgov#631)

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 4.3.9 to 4.5.2.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v4.5.2/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v4.5.2/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* 19359 - Amalgamating Businesses Table must have more than 1 (bcgov#628)

* Fixed amalgamating business length to be more than 1

* Rebased + fixed Sev's comment + added unit tests

* Fixed lint issues

* removed unneeded nextTick in tests

* 19040 Framework for short-form amalgamations (bcgov#630)

* - app version = 5.7.0
- updated App header/title
- added short-form amalgamation re-routing
- added short-form amalgamation resource loading
- updated Steppersimplified
- added short-form amalgamation return links, etc
- added short-form amalgamation route names
- delete unneeded data in regular amalgamation resources
- added short-form amalgamation resources and steps
- broke up routes in sub-files
- added short-form amalgamation routes
- updated some store getters
- combined views for regular + short-form
- added conditionals in views for differences
- added some computeds to keep template simple
- updated unit tests
- fixed missing effective date validity check

* - deleted unused incorporation agreement type

* - added option for Primary (vs Holding) Company

* - fixed unit tests

---------

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* - app version = 5.7.1 (bcgov#634)

- don't show Add Person for short-form amalgamation
- set initial OfficeAddresses validity
- deleted unneeded data from amalg IF
- finished short amalg Office Addresses layout

Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>

* Implemented the Continuation In Framework (bcgov#633)

* Implemented the Continuation In Framework

* some fixes related to continuation in interfaces

* Rebased + fix rebase issues + fixed in response to comments

* Small fixes in response to Sev's comments

* Fixed typo

* updated package version

* major upgrade to package.json

---------

Signed-off-by: Hongjing Chen <Hongjing.Chen@gov.bc.ca>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Hongjing <60866283+chenhongjing@users.noreply.github.com>
Co-authored-by: Kevin Zhang <54437031+kzdev420@users.noreply.github.com>
Co-authored-by: Séverin Beauvais <severinbeauvais@users.noreply.github.com>
Co-authored-by: Shaoyun Tong <144159934+tshyun24@users.noreply.github.com>
Co-authored-by: jamespaologarcia <james.paolo.p.garcia@gmail.com>
Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>
Co-authored-by: leodube-aot <122323255+leodube-aot@users.noreply.github.com>
Co-authored-by: ketaki-deodhar <116035339+ketaki-deodhar@users.noreply.github.com>
Co-authored-by: Vysakh Menon <vysakh.menon@aot-technologies.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
JazzarKarim pushed a commit to JazzarKarim/business-create-ui that referenced this pull request Feb 23, 2024
* - app version = 5.6.6
- worked on amalgamating businesses data/types
- renamed some enums
- fixed table key
- added more BusinessTable logic (including foreign jurisdiction)
- updated static (test) data
- updated some imports in unit tests

* - misc fixes
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.

2 participants