19750 and 19805 - fixed error handling + fixed party index bug #657
Conversation
- fixed error handling bug (missing await) - removed unneeded code in buildAmalgamationFiling() - updated some comments
severinbeauvais
requested review from
jamespaologarcia,
ketaki-deodhar and
PaulGarewal
| @@ -567,7 +567,7 @@ export default class AmalgamatingBusinesses extends Mixins(AmalgamationMixin, Co | |||
|
|
|||
| // fetch the new holding/primary business' data and update the prepopulated data | |||
| // this will overwrite office addresses, directors, share structure and contact info | |||
| this.updatePrepopulatedData(business, true) | |||
| await this.updatePrepopulatedData(business, true) | |||
There was a problem hiding this comment.
Without this, the code continued to line 576.
Instead, we needed to wait for updatePrepopulatedData() to finish and possibly throw an error that would be caught by line 571.
| @@ -144,8 +144,7 @@ export default class FilingTemplateMixin extends Mixins(AmalgamationMixin, DateM | |||
| amalgamatingBusinesses: this.getAmalgamatingBusinesses, | |||
| type: this.getAmalgamationType, | |||
| nameRequest: { | |||
| legalType: this.getEntityType, | |||
| correctNameOption: this.getCorrectNameOption | |||
There was a problem hiding this comment.
Not needed as it's (re)set on lines 178+ below.
This is a the "decoy" anti-pattern: it looks like it's doing something but it's really not.
There was a problem hiding this comment.
Go to ⚙️ icon above and check "Hide whitespace" to see what I did here more clearly.
| @@ -76,146 +76,148 @@ | |||
| </v-row> | |||
|
|
|||
| <!-- List Content --> | |||
| <v-row | |||
| v-for="(orgPerson, index1) in filteredPersonList" | |||
There was a problem hiding this comment.
First, I moved the v-for into its own element (since can't have v-for and v-if in same element).
Second, I added v-if to conditionally show directors. This way, the v-for still iterates over the whole list and index1 is retained, and the actions act on the correct list item.
There was a problem hiding this comment.
Example of short-form amalgamation (completing party only):
Example of regular amalgamation (completing party is also a director):
|
/gcbrun |
|
Temporary Url for review: https://business-create-dev--pr-657-or2ets8j.web.app SB says, try these:
Compare the above with the full list of People and Roles on the Review page. You'll see that the completing party is not always index[0] but editing it works correctly in all cases. |
severinbeauvais
changed the title
* - app version = 5.9.2 - fixed error handling bug (missing await) - removed unneeded code in buildAmalgamationFiling() - updated some comments * - refactored ListPeopleAndRoles to retain original index for actions --------- Co-authored-by: Severin Beauvais <severin.beauvais@gov.bc.ca>
Issue #: bcgov/entity#19750 and bcgov/entity#19805
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).