Merge pull request #2135 from bcgov/hotfix/ALCS-2550

ALCS-2550: Reset router link from base instead of appending

Author: trslater

alcs-frontend/src/app/features/board/dialogs/application/application-dialog.component.ts

@@ -18,6 +18,7 @@ import { UserService } from '../../../../services/user/user.service';
 import { ApplicationSubmissionStatusPill } from '../../../../shared/application-submission-status-type-pill/application-submission-status-type-pill.component';
 import { ConfirmationDialogService } from '../../../../shared/confirmation-dialog/confirmation-dialog.service';
 import { CardDialogComponent } from '../card-dialog/card-dialog.component';
+import { APPLICATION_ROUTER_LINK_BASE } from '../../../../shared/constants';
 
 @Component({
   selector: 'app-detail-dialog',
@@ -31,7 +32,7 @@ export class ApplicationDialogComponent extends CardDialogComponent implements O
   application: ApplicationDto = this.data;
   status?: ApplicationSubmissionStatusPill;
 
-  routerLink = `application/`;
+  routerLink = '';
 
   constructor(
     @Inject(MAT_DIALOG_DATA) public data: ApplicationDto,
@@ -64,7 +65,7 @@ export class ApplicationDialogComponent extends CardDialogComponent implements O
 
   async populateApplicationSubmissionStatus(fileNumber: string) {
     let submissionStatus: ApplicationSubmissionToSubmissionStatusDto | null = null;
-    this.routerLink = this.routerLink + fileNumber;
+    this.routerLink = `${APPLICATION_ROUTER_LINK_BASE}/${fileNumber}`;
     try {
       submissionStatus = await this.applicationSubmissionStatusService.fetchCurrentStatusByFileNumber(
         fileNumber,
@@ -76,7 +77,7 @@ export class ApplicationDialogComponent extends CardDialogComponent implements O
 
     if (submissionStatus) {
       if (submissionStatus.statusTypeCode === SUBMISSION_STATUS.ALC_DECISION) {
-        this.routerLink = this.routerLink + '/decision'
+        this.routerLink = `${APPLICATION_ROUTER_LINK_BASE}/${fileNumber}/decision`;
       }
       this.status = {
         backgroundColor: submissionStatus.status.alcsBackgroundColor,

alcs-frontend/src/app/features/board/dialogs/notice-of-intent/notice-of-intent-dialog.component.ts

@@ -20,6 +20,7 @@ import { ApplicationSubmissionStatusPill } from '../../../../shared/application-
 import { RETROACTIVE_TYPE_LABEL } from '../../../../shared/application-type-pill/application-type-pill.constants';
 import { ConfirmationDialogService } from '../../../../shared/confirmation-dialog/confirmation-dialog.service';
 import { CardDialogComponent } from '../card-dialog/card-dialog.component';
+import { NOI_ROUTER_LINK_BASE } from '../../../../shared/constants';
 
 @Component({
   selector: 'app-notice-of-intent-dialog',
@@ -35,7 +36,7 @@ export class NoticeOfIntentDialogComponent extends CardDialogComponent implement
   noticeOfIntent: NoticeOfIntentDto = this.data;
   RETROACTIVE_TYPE = RETROACTIVE_TYPE_LABEL;
 
-  routerLink = `notice-of-intent/`;
+  routerLink = '';
 
   constructor(
     @Inject(MAT_DIALOG_DATA) public data: NoticeOfIntentDto,
@@ -78,7 +79,7 @@ export class NoticeOfIntentDialogComponent extends CardDialogComponent implement
 
   private async populateSubmissionStatus(fileNumber: string) {
     let submissionStatus: NoticeOfIntentSubmissionToSubmissionStatusDto | null = null;
-    this.routerLink = this.routerLink + fileNumber;
+    this.routerLink = `${NOI_ROUTER_LINK_BASE}/${fileNumber}`;
     try {
       submissionStatus = await this.noticeOfIntentSubmissionStatusService.fetchCurrentStatusByFileNumber(
         fileNumber,
@@ -89,7 +90,7 @@ export class NoticeOfIntentDialogComponent extends CardDialogComponent implement
     }
     if (submissionStatus) {
       if (submissionStatus.statusTypeCode === NOI_SUBMISSION_STATUS.ALC_DECISION) {
-        this.routerLink = this.routerLink + '/decision'
+        this.routerLink = `${NOI_ROUTER_LINK_BASE}/${fileNumber}/decision`;
       }
       this.status = {
         backgroundColor: submissionStatus.status.alcsBackgroundColor,

alcs-frontend/src/app/shared/constants.ts

@@ -1 +1,3 @@
 export const FILE_NAME_TRUNCATE_LENGTH = 30;
+export const APPLICATION_ROUTER_LINK_BASE = 'application';
+export const NOI_ROUTER_LINK_BASE = 'notice-of-intent';