Skip to content

Commit

Permalink
- separated Name Translation from Name Request Info (#512)
Browse files Browse the repository at this point in the history
- ported Business Name from Edit UI component
- copied CorrectXXX from Edit UI
- removed obsolete code from Restoration Business Name
- deleted some local enums
- imported some shared enums
- cleaned up dissolution types
- created/fixed/expanded unit tests
- misc cleanup
- app version = 4.5.17
  • Loading branch information
severinbeauvais authored Feb 10, 2023
1 parent faa3eb3 commit 531f63e
Show file tree
Hide file tree
Showing 44 changed files with 1,847 additions and 1,024 deletions.
302 changes: 160 additions & 142 deletions package-lock.json

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "business-create-ui",
"version": "4.5.16",
"version": "4.5.17",
"private": true,
"appName": "Create UI",
"sbcName": "SBC Common Components",
Expand All @@ -13,26 +13,26 @@
},
"dependencies": {
"@babel/compat-data": "^7.19.1",
"@bcrs-shared-components/breadcrumb": "2.1.6",
"@bcrs-shared-components/business-lookup": "1.1.8",
"@bcrs-shared-components/certify": "2.1.6",
"@bcrs-shared-components/completing-party": "2.1.6",
"@bcrs-shared-components/breadcrumb": "2.1.9",
"@bcrs-shared-components/business-lookup": "1.1.11",
"@bcrs-shared-components/certify": "2.1.9",
"@bcrs-shared-components/completing-party": "2.1.9",
"@bcrs-shared-components/confirm-dialog": "1.2.1",
"@bcrs-shared-components/contact-info": "1.2.6",
"@bcrs-shared-components/contact-info": "1.2.9",
"@bcrs-shared-components/corp-type-module": "1.0.9",
"@bcrs-shared-components/court-order-poa": "3.0.2",
"@bcrs-shared-components/date-picker": "1.2.6",
"@bcrs-shared-components/court-order-poa": "3.0.5",
"@bcrs-shared-components/date-picker": "1.2.9",
"@bcrs-shared-components/document-delivery": "1.2.0",
"@bcrs-shared-components/effective-date-time": "1.1.6",
"@bcrs-shared-components/enums": "1.0.28",
"@bcrs-shared-components/effective-date-time": "1.1.9",
"@bcrs-shared-components/enums": "1.0.31",
"@bcrs-shared-components/help-business-number": "1.1.1",
"@bcrs-shared-components/interfaces": "1.0.49",
"@bcrs-shared-components/nature-of-business": "1.2.3",
"@bcrs-shared-components/staff-comments": "1.3.6",
"@bcrs-shared-components/staff-payment": "2.1.6",
"@bcrs-shared-components/web-chat": "2.1.1",
"@bcrs-shared-components/relationships-panel": "1.0.0",
"@bcrs-shared-components/interfaces": "1.0.52",
"@bcrs-shared-components/limited-restoration-panel": "1.0.0",
"@bcrs-shared-components/nature-of-business": "1.2.8",
"@bcrs-shared-components/relationships-panel": "1.0.5",
"@bcrs-shared-components/staff-comments": "1.3.9",
"@bcrs-shared-components/staff-payment": "2.1.9",
"@bcrs-shared-components/web-chat": "2.1.1",
"@mdi/font": "^5.9.55",
"@sentry/browser": "^5.30.0",
"@sentry/integrations": "^5.30.0",
Expand Down
33 changes: 19 additions & 14 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,9 @@
<header>
<h1>{{ getFilingName }}</h1>
</header>
<p class="mt-4" v-if="getFilingSubtitle">
{{ getFilingSubtitle }}
<p class="mt-4" v-if="isFirmDissolution">
Confirm the following information, select the dissolution date and certify
your dissolution before filing.
</p>

<Stepper class="mt-10" v-if="isStepperView" />
Expand Down Expand Up @@ -144,7 +145,7 @@
<SbcFeeSummary
:filingData="feeFilingData"
:payURL="payApiUrl"
:filingLabel="filingLabelText"
:filingLabel="filingLabel"
/>
</affix>
</aside>
Expand Down Expand Up @@ -242,7 +243,6 @@ export default class App extends Vue {
@Getter isIncorporationFiling!: boolean
@Getter getSteps!: Array<StepIF>
@Getter isSbcStaff!: boolean
@Getter getFilingSubtitle!: string
@Getter getUserFirstName!: string
@Getter getUserLastName!: string
@Getter getUserPhone!: string
Expand Down Expand Up @@ -391,10 +391,15 @@ export default class App extends Vue {
)
}
/** The Fee Summary filing text for businesses. */
get filingLabelText (): string {
/** Whether the current filing is a firm dissolution. */
get isFirmDissolution (): boolean {
return (this.isTypeFirm && this.isDissolutionFiling)
}
/** The fee summary filing label. */
get filingLabel (): string {
// text override for firm dissolutions
return (this.isTypeFirm && this.isDissolutionFiling) ? 'Dissolution' : null
return this.isFirmDissolution ? 'Dissolution' : null
}
/** The About text. */
Expand All @@ -408,11 +413,11 @@ export default class App extends Vue {
case FilingTypes.INCORPORATION_APPLICATION: return 'Application'
case FilingTypes.REGISTRATION: return 'Registration'
case FilingTypes.RESTORATION: return 'Restoration'
case FilingTypes.VOLUNTARY_DISSOLUTION: return 'Filing'
case FilingTypes.DISSOLUTION: return 'Filing'
}
}
// check to use stepper view or not
/** Whether to use stepper view. */
get isStepperView (): boolean {
return !this.$route.meta.noStepper
}
Expand Down Expand Up @@ -671,7 +676,7 @@ export default class App extends Vue {
// then try to re-route them
if (this.$route.meta.filingType !== this.getFilingType) {
switch (this.getFilingType) {
case FilingTypes.VOLUNTARY_DISSOLUTION:
case FilingTypes.DISSOLUTION:
if (this.isTypeFirm) {
this.$router.push(RouteNames.DISSOLUTION_FIRM).catch(() => {})
} else {
Expand All @@ -689,7 +694,7 @@ export default class App extends Vue {
return
default:
this.invalidRouteDialog = true
throw new Error(`Invalid filing type = ${this.getFilingType}`) // go to catch()
throw new Error(`fetchData(): invalid filing type = ${this.getFilingType}`) // go to catch()
}
}
Expand Down Expand Up @@ -755,7 +760,7 @@ export default class App extends Vue {
// parse draft filing into the store and get the resources
let resources: ResourceIF
switch (this.getFilingType) {
case FilingTypes.VOLUNTARY_DISSOLUTION:
case FilingTypes.DISSOLUTION:
draftFiling = {
...this.buildDissolutionFiling(),
...draftFiling
Expand All @@ -772,7 +777,7 @@ export default class App extends Vue {
resources = RestorationResources.find(x => x.entityType === this.getEntityType)
break
default:
throw new Error(`Invalid filing type = ${this.getFilingType}`)
throw new Error(`handleDissolutionOrRestoration(): invalid filing type = ${this.getFilingType}`)
}
// set the resources
Expand Down Expand Up @@ -819,7 +824,7 @@ export default class App extends Vue {
resources = RegistrationResources.find(x => x.entityType === this.getEntityType)
break
default:
throw new Error(`Invalid filing type = ${this.getFilingType}`)
throw new Error(`handleIaOrRegistration(): invalid filing type = ${this.getFilingType}`)
}
// set the resources
Expand Down
4 changes: 3 additions & 1 deletion src/components/Dissolution/CareAndCustodySelect.vue
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,14 @@ import { RoleTypes } from '@/enums'
export default class CareAndCustodySelect extends Vue {
@Prop({ default: false }) readonly showErrorSummary!: boolean
// for template
readonly RoleTypes = RoleTypes
// local variable
protected liquidatorOrCustodian = null as RoleTypes
protected changeCareAndCustodyType (): void {
// Todo: Apply option to store when required
// FUTURE: save `liquidatorOrCustodian` to store when required
}
}
</script>
Expand Down
6 changes: 2 additions & 4 deletions src/components/Incorporation/UploadMemorandum.vue
Original file line number Diff line number Diff line change
Expand Up @@ -414,10 +414,8 @@ export default class UploadMemorandum extends Vue {
<style lang="scss" scoped>
@import '@/assets/styles/theme.scss';
header {
p {
padding-top: 0.5rem;
}
header p {
padding-top: 0.5rem;
}
ul {
Expand Down
6 changes: 2 additions & 4 deletions src/components/Incorporation/UploadRules.vue
Original file line number Diff line number Diff line change
Expand Up @@ -372,10 +372,8 @@ export default class UploadRules extends Vue {
<style lang="scss" scoped>
@import '@/assets/styles/theme.scss';
header {
p {
padding-top: 0.5rem;
}
header p {
padding-top: 0.5rem;
}
ul {
Expand Down
Loading

0 comments on commit 531f63e

Please sign in to comment.