[DURACOM-234] Fix merge

This commit is contained in:
Giuseppe Digilio
2024-03-20 12:15:22 +01:00
parent b214bb386a
commit bef71a99b4

View File

@@ -12,6 +12,7 @@ import {
import { FormsModule } from '@angular/forms'; import { FormsModule } from '@angular/forms';
import { import {
EventType, EventType,
NavigationEnd,
Router, Router,
RouterLink, RouterLink,
RouterLinkActive, RouterLinkActive,
@@ -129,7 +130,7 @@ export class ComcolPageBrowseByComponent implements OnDestroy, OnInit {
this.router.events.pipe( this.router.events.pipe(
startWith(this.router), startWith(this.router),
filter((next: Router|Scroll) => (isNotEmpty((next as Router)?.url) || (next as Scroll)?.type === EventType.Scroll)), filter((next: Router|Scroll) => (isNotEmpty((next as Router)?.url) || (next as Scroll)?.type === EventType.Scroll)),
map((next: Router|Scroll) => (next as Router)?.url || (next as Scroll).routerEvent.urlAfterRedirects), map((next: Router|Scroll) => (next as Router)?.url || ((next as Scroll).routerEvent as NavigationEnd).urlAfterRedirects),
distinctUntilChanged(), distinctUntilChanged(),
), ),
]).subscribe(([navOptions, url]: [ComColPageNavOption[], string]) => { ]).subscribe(([navOptions, url]: [ComColPageNavOption[], string]) => {