Bug/8162 (#1724)

bcgov · Jul 9, 2021 · ab47627 · ab47627
1 parent 3518ead
commit ab47627
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/auth-web/src/components/auth/staff/review-task/AccountInformation.vue b/auth-web/src/components/auth/staff/review-task/AccountInformation.vue
@@ -75,7 +75,7 @@ export default class AccountInformation extends Vue {
 
   @Prop({ default: 'Account Information' }) private title: string
   @Prop({ default: {} }) accountUnderReview: any
-  @Prop({ default: {} }) accountUnderReviewAddress: Address
+  @Prop({ default: null }) accountUnderReviewAddress: Address
 
   AccessType = AccessType
   Account = Account

diff --git a/auth-web/src/components/auth/staff/review-task/AccountStatus.vue b/auth-web/src/components/auth/staff/review-task/AccountStatus.vue
@@ -7,6 +7,12 @@
           >{{ statusLabel }}
           </v-col>
     </v-row>
+    <v-row v-if="isAccountOnHold">
+      <v-col class="col-12 col-sm-5 py-2">Reason</v-col>
+      <v-col class="py-2">
+          {{ accountOnHoldRemarks }}
+      </v-col>
+    </v-row>
     <v-row v-if="!isPendingReviewPage">
       <v-col class="col-12 col-sm-5 py-2">
         <span v-if="taskDetails.relationshipStatus === TaskRelationshipStatusEnum.ACTIVE">Approved By</span>
@@ -26,8 +32,8 @@
 
 <script lang="ts">
 import { Component, Prop, Vue } from 'vue-property-decorator'
+import { TaskRelationshipStatus, TaskStatus } from '@/util/constants'
 import { Task } from '@/models/Task'
-import { TaskRelationshipStatus } from '@/util/constants'
 import moment from 'moment'
 
 @Component({})
@@ -45,11 +51,21 @@ export default class AccountStatusTab extends Vue {
       case TaskRelationshipStatus.REJECTED:
         return 'Rejected'
       case TaskRelationshipStatus.PENDING_STAFF_REVIEW:
-        return 'Pending'
+        // Eg, If the task pertaining to the BCEID account review is on hold then we display the status as "on hold" else "pending"
+        return this.isAccountOnHold ? 'On Hold' : 'Pending'
       default:
         return ''
     }
   }
+
+  private get isAccountOnHold (): boolean {
+    return this.taskDetails.status === TaskStatus.HOLD
+  }
+
+  private get accountOnHoldRemarks (): string {
+    return this.taskDetails?.remarks
+  }
+
   private formatDate (date: Date): string {
     return moment(date).format('MMM DD, YYYY')
   }

diff --git a/auth-web/src/models/Task.ts b/auth-web/src/models/Task.ts
@@ -17,6 +17,7 @@ export interface Task {
     user?: number;
     dueDate?: Date;
     accountId?:number;
+    remarks?: string;
 }
 export interface TaskFilterParams {
     statuses?: string[];