diff --git a/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.html b/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.html index 383479fed..eda35a440 100644 --- a/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.html +++ b/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.html @@ -1,6 +1,7 @@ + diff --git a/projects/aca-content/src/lib/components/favorites/favorites.component.html b/projects/aca-content/src/lib/components/favorites/favorites.component.html index d2fbd1e54..4770e1d67 100644 --- a/projects/aca-content/src/lib/components/favorites/favorites.component.html +++ b/projects/aca-content/src/lib/components/favorites/favorites.component.html @@ -1,6 +1,7 @@ + diff --git a/projects/aca-content/src/lib/components/files/files.component.html b/projects/aca-content/src/lib/components/files/files.component.html index dfe848f09..2c1bedc83 100644 --- a/projects/aca-content/src/lib/components/files/files.component.html +++ b/projects/aca-content/src/lib/components/files/files.component.html @@ -1,6 +1,7 @@ + diff --git a/projects/aca-content/src/lib/components/libraries/libraries.component.html b/projects/aca-content/src/lib/components/libraries/libraries.component.html index d77967f44..0f7c0aa4f 100644 --- a/projects/aca-content/src/lib/components/libraries/libraries.component.html +++ b/projects/aca-content/src/lib/components/libraries/libraries.component.html @@ -1,6 +1,7 @@ + diff --git a/projects/aca-content/src/lib/components/recent-files/recent-files.component.html b/projects/aca-content/src/lib/components/recent-files/recent-files.component.html index 55d17fb25..4c95af8f2 100644 --- a/projects/aca-content/src/lib/components/recent-files/recent-files.component.html +++ b/projects/aca-content/src/lib/components/recent-files/recent-files.component.html @@ -1,6 +1,7 @@ + diff --git a/projects/aca-content/src/lib/components/search/search-input/search-input.component.html b/projects/aca-content/src/lib/components/search/search-input/search-input.component.html index 5e508e498..5dcfc4a2a 100644 --- a/projects/aca-content/src/lib/components/search/search-input/search-input.component.html +++ b/projects/aca-content/src/lib/components/search/search-input/search-input.component.html @@ -1,5 +1,4 @@ -
{ }); it('should change flag on library400Error event', async () => { - spyOn(searchInputService, 'isSearchRoute').and.returnValue(true); fixture.detectChanges(); await fixture.whenStable(); @@ -77,7 +76,6 @@ describe('SearchInputComponent', () => { }); it('should have library constraint on 400 error received', async () => { - spyOn(searchInputService, 'isSearchRoute').and.returnValue(true); fixture.detectChanges(); await fixture.whenStable(); @@ -212,7 +210,6 @@ describe('SearchInputComponent', () => { describe('exitSearch()', () => { it('should exit search on click of close icon', async () => { - spyOn(searchInputService, 'isSearchRoute').and.returnValue(true); spyOn(component, 'exitSearch').and.callThrough(); spyOn(searchInputService, 'navigateBack').and.callThrough(); diff --git a/projects/aca-content/src/lib/components/search/search-input/search-input.component.ts b/projects/aca-content/src/lib/components/search/search-input/search-input.component.ts index 652abd5a9..a94fc7e99 100644 --- a/projects/aca-content/src/lib/components/search/search-input/search-input.component.ts +++ b/projects/aca-content/src/lib/components/search/search-input/search-input.component.ts @@ -93,22 +93,20 @@ export class SearchInputComponent implements OnInit, OnDestroy { } ngOnInit() { - if (this.searchInputService.isSearchRoute()) { - this.showInputValue(); + this.showInputValue(); - this.router.events - .pipe(takeUntil(this.onDestroy$)) - .pipe(filter((e) => e instanceof RouterEvent)) - .subscribe((event) => { - if (event instanceof NavigationEnd) { - this.showInputValue(); - } - }); - - this.appHookService.library400Error.pipe(takeUntil(this.onDestroy$)).subscribe(() => { - this.has400LibraryError = true; + this.router.events + .pipe(takeUntil(this.onDestroy$)) + .pipe(filter((e) => e instanceof RouterEvent)) + .subscribe((event) => { + if (event instanceof NavigationEnd) { + this.showInputValue(); + } }); - } + + this.appHookService.library400Error.pipe(takeUntil(this.onDestroy$)).subscribe(() => { + this.has400LibraryError = true; + }); } exitSearch() { diff --git a/projects/aca-content/src/lib/components/search/search-navigation.service.ts b/projects/aca-content/src/lib/components/search/search-navigation.service.ts index ae1d45f3e..543fe2ce4 100644 --- a/projects/aca-content/src/lib/components/search/search-navigation.service.ts +++ b/projects/aca-content/src/lib/components/search/search-navigation.service.ts @@ -38,10 +38,6 @@ export class SearchNavigationService { constructor(private router: Router) {} - isSearchRoute(): boolean { - return this.router.url.includes('/search'); - } - saveRoute(route: string): void { this._previousRoute = route; } diff --git a/projects/aca-content/src/lib/components/shared-files/shared-files.component.html b/projects/aca-content/src/lib/components/shared-files/shared-files.component.html index 0bafecb5e..e5f2dbec2 100644 --- a/projects/aca-content/src/lib/components/shared-files/shared-files.component.html +++ b/projects/aca-content/src/lib/components/shared-files/shared-files.component.html @@ -1,6 +1,7 @@ + diff --git a/projects/aca-content/src/lib/components/trashcan/trashcan.component.html b/projects/aca-content/src/lib/components/trashcan/trashcan.component.html index 26b035988..a253fc328 100644 --- a/projects/aca-content/src/lib/components/trashcan/trashcan.component.html +++ b/projects/aca-content/src/lib/components/trashcan/trashcan.component.html @@ -1,6 +1,7 @@ +