diff --git a/package-lock.json b/package-lock.json index 426a27d59..7ceb77196 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "business-filings-ui", - "version": "6.9.1", + "version": "6.9.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "business-filings-ui", - "version": "6.9.1", + "version": "6.9.2", "dependencies": { "@babel/compat-data": "^7.21.5", "@bcrs-shared-components/base-address": "2.0.7", diff --git a/package.json b/package.json index 1c133191d..f64fc0957 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "business-filings-ui", - "version": "6.9.1", + "version": "6.9.2", "private": true, "appName": "Filings UI", "sbcName": "SBC Common Components", diff --git a/src/components/Dashboard/TodoList.vue b/src/components/Dashboard/TodoList.vue index b244538a6..7ceafe0fe 100644 --- a/src/components/Dashboard/TodoList.vue +++ b/src/components/Dashboard/TodoList.vue @@ -1677,8 +1677,7 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E case FilingNames.CHANGE_OF_ADDRESS: case FilingNames.CHANGE_OF_DIRECTORS: - if (this.isBenBcCccUlc) { - // To-Do for the future: Revisit this when we do Coop corrections in Edit UI + if (this.isBenBcCccUlc || this.isCoop) { navigateToCorrectionEditUi(this.getEditUrl, this.getIdentifier) break } else { @@ -1746,33 +1745,9 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E break } - case FilingTypes.RESTORATION: { - let restorationType: FilingSubTypes - - /** - * Type assertion is done to fix TypeScript error. - * "This condition will always return 'false' since the types - * 'FilingSubTypes' and 'RestorationTypes' have no overlap." - */ - if (item.filingSubType === FilingSubTypes.FULL_RESTORATION) { - restorationType = FilingSubTypes.FULL_RESTORATION - } - - if (item.filingSubType === FilingSubTypes.LIMITED_RESTORATION) { - restorationType = FilingSubTypes.LIMITED_RESTORATION - } - - if (item.filingSubType === FilingSubTypes.LIMITED_RESTORATION_EXTENSION) { - restorationType = FilingSubTypes.LIMITED_RESTORATION_EXTENSION - } - - if (item.filingSubType === FilingSubTypes.LIMITED_RESTORATION_TO_FULL) { - restorationType = FilingSubTypes.LIMITED_RESTORATION_TO_FULL - } - - navigate(this.buildRestorationUrl(item, restorationType)) + case FilingTypes.RESTORATION: + this.navigateForResumeRestoration(item) break - } default: // eslint-disable-next-line no-console @@ -1795,6 +1770,33 @@ export default class TodoList extends Mixins(AllowableActionsMixin, DateMixin, E } } + /* Handles the restoration flow inside of doResumeFiling */ + navigateForResumeRestoration (item: TodoItemIF): void { + let restorationType: FilingSubTypes + /** + * Type assertion is done to fix TypeScript error. + * "This condition will always return 'false' since the types + * 'FilingSubTypes' and 'RestorationTypes' have no overlap." + */ + if (item.filingSubType === FilingSubTypes.FULL_RESTORATION) { + restorationType = FilingSubTypes.FULL_RESTORATION + } + + if (item.filingSubType === FilingSubTypes.LIMITED_RESTORATION) { + restorationType = FilingSubTypes.LIMITED_RESTORATION + } + + if (item.filingSubType === FilingSubTypes.LIMITED_RESTORATION_EXTENSION) { + restorationType = FilingSubTypes.LIMITED_RESTORATION_EXTENSION + } + + if (item.filingSubType === FilingSubTypes.LIMITED_RESTORATION_TO_FULL) { + restorationType = FilingSubTypes.LIMITED_RESTORATION_TO_FULL + } + + navigate(this.buildRestorationUrl(item, restorationType)) + } + // navigate to Create UI if Full/Limited restoration or to Edit UI if Limited extension/Full to Limited conversion buildRestorationUrl (item: TodoItemIF, restorationType: FilingSubTypes): string { let url: string