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.

Sign up for GitHub

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

Jump to bottom

14670 Added ledger component for restoration extension filings #468

Merged
merged 2 commits into from
Mar 23, 2023
Merged

14670 Added ledger component for restoration extension filings #468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0ae65e
- app version = 5.11.6
severinbeauvais Mar 7, 2023
84f6f1e
- moved Entity Info header to new component
severinbeauvais Mar 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 22 additions & 34 deletions package-lock.json
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "business-filings-ui",
"version": "5.11.5",
"version": "5.11.6",
"private": true,
"appName": "Filings UI",
"sbcName": "SBC Common Components",
Expand All @@ -18,7 +18,7 @@
"@babel/compat-data": "^7.19.1",
"@bcrs-shared-components/breadcrumb": "2.1.11",
"@bcrs-shared-components/confirm-dialog": "1.2.1",
"@bcrs-shared-components/corp-type-module": "1.0.9",
"@bcrs-shared-components/corp-type-module": "1.0.11",
"@bcrs-shared-components/court-order-poa": "2.1.4",
"@bcrs-shared-components/enums": "1.0.37",
"@bcrs-shared-components/interfaces": "1.0.54",
Expand All @@ -45,7 +45,7 @@
"vue-router": "^3.6.5",
"vue2-filters": "^0.14.0",
"vuelidate": "^0.7.7",
"vuetify": "^2.6.10",
"vuetify": "^2.6.14",
"vuex": "^3.6.2",
"webpack-remove-serviceworker-plugin": "^1.0.0"
},
Expand Down
5 changes: 2 additions & 3 deletions src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ import {
Routes
} from '@/enums'
import { SessionStorageKeys } from 'sbc-common-components/src/util/constants'
import { GetCorpNumberedDescription } from '@bcrs-shared-components/corp-type-module'

export default {
name: 'App',
Expand Down Expand Up @@ -201,7 +200,7 @@ export default {
'getAuthApiUrl',
'getBusinessUrl',
'getCreateUrl',
'getLegalName',
'getEntityName',
'getLegalType',
'getIdentifier',
'getRegHomeUrl',
Expand Down Expand Up @@ -256,7 +255,7 @@ export default {
const breadcrumbs = this.$route?.meta?.breadcrumb
const crumbs: Array<BreadcrumbIF> = [
{
text: this.getLegalName || GetCorpNumberedDescription(this.getLegalType),
text: this.getEntityName || 'Unknown Name',
to: { name: Routes.DASHBOARD }
},
...(breadcrumbs || [])
Expand Down
64 changes: 47 additions & 17 deletions src/components/Dashboard/FilingHistoryList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,15 @@
<!-- or a completed Dissolution? -->
<!-- or a completed Registration? -->
<!-- or a Limited Restoration? -->
<div v-else-if="filing.isCompletedIa || filing.isCompletedAlteration || filing.isCompletedDissolution ||
filing.isCompletedRegistration || filing.isTypeLimitedRestoration" class="item-header__subtitle"
<!-- or a Limited Restoration Extension? -->
<div
v-else-if="filing.isCompletedIa ||
filing.isCompletedAlteration ||
filing.isCompletedDissolution ||
filing.isCompletedRegistration ||
filing.isTypeLimitedRestoration ||
filing.isTypeLimitedRestorationExtension"
class="item-header__subtitle"
>
<span>FILED AND PAID <FiledLabel :filing="filing" /></span>
<v-btn
Expand All @@ -106,8 +113,11 @@
<!-- is this a FE IA pending (overdue)? -->
<!-- or a FE Alteration pending (overdue)? -->
<!-- or a FE Dissolution pending (overdue)? -->
<div v-else-if="filing.isFutureEffectiveIaPending || filing.isFutureEffectiveAlterationPending ||
filing.isFutureEffectiveDissolutionPending" class="item-header__subtitle"
<div
v-else-if="filing.isFutureEffectiveIaPending ||
filing.isFutureEffectiveAlterationPending ||
filing.isFutureEffectiveDissolutionPending"
class="item-header__subtitle"
>
<span class="orange--text text--darken-2">FILED AND PENDING</span>
<span class="vert-pipe" />
Expand All @@ -127,8 +137,11 @@
<!-- is this a FE IA still waiting for effective date/time? -->
<!-- is this a FE Alteration still waiting for effective date/time? -->
<!-- is this a FE Dissolution still waiting for effective date/time? -->
<div v-else-if="filing.isFutureEffectiveIa || filing.isFutureEffectiveAlteration ||
filing.isFutureEffectiveDissolution" class="item-header__subtitle"
<div
v-else-if="filing.isFutureEffectiveIa ||
filing.isFutureEffectiveAlteration ||
filing.isFutureEffectiveDissolution"
class="item-header__subtitle"
>
<span v-if="filing.isFutureEffectiveIa">FUTURE EFFECTIVE INCORPORATION</span>
<span v-if="filing.isFutureEffectiveAlteration">FUTURE EFFECTIVE ALTERATION</span>
Expand Down Expand Up @@ -287,17 +300,21 @@
<!-- is this a FE IA pending (overdue)? -->
<!-- or a FE Alteration pending (overdue)? -->
<!-- or a FE Dissolution pending (overdue)? -->
<template v-else-if="filing.isFutureEffectiveIaPending || filing.isFutureEffectiveAlterationPending ||
filing.isFutureEffectiveDissolutionPending"
<template
v-else-if="filing.isFutureEffectiveIaPending ||
filing.isFutureEffectiveAlterationPending ||
filing.isFutureEffectiveDissolutionPending"
>
<FutureEffectivePending :filing=filing class="mt-6" />
</template>

<!-- is this a FE IA still waiting for effective date/time? -->
<!-- or a FE Alteration still waiting for effective date/time? -->
<!-- or a FE Dissolution still waiting for effective date/time? -->
<template v-else-if="filing.isFutureEffectiveIa || filing.isFutureEffectiveAlteration ||
filing.isFutureEffectiveDissolution"
<template
v-else-if="filing.isFutureEffectiveIa ||
filing.isFutureEffectiveAlteration ||
filing.isFutureEffectiveDissolution"
>
<FutureEffective :filing=filing class="mt-6" />
</template>
Expand All @@ -306,6 +323,10 @@
<LimitedRestorationFiling :filing="filing" class="mt-6" />
</template>

<template v-else-if="filing.isTypeLimitedRestorationExtension">
<LimitedRestorationExtensionFiling :filing="filing" class="mt-6" />
</template>

<!-- is this a generic paid (not yet completed) filing? -->
<template v-else-if="EnumUtilities.isStatusPaid(filing)">
<PendingFiling :filing=filing class="mt-6" />
Expand Down Expand Up @@ -381,6 +402,13 @@ import Vue from 'vue'
import { Component, Prop, Watch } from 'vue-property-decorator'
import { Action, Getter } from 'vuex-class'
import { navigate } from '@/utils'
import { AddCommentDialog, DownloadErrorDialog, FileCorrectionDialog, LoadCorrectionDialog }
from '@/components/dialogs'
import { AllowableActions, FilingTypes, Routes, CorrectionTypes } from '@/enums'
import { ActionBindingIF, ApiFilingIF, CorrectionFilingIF, DocumentIF, HistoryItemIF, LegalFilingIF }
from '@/interfaces'
import { AllowableActionsMixin, DateMixin, FilingMixin } from '@/mixins'
import { EnumUtilities, LegalServices } from '@/services/'
import CompletedAlteration from './FilingHistoryList/CompletedAlteration.vue'
import CompletedDissolution from './FilingHistoryList/CompletedDissolution.vue'
import CompletedIa from './FilingHistoryList/CompletedIa.vue'
Expand All @@ -390,16 +418,11 @@ import DocumentsList from './FilingHistoryList/DocumentsList.vue'
import FiledLabel from './FilingHistoryList/FiledLabel.vue'
import FutureEffective from './FilingHistoryList/FutureEffective.vue'
import FutureEffectivePending from './FilingHistoryList/FutureEffectivePending.vue'
import LimitedRestorationFiling from '@/components/Dashboard/FilingHistoryList/LimitedRestorationFiling.vue'
import LimitedRestorationFiling from './FilingHistoryList/LimitedRestorationFiling.vue'
import LimitedRestorationExtensionFiling from './FilingHistoryList/LimitedRestorationExtensionFiling.vue'
severinbeauvais marked this conversation as resolved.
Show resolved Hide resolved
import PaperFiling from './FilingHistoryList/PaperFiling.vue'
import PendingFiling from './FilingHistoryList/PendingFiling.vue'
import StaffFiling from './FilingHistoryList/StaffFiling.vue'
import { AddCommentDialog, DownloadErrorDialog, FileCorrectionDialog, LoadCorrectionDialog } from '@/components/dialogs'
import { AllowableActions, FilingTypes, Routes, CorrectionTypes } from '@/enums'
import { ActionBindingIF, ApiFilingIF, CorrectionFilingIF, DocumentIF, HistoryItemIF, LegalFilingIF }
from '@/interfaces'
import { AllowableActionsMixin, DateMixin, FilingMixin } from '@/mixins'
import { EnumUtilities, LegalServices } from '@/services/'

@Component({
components: {
Expand All @@ -414,6 +437,7 @@ import { EnumUtilities, LegalServices } from '@/services/'
FutureEffective,
FutureEffectivePending,
LimitedRestorationFiling,
LimitedRestorationExtensionFiling,
PaperFiling,
PendingFiling,
StaffFiling,
Expand Down Expand Up @@ -686,6 +710,12 @@ export default class FilingHistoryList extends Vue {
item.expiry = filing.data.restoration?.expiry
}

// add properties for limited restoration extensions
if (EnumUtilities.isTypeRestorationExtension(filing)) {
item.isTypeLimitedRestorationExtension = true
item.expiry = filing.data.restoration?.expiry
}

Comment on lines +713 to +718
Copy link
Contributor

Choose a reason for hiding this comment

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

Would it be possible to add these attributes inside the LimitedRestorationExtension filing history component?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes but this is Phase 1 of this work -- using the existing architecture. In my next PR, I will change things over so this code is in individual filing sub-components.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Are you OK with leaving this until Phase 2 of this work (next PR)?

this.historyItems.push(item)
} catch (error) {
// eslint-disable-next-line no-console
Expand Down
2 changes: 1 addition & 1 deletion src/components/Dashboard/FilingHistoryList/CompletedRegistration.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="completed-ia-details body-2">
<h4>Registration Complete</h4>

<p>{{getLegalName}} has been successfully registered.</p>
<p>{{getLegalName || 'This company'}} has been successfully registered.</p>

<p>Return to My Business Registry to access your business and file changes.</p>

Expand Down
6 changes: 3 additions & 3 deletions src/components/Dashboard/FilingHistoryList/DocumentsList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,17 @@ export default class DocumentsList extends Vue {
@Prop({ default: false }) readonly loadingAll!: boolean

/** The index of the currently-downloading doc. */
@Prop({ default: -1 }) readonly loadingOneIndex!: boolean
@Prop({ default: -1 }) readonly loadingOneIndex!: number

/** Emits an event to download the subject document. */
@Emit('downloadOne')
// eslint-disable-next-line @typescript-eslint/no-unused-vars
protected downloadOne (document: DocumentIF, index: number): void {}
downloadOne (document: DocumentIF, index: number): void {}

/** Emits an event to download all documents. */
@Emit('downloadAll')
// eslint-disable-next-line @typescript-eslint/no-unused-vars
protected downloadAll (filing: any): void {}
downloadAll (filing: any): void {}
}
</script>

Expand Down
Loading