From cddb2a1fcfce327b45a5c20d9d07b7785ede98bc Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Tue, 14 Feb 2023 13:13:31 -0500 Subject: [PATCH] code cleanup after reviews --- .../search-input.component.spec.ts | 10 +++++----- .../search-input/search-input.component.ts | 6 +++--- ...c.ts => search-navigation.service.spec.ts} | 20 +++++++++---------- ...ervice.ts => search-navigation.service.ts} | 20 +++++++++++-------- .../navigation-menu.component.html | 2 +- .../navigation-menu.component.ts | 2 +- 6 files changed, 32 insertions(+), 28 deletions(-) rename projects/aca-content/src/lib/components/search/{search-input.service.spec.ts => search-navigation.service.spec.ts} (80%) rename projects/aca-content/src/lib/components/search/{search-input.service.ts => search-navigation.service.ts} (81%) diff --git a/projects/aca-content/src/lib/components/search/search-input/search-input.component.spec.ts b/projects/aca-content/src/lib/components/search/search-input/search-input.component.spec.ts index a1eab7b34..852ecd588 100644 --- a/projects/aca-content/src/lib/components/search/search-input/search-input.component.spec.ts +++ b/projects/aca-content/src/lib/components/search/search-input/search-input.component.spec.ts @@ -32,14 +32,14 @@ import { SearchByTermAction, SearchActionTypes, SnackbarErrorAction, SnackbarAct import { AppHookService } from '@alfresco/aca-shared'; import { map } from 'rxjs/operators'; import { SearchQueryBuilderService } from '@alfresco/adf-content-services'; -import { SearchInputService } from '../search-input.service'; +import { SearchNavigationService } from '../search-navigation.service'; describe('SearchInputComponent', () => { let fixture: ComponentFixture; let component: SearchInputComponent; let actions$: Actions; let appHookService: AppHookService; - let searchInputService: SearchInputService; + let searchInputService: SearchNavigationService; beforeEach(() => { TestBed.configureTestingModule({ @@ -52,7 +52,7 @@ describe('SearchInputComponent', () => { actions$ = TestBed.inject(Actions); fixture = TestBed.createComponent(SearchInputComponent); appHookService = TestBed.inject(AppHookService); - searchInputService = TestBed.inject(SearchInputService); + searchInputService = TestBed.inject(SearchNavigationService); component = fixture.componentInstance; }); @@ -234,7 +234,7 @@ describe('SearchInputComponent', () => { it('should exit search on click of close icon', async () => { spyOn(searchInputService, 'isSearchRoute').and.returnValue(true); spyOn(component, 'exitSearch').and.callThrough(); - spyOn(searchInputService, 'exitSearch').and.callThrough(); + spyOn(searchInputService, 'navigateBack').and.callThrough(); fixture.detectChanges(); await fixture.whenStable(); @@ -246,7 +246,7 @@ describe('SearchInputComponent', () => { await fixture.whenStable(); expect(component.exitSearch).toHaveBeenCalled(); - expect(searchInputService.exitSearch).toHaveBeenCalledWith(); + expect(searchInputService.navigateBack).toHaveBeenCalledWith(); }); }); }); 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 c136c70b4..cef16888f 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 @@ -34,7 +34,7 @@ import { Store } from '@ngrx/store'; import { Subject } from 'rxjs'; import { filter, takeUntil } from 'rxjs/operators'; import { SearchInputControlComponent } from '../search-input-control/search-input-control.component'; -import { SearchInputService } from '../search-input.service'; +import { SearchNavigationService } from '../search-navigation.service'; import { SearchLibrariesQueryBuilderService } from '../search-libraries-results/search-libraries-query-builder.service'; @Component({ @@ -87,7 +87,7 @@ export class SearchInputComponent implements OnInit, OnDestroy { private router: Router, private store: Store, private appHookService: AppHookService, - public searchInputService: SearchInputService + public searchInputService: SearchNavigationService ) { this.searchOnChange = this.config.get('search.aca:triggeredOnChange', true); } @@ -116,7 +116,7 @@ export class SearchInputComponent implements OnInit, OnDestroy { } exitSearch() { - this.searchInputService.exitSearch(); + this.searchInputService.navigateBack(); } showInputValue() { diff --git a/projects/aca-content/src/lib/components/search/search-input.service.spec.ts b/projects/aca-content/src/lib/components/search/search-navigation.service.spec.ts similarity index 80% rename from projects/aca-content/src/lib/components/search/search-input.service.spec.ts rename to projects/aca-content/src/lib/components/search/search-navigation.service.spec.ts index b1f27408b..1c7f211e1 100644 --- a/projects/aca-content/src/lib/components/search/search-input.service.spec.ts +++ b/projects/aca-content/src/lib/components/search/search-navigation.service.spec.ts @@ -26,35 +26,35 @@ import { TestBed } from '@angular/core/testing'; import { CoreModule } from '@alfresco/adf-core'; import { TranslateModule } from '@ngx-translate/core'; -import { SearchInputService } from './search-input.service'; +import { SearchNavigationService } from './search-navigation.service'; import { Router } from '@angular/router'; -describe('SearchInputService', () => { - let service: SearchInputService; +describe('SearchNavigationService', () => { + let service: SearchNavigationService; let router: Router; beforeEach(() => { TestBed.configureTestingModule({ imports: [TranslateModule.forRoot(), CoreModule.forRoot()] }); - service = TestBed.inject(SearchInputService); + service = TestBed.inject(SearchNavigationService); router = TestBed.inject(Router); }); it('should not navigate to saved route when exitSearch function is called if saved route is null', () => { const routerNavigate = spyOn(router, 'navigate'); - service.savedRoute = ''; - service.exitSearch(); + service.saveRoute(''); + service.navigateBack(); - expect(routerNavigate).not.toHaveBeenCalledWith([service.savedRoute]); + expect(routerNavigate).not.toHaveBeenCalledWith([service.previousRoute]); }); it('should navigate to saved route when exitSearch function is called', () => { const routerNavigate = spyOn(router, 'navigate'); - service.savedRoute = '/personal-files'; - service.exitSearch(); + service.saveRoute('/personal-files'); + service.navigateBack(); - expect(routerNavigate).toHaveBeenCalledWith([service.savedRoute]); + expect(routerNavigate).toHaveBeenCalledWith([service.previousRoute]); }); it('should navigate to Search when navigateToSearch function is called', () => { diff --git a/projects/aca-content/src/lib/components/search/search-input.service.ts b/projects/aca-content/src/lib/components/search/search-navigation.service.ts similarity index 81% rename from projects/aca-content/src/lib/components/search/search-input.service.ts rename to projects/aca-content/src/lib/components/search/search-navigation.service.ts index 0a8430605..ae1d45f3e 100644 --- a/projects/aca-content/src/lib/components/search/search-input.service.ts +++ b/projects/aca-content/src/lib/components/search/search-navigation.service.ts @@ -29,8 +29,12 @@ import { Router } from '@angular/router'; @Injectable({ providedIn: 'root' }) -export class SearchInputService { - savedRoute = ''; +export class SearchNavigationService { + private _previousRoute = ''; + + get previousRoute(): string { + return this._previousRoute; + } constructor(private router: Router) {} @@ -38,17 +42,17 @@ export class SearchInputService { return this.router.url.includes('/search'); } - saveRoute(route: string) { - this.savedRoute = route; + saveRoute(route: string): void { + this._previousRoute = route; } - exitSearch() { - if (this.savedRoute.length > 0) { - this.router.navigate([this.savedRoute]); + navigateBack(): void { + if (this.previousRoute) { + this.router.navigate([this.previousRoute]); } } - navigateToSearch() { + navigateToSearch(): void { this.saveRoute(this.router.url); this.router.navigate(['/search']); } diff --git a/projects/aca-content/src/lib/components/sidenav/navigation-menu/navigation-menu.component.html b/projects/aca-content/src/lib/components/sidenav/navigation-menu/navigation-menu.component.html index b5b2fd9b2..7bc78c4e5 100644 --- a/projects/aca-content/src/lib/components/sidenav/navigation-menu/navigation-menu.component.html +++ b/projects/aca-content/src/lib/components/sidenav/navigation-menu/navigation-menu.component.html @@ -2,7 +2,7 @@ apps -
+
account_circle {{ displayName }}
diff --git a/projects/aca-content/src/lib/components/sidenav/navigation-menu/navigation-menu.component.ts b/projects/aca-content/src/lib/components/sidenav/navigation-menu/navigation-menu.component.ts index 24b45a377..627405c2a 100644 --- a/projects/aca-content/src/lib/components/sidenav/navigation-menu/navigation-menu.component.ts +++ b/projects/aca-content/src/lib/components/sidenav/navigation-menu/navigation-menu.component.ts @@ -15,7 +15,7 @@ import { ContentApiService } from '@alfresco/aca-shared'; encapsulation: ViewEncapsulation.None }) export class NavigationMenuComponent implements OnInit { - displayName = 'Unknown user'; + displayName = ''; constructor(private contentApi: ContentApiService) {}