Skip to content

Commit eacade6

Browse files
authored
Merge pull request #2058 from bcgov/feature/ALCS-2426-update-nav-on-searches
ALCS-2426 Added navigation according to status on search
2 parents 0e65c1e + 14345d6 commit eacade6

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

alcs-frontend/src/app/features/search/application-search-table/application-search-table.component.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,10 @@ export class ApplicationSearchTableComponent {
7171
}
7272

7373
onSelectRecord(record: SearchResult) {
74+
const decisionUrl = record.status?.label === 'Decision Released' ? '/decision' : '';
7475
const url = this.isCommissioner
7576
? this.router.serializeUrl(this.router.createUrlTree([`/commissioner/application/${record.referenceId}`]))
76-
: this.router.serializeUrl(this.router.createUrlTree([`/application/${record.referenceId}`]));
77+
: this.router.serializeUrl(this.router.createUrlTree([`/application/${record.referenceId}${decisionUrl}`]));
7778

7879
window.open(url, '_blank');
7980
}

alcs-frontend/src/app/features/search/notice-of-intent-search-table/notice-of-intent-search-table.component.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ export class NoticeOfIntentSearchTableComponent {
7979
}
8080

8181
onSelectRecord(record: SearchResult) {
82-
const url = this.router.serializeUrl(this.router.createUrlTree([`/notice-of-intent/${record.referenceId}`]));
82+
const decisionUrl = record.status?.label === 'Decision Released' ? '/decision' : '';
83+
const url = this.router.serializeUrl(this.router.createUrlTree([`/notice-of-intent/${record.referenceId}${decisionUrl}`]));
8384

8485
window.open(url, '_blank');
8586
}

alcs-frontend/src/app/shared/header/search-bar/search-bar.component.ts

+12-2
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,22 @@ export class SearchBarComponent implements AfterViewInit, OnInit {
112112
const result = searchResult[0];
113113
switch (result.type) {
114114
case 'APP':
115+
const appStatusResult = await this.searchService.advancedSearchApplicationStatusFetch([result.fileNumber]);
116+
let appDecisionUrl = '';
117+
if (appStatusResult && appStatusResult.length > 0 && appStatusResult[0].status === 'ALCD') {
118+
appDecisionUrl = '/decision'
119+
}
115120
this.isCommissioner
116121
? await this.router.navigate(['commissioner/application', result.referenceId])
117-
: await this.router.navigate(['application', result.referenceId]);
122+
: await this.router.navigate([`application/${result.referenceId}${appDecisionUrl}`]);
118123
break;
119124
case 'NOI':
120-
await this.router.navigate(['notice-of-intent', result.referenceId]);
125+
const noiStatusResult = await this.searchService.advancedSearchNoiStatusFetch([result.fileNumber]);
126+
let noiDecisionUrl = '';
127+
if (noiStatusResult && noiStatusResult.length > 0 && noiStatusResult[0].status === 'ALCD') {
128+
noiDecisionUrl = '/decision'
129+
}
130+
await this.router.navigate([`notice-of-intent/${result.referenceId}${noiDecisionUrl}`]);
121131
break;
122132
case 'NOTI':
123133
await this.router.navigate(['notification', result.referenceId]);

0 commit comments

Comments
 (0)