diff --git a/frontend/src/components/LandingPage.vue b/frontend/src/components/LandingPage.vue index f443dbe1..20e55be0 100644 --- a/frontend/src/components/LandingPage.vue +++ b/frontend/src/components/LandingPage.vue @@ -95,7 +95,18 @@ @@ -222,6 +233,7 @@ export default { ...mapState('organization', ['organizationProviderType', 'organizationId', 'organizationName', 'organizationAccountNumber']), ...mapState('application', ['applicationType', 'programYearId', 'ccofApplicationStatus', 'unlockBaseFunding', 'unlockDeclaration', 'unlockEcewe', 'unlockLicenseUpload', 'unlockSupportingDocuments', 'applicationStatus']), + ...mapState('reportChanges', ['userProfileChangeRequests']), filteredNavBarList() { if (isChangeRequest(this)) { return this.navBarList.filter(el => el.changeRequestId === this.$route.params.changeRecGuid); @@ -344,6 +356,10 @@ export default { isCCOFApproved() { return (this.applicationType === 'RENEW') || (this.ccofStatus === this.CCOF_STATUS_APPROVED); }, + isUpdateChangeRequestDisplayed() { + let changeRequestStatuses = this.userProfileChangeRequests?.map(changeRequest => changeRequest.status); + return changeRequestStatuses?.includes("WITH_PROVIDER"); + } }, methods: { ...mapMutations('app', ['setIsRenewal']), @@ -355,6 +371,9 @@ export default { goToReportChange(){ this.$router.push(PATHS.ROOT.CHANGE_LANDING); }, + goToChangeRequestHistory() { + this.$router.push(PATHS.ROOT.CHANGE_LANDING + '#change-request-history'); + }, continueRenewal() { this.goToLicenseUpload(); }, diff --git a/frontend/src/components/requestChanges/ChangeFileUpload.vue b/frontend/src/components/requestChanges/ChangeFileUpload.vue index 16e2f01b..5a33bc4e 100644 --- a/frontend/src/components/requestChanges/ChangeFileUpload.vue +++ b/frontend/src/components/requestChanges/ChangeFileUpload.vue @@ -1,23 +1,11 @@ - - - + + + class="px-3 pt-4 text-body-1 red--text"> Please upload the Change Notification Form. - + - - @@ -141,6 +112,10 @@ export default { type: String, required: true }, + noDataDefaultText: { + type: String, + required: false + } }, data() { return { diff --git a/frontend/src/components/requestChanges/ChangeNotificationForm.vue b/frontend/src/components/requestChanges/ChangeNotificationForm.vue index 0dd1a96c..16083ba3 100644 --- a/frontend/src/components/requestChanges/ChangeNotificationForm.vue +++ b/frontend/src/components/requestChanges/ChangeNotificationForm.vue @@ -1,145 +1,82 @@