Skip to content

Commit 6306776

Browse files
committed
Simplify code detecting a navigation to the default route
1 parent 531d328 commit 6306776

1 file changed

Lines changed: 4 additions & 10 deletions

File tree

src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -145,20 +145,14 @@ export class ComcolPageBrowseByComponent implements OnDestroy, OnInit {
145145
),
146146
]).subscribe(([navOptions, url]: [ComColPageNavOption[], string]) => {
147147
for (const option of navOptions) {
148-
if (option.routerLink === url?.split('?')[0]) {
148+
if (url?.split('?')[0].endsWith(`/${this.id}`)) {
149+
const option = navOptions.find(o => o.id === this.appConfig[this.contentType].defaultBrowseTab);
150+
void this.router.navigate([option.routerLink], { queryParams: option.params });
151+
} else if (option.routerLink === url?.split('?')[0]) {
149152
this.currentOption$.next(option);
150153
}
151154
}
152155
}));
153-
154-
this.allOptions$.pipe(
155-
take(1),
156-
).subscribe((allOptions: ComColPageNavOption[]) => {
157-
if (!allOptions.find(o => o.routerLink === this.router.url?.split('?')[0])) {
158-
const option = allOptions.find(o => o.id === this.appConfig[this.contentType].defaultBrowseTab);
159-
void this.router.navigate([option.routerLink], { queryParams: option.params });
160-
}
161-
});
162156
}
163157

164158
ngOnDestroy(): void {

0 commit comments

Comments
 (0)