Skip to content

Commit

Permalink
21976 Added cont in legal types to misc logic (bcgov#578)
Browse files Browse the repository at this point in the history
* - app version = 4.10.2
- imported latest corp type module
- renamed isXXX -> isEntityXXX
- added missing C/CBEN/CCC/CUL getters
- added new legal types to misc logic
- updated unit tests
- WIP

* - renamed computed/prop isBenefit -> isBenefitCompany for consistency
- added new entity types to PeopleAndRoles.vue
- added new entity types to ChangeBusinessType.vue
- fixed some bugs in ChangeBusinessType.vue
- improved an interface
- added new entity types to filing-template-mixin.ts
- added typing to misc resource files
- renamed resource files from XXXResource -> ResourceXXX
- added resource files for alterations, corrections and restorations (x2)
- removed unneeded store getters
- added new entity types to Alteration.vue
- added new entity types to LimitedRestorationExtension.vue
- added new entity types to LimitedRestorationToFull.vue
- added new entity types to CorpCorrection.vue
- updated unit tests

---------

Co-authored-by: Severin Beauvais <[email protected]>
  • Loading branch information
severinbeauvais and Severin Beauvais authored Jul 2, 2024
1 parent 97def4b commit 95e6d8b
Show file tree
Hide file tree
Showing 108 changed files with 1,123 additions and 496 deletions.
27 changes: 6 additions & 21 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "business-edit-ui",
"version": "4.10.1",
"version": "4.10.2",
"private": true,
"appName": "Edit UI",
"sbcName": "SBC Common Components",
Expand All @@ -23,7 +23,7 @@
"@bcrs-shared-components/completing-party": "2.1.30",
"@bcrs-shared-components/confirm-dialog": "1.2.1",
"@bcrs-shared-components/contact-info": "1.2.5",
"@bcrs-shared-components/corp-type-module": "1.0.11",
"@bcrs-shared-components/corp-type-module": "1.0.16",
"@bcrs-shared-components/court-order-poa": "2.1.3",
"@bcrs-shared-components/date-picker": "1.2.5",
"@bcrs-shared-components/detail-comment": "1.1.3",
Expand Down
4 changes: 2 additions & 2 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ export default class App extends Mixins(CommonMixin, FilingTemplateMixin) {
confirm: ConfirmDialogType
}
// Global getters
// Store getters
@Getter(useStore) getAppValidate!: boolean
@Getter(useStore) getComponentValidate!: boolean
@Getter(useStore) getCurrentJsDate!: Date
Expand All @@ -187,7 +187,7 @@ export default class App extends Mixins(CommonMixin, FilingTemplateMixin) {
@Getter(useStore) isSummaryMode!: boolean
@Getter(useStore) showFeeSummary!: boolean
// Global actions
// Store actions
@Action(useStore) setAccountInformation!: (x: AccountInformationIF) => void
@Action(useStore) setAppValidate!: (x: boolean) => void
@Action(useStore) setBusinessId!: (x: string) => void
Expand Down
4 changes: 2 additions & 2 deletions src/components/Alteration/AlterationSummary.vue
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ import { useStore } from '@/store/store'
}
})
export default class AlterationSummary extends Mixins(DateMixin, FeeMixin, FilingTemplateMixin) {
// Global getters
// Store getters
@Getter(useStore) getBusinessNumber!: string
@Getter(useStore) getCurrentFees!: FeesIF[]
@Getter(useStore) getFlagsReviewCertify!: FlagsReviewCertifyIF
Expand All @@ -198,7 +198,7 @@ export default class AlterationSummary extends Mixins(DateMixin, FeeMixin, Filin
@Getter(useStore) haveNewResolutionDates!: boolean
@Getter(useStore) isBusySaving!: boolean
// Global actions
// Store actions
@Action(useStore) setEffectiveDateValid!: (x: boolean) => void
/** Whether to perform validation. */
Expand Down
4 changes: 2 additions & 2 deletions src/components/Alteration/Articles/Articles.vue
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export default class Articles extends Mixins(CommonMixin) {
private isEditingCompanyProvisions = false
private isAddingResolutionDate = false
// Global getters
// Store getters
@Getter(useStore) getBusinessInformation!: BusinessInformationIF
@Getter(useStore) getNewResolutionDates!: string[]
@Getter(useStore) areProvisionsRemoved!: boolean
Expand All @@ -68,7 +68,7 @@ export default class Articles extends Mixins(CommonMixin) {
@Getter(useStore) getComponentValidate!: boolean
@Getter(useStore) isAlterationFiling!: boolean
// Global actions
// Store actions
@Action(useStore) setProvisionsRemoved!: (x: boolean) => void
@Action(useStore) setNewResolutionDates!: (x: string[]) => void
@Action(useStore) setValidComponent!: (x: ActionKvIF) => void
Expand Down
2 changes: 1 addition & 1 deletion src/components/Alteration/Articles/ResolutionDates.vue
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ export default class ResolutionDates extends Mixins(CommonMixin, DateMixin) {
/** Boolean indicating rights or restrictions in ShareStructure. */
@Prop({ default: false }) readonly hasRightsOrRestrictions!: boolean
// Global getters
// Store getters
@Getter(useStore) getBusinessFoundingDateTime!: string
@Getter(useStore) getCurrentDate!: string
@Getter(useStore) haveNewResolutionDates!: boolean
Expand Down
4 changes: 2 additions & 2 deletions src/components/Alteration/BcRegEntityDetails.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div>
<template v-if="isBenefit">
<template v-if="isBenefitCompany">
<div class="my-6">
<p class="subtitle">
{{ updatedArticleTitle }}
Expand Down Expand Up @@ -240,7 +240,7 @@ import { ResourceUtilities } from '@/utils'
})
export default class BcRegEntityDetails extends Vue {
@Prop({ default: false }) readonly confirmArticles!: boolean
@Prop({ default: false }) readonly isBenefit!: boolean
@Prop({ default: false }) readonly isBenefitCompany!: boolean
@Prop({ default: false }) readonly isUnlimitedLiability!: boolean
@Prop({ default: false }) readonly isCommunityContribution!: boolean
@Prop({ default: false }) readonly isBcLimited!: boolean
Expand Down
1 change: 0 additions & 1 deletion src/components/Alteration/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
export * from './Articles'
export { default as AlterationSummary } from './AlterationSummary.vue'
export { default as BcRegEntityDetails } from './BcRegEntityDetails.vue'
export { default as HelpSectionToggle } from './HelpSectionToggle.vue'
3 changes: 3 additions & 0 deletions src/components/Alteration/summary/BusinessType.vue
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ import { ResourceUtilities } from '@/utils/resource-utils'
export default class BusinessType extends Mixins(FilingTemplateMixin) {
readonly GetCorpFullDescription = GetCorpFullDescription // for template
// Store getters
// @Getter(useStore) getOriginalLegalType!: CorpTypeCd
get articleInfo (): string {
return ResourceUtilities.articleInfo(this.getEntityType)
}
Expand Down
6 changes: 3 additions & 3 deletions src/components/Change/ChangeSummary.vue
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
cols="12"
sm="3"
>
<label>{{ isSoleProp ? 'Proprietor' : 'Partner' }} Information</label>
<label>{{ isEntitySoleProp ? 'Proprietor' : 'Partner' }} Information</label>
</v-col>
</v-row>
<v-row
Expand Down Expand Up @@ -125,7 +125,7 @@ import { useStore } from '@/store/store'
}
})
export default class ChangeSummary extends Vue {
// Global getters
// Store getters
@Getter(useStore) getBusinessNumber!: string
@Getter(useStore) getCurrentNaics!: NaicsIF
@Getter(useStore) getNameRequestLegalName!: string
Expand All @@ -134,7 +134,7 @@ export default class ChangeSummary extends Vue {
@Getter(useStore) hasNaicsChanged!: boolean
@Getter(useStore) haveOfficeAddressesChanged!: boolean
@Getter(useStore) havePeopleAndRolesChanged!: boolean
@Getter(useStore) isSoleProp!: boolean
@Getter(useStore) isEntitySoleProp!: boolean
/** Whether to perform validation. */
@Prop() readonly validate!: boolean
Expand Down
8 changes: 4 additions & 4 deletions src/components/Conversion/ConversionSummary.vue
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
cols="12"
sm="3"
>
<label>{{ isSoleProp ? 'Proprietor' : 'Partner' }} Information</label>
<label>{{ isEntitySoleProp ? 'Proprietor' : 'Partner' }} Information</label>
</v-col>
</v-row>
<v-row
Expand Down Expand Up @@ -95,12 +95,12 @@ import { useStore } from '@/store/store'
}
})
export default class ConversionSummary extends Vue {
// Global getters
// Store getters
@Getter(useStore) getCurrentNaics!: NaicsIF
@Getter(useStore) hasNaicsChanged!: boolean
@Getter(useStore) haveOfficeAddressesChanged!: boolean
@Getter(useStore) havePeopleAndRolesChanged!: boolean
@Getter(useStore) getCurrentNaics!: NaicsIF
@Getter(useStore) isSoleProp!: boolean
@Getter(useStore) isEntitySoleProp!: boolean
/** Whether to perform validation. */
@Prop() readonly validate!: boolean
Expand Down
2 changes: 1 addition & 1 deletion src/components/Restoration/RestorationSummary.vue
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ import { useStore } from '@/store/store'
}
})
export default class RestorationSummary extends Mixins(DateMixin, FeeMixin, FilingTemplateMixin) {
// Global getters
// Store getters
@Getter(useStore) getBusinessNumber!: string
@Getter(useStore) getCurrentFees!: FeesIF[]
// @Getter(useStore) getNameRequestLegalName!: string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ import { useStore } from '@/store/store'
}
})
export default class SpecialResolutionSummary extends Mixins(DateMixin, FeeMixin, FilingTemplateMixin) {
// Global getters
// Store getters
@Getter(useStore) getBusinessNumber!: string
@Getter(useStore) getCurrentFees!: FeesIF[]
// @Getter(useStore) getNameRequestLegalName!: string
Expand Down
4 changes: 2 additions & 2 deletions src/components/ViewWrapper.vue
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export default class ViewWrapper extends Mixins(CommonMixin, FilingTemplateMixin
confirm: ConfirmDialogType
}
// Global getters
// Store getters
// @Getter(useStore) getCurrentJsDate!: Date
@Getter(useStore) getAppValidate!: boolean
@Getter(useStore) getComponentValidate!: boolean
Expand All @@ -117,7 +117,7 @@ export default class ViewWrapper extends Mixins(CommonMixin, FilingTemplateMixin
@Getter(useStore) isSpecialResolutionFiling!: boolean
@Getter(useStore) showFeeSummary!: boolean
// Global actions
// Store actions
@Action(useStore) setAppValidate!: (x: boolean) => void
@Action(useStore) setComponentValidate!: (x: boolean) => void
@Action(useStore) setHaveUnsavedChanges!: (x: boolean) => void
Expand Down
4 changes: 2 additions & 2 deletions src/components/common/Actions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ import { useStore } from '@/store/store'
/** This component is only implemented for Correction filings atm. */
@Component({})
export default class Actions extends Mixins(DateMixin, FilingTemplateMixin, NameRequestMixin) {
// Global getters
// Store getters
@Getter(useStore) getFilingId!: number
// @Getter(useStore) getNameRequestNumber!: string
@Getter(useStore) hasAlterationDataChanged!: boolean // for testing state-getters
Expand All @@ -85,7 +85,7 @@ export default class Actions extends Mixins(DateMixin, FilingTemplateMixin, Name
@Getter(useStore) isSaving!: boolean
@Getter(useStore) isSavingResuming!: boolean
// Global actions
// Store actions
@Action(useStore) setIsSaving!: (x: boolean) => void
@Action(useStore) setIsSavingResuming!: (x: boolean) => void
@Action(useStore) setIsFilingPaying!: (x: boolean) => void
Expand Down
4 changes: 2 additions & 2 deletions src/components/common/DocumentsDelivery.vue
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ import { useStore } from '@/store/store'
@Component({})
export default class DocumentsDelivery extends Mixins(CommonMixin) {
// Global getters
// Store getters
@Getter(useStore) getUserEmail!: string
@Getter(useStore) getBusinessContact!: ContactPointIF
@Getter(useStore) isRoleStaff!: boolean
Expand All @@ -102,7 +102,7 @@ export default class DocumentsDelivery extends Mixins(CommonMixin) {
@Getter(useStore) getFilingName!: FilingNames
@Getter(useStore) getResource!: ResourceIF
// Global actions
// Store actions
@Action(useStore) setDocumentOptionalEmail!: (x: string) => void
@Action(useStore) setDocumentOptionalEmailValidity!: (x: boolean) => void
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/EntityInfo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ import { useStore } from '@/store/store'
@Component({})
export default class EntityInfo extends Mixins(CommonMixin) {
// Global getters
// Store getters
@Getter(useStore) getBusinessId!: string
@Getter(useStore) getBusinessInformation!: BusinessInformationIF
@Getter(useStore) getOriginalLegalType!: CorpTypeCd
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/PeopleAndRoles/CurrentDirectors.vue
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ export default class CurrentDirectors extends Mixins(CommonMixin) {
readonly RoleTypes = RoleTypes
readonly IsSame = IsSame
// Global getters
// Store getters
@Getter(useStore) getOrgPeople!: OrgPersonIF[]
/** Headers for the person table. */
Expand Down
4 changes: 2 additions & 2 deletions src/components/common/PeopleAndRoles/ListPeopleAndRoles.vue
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ export default class ListPeopleAndRoles extends Mixins(CommonMixin, OrgPersonMix
@Getter(useStore) getOrgPeople!: OrgPersonIF[]
@Getter(useStore) hideChangeButtonForSoleProps!: boolean
@Getter(useStore) isAlterationFiling!: boolean
@Getter(useStore) isBenBcCccUlcCorrectionFiling!: boolean
@Getter(useStore) isBaseCorrectionFiling!: boolean
@Getter(useStore) isCoopCorrectionFiling!: boolean
@Getter(useStore) isCorrectionFiling!: boolean
@Getter(useStore) isFirmChangeFiling!: boolean
Expand Down Expand Up @@ -628,7 +628,7 @@ export default class ListPeopleAndRoles extends Mixins(CommonMixin, OrgPersonMix
if (this.isFirmConversionFiling) {
return true
}
if (this.isBenBcCccUlcCorrectionFiling) {
if (this.isBaseCorrectionFiling) {
return true
}
if (this.isCoopCorrectionFiling) {
Expand Down
Loading

0 comments on commit 95e6d8b

Please sign in to comment.