Merge pull request #924 from bcgov/feature/ALCS-1079

Bug Fixes
bcgov · Aug 30, 2023 · 4217fda · 4217fda
2 parents 29aaa7f + 3f81428
commit 4217fda
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.../decision/decision-v2/decision-input/decision-components/decision-components.component.ts b/.../decision/decision-v2/decision-input/decision-components/decision-components.component.ts
@@ -59,11 +59,10 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView
       if (application) {
         this.application = application;
         this.application.submittedApplication = await this.submissionService.fetchSubmission(application.fileNumber);
+        await this.prepareDecisionComponentTypes(this.codes);
       }
     });
 
-    this.prepareDecisionComponentTypes(this.codes);
-
     // validate components on load
     setTimeout(() => this.onChange(), 0);
   }

diff --git a/.../decision/decision-v2/decision-input/decision-components/decision-components.component.ts b/.../decision/decision-v2/decision-input/decision-components/decision-components.component.ts
@@ -68,11 +68,10 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView
         if (noticeOfIntent) {
           this.noticeOfIntent = noticeOfIntent;
           this.noticeOfIntentSubmission = await this.submissionService.fetchSubmission(noticeOfIntent.fileNumber);
+          await this.prepareDecisionComponentTypes(this.codes);
         }
       });
 
-    this.prepareDecisionComponentTypes(this.codes);
-
     // validate components on load
     setTimeout(() => this.onChange(), 0);
   }

diff --git a/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.ts b/services/apps/alcs/src/alcs/application/application-timeline/application-timeline.service.ts
@@ -207,6 +207,8 @@ export class ApplicationTimelineService {
         applicationUuid: application.uuid,
       },
       relations: {
+        type: true,
+        reviewOutcome: true,
         card: {
           subtasks: {
             type: true,
@@ -270,6 +272,7 @@ export class ApplicationTimelineService {
             type: true,
           },
         },
+        reviewOutcome: true,
       },
       order: {
         submittedDate: 'DESC',