This commit is contained in:
Denys Vuika
2023-03-01 18:08:01 +00:00
committed by Sheena Malhotra
parent 5c288261d4
commit a6efbc3a3e
11 changed files with 20 additions and 23 deletions

View File

@@ -1,6 +1,7 @@
<aca-page-layout> <aca-page-layout>
<aca-page-layout-header> <aca-page-layout-header>
<adf-breadcrumb root="APP.BROWSE.LIBRARIES.MENU.FAVORITE_LIBRARIES.TITLE"> </adf-breadcrumb> <adf-breadcrumb root="APP.BROWSE.LIBRARIES.MENU.FAVORITE_LIBRARIES.TITLE"> </adf-breadcrumb>
<adf-toolbar class="adf-toolbar--inline"> <adf-toolbar class="adf-toolbar--inline">
<ng-container *ngFor="let entry of actions; trackBy: trackByActionId"> <ng-container *ngFor="let entry of actions; trackBy: trackByActionId">
<aca-toolbar-action [actionRef]="entry"></aca-toolbar-action> <aca-toolbar-action [actionRef]="entry"></aca-toolbar-action>

View File

@@ -1,6 +1,7 @@
<aca-page-layout> <aca-page-layout>
<aca-page-layout-header> <aca-page-layout-header>
<adf-breadcrumb root="APP.BROWSE.FAVORITES.TITLE"> </adf-breadcrumb> <adf-breadcrumb root="APP.BROWSE.FAVORITES.TITLE"> </adf-breadcrumb>
<adf-toolbar class="adf-toolbar--inline"> <adf-toolbar class="adf-toolbar--inline">
<ng-container *ngFor="let entry of actions; trackBy: trackByActionId"> <ng-container *ngFor="let entry of actions; trackBy: trackByActionId">
<aca-toolbar-action [actionRef]="entry"></aca-toolbar-action> <aca-toolbar-action [actionRef]="entry"></aca-toolbar-action>

View File

@@ -1,6 +1,7 @@
<aca-page-layout [hasError]="!isValidPath"> <aca-page-layout [hasError]="!isValidPath">
<aca-page-layout-header> <aca-page-layout-header>
<adf-breadcrumb [root]="title" [folderNode]="node" [maxItems]="isSmallScreen ? 1 : 0" (navigate)="onBreadcrumbNavigate($event)"> </adf-breadcrumb> <adf-breadcrumb [root]="title" [folderNode]="node" [maxItems]="isSmallScreen ? 1 : 0" (navigate)="onBreadcrumbNavigate($event)"> </adf-breadcrumb>
<adf-toolbar class="adf-toolbar--inline"> <adf-toolbar class="adf-toolbar--inline">
<ng-container *ngFor="let entry of actions; trackBy: trackByActionId"> <ng-container *ngFor="let entry of actions; trackBy: trackByActionId">
<aca-toolbar-action [actionRef]="entry"></aca-toolbar-action> <aca-toolbar-action [actionRef]="entry"></aca-toolbar-action>

View File

@@ -1,6 +1,7 @@
<aca-page-layout> <aca-page-layout>
<aca-page-layout-header> <aca-page-layout-header>
<adf-breadcrumb root="APP.BROWSE.LIBRARIES.MENU.MY_LIBRARIES.TITLE"> </adf-breadcrumb> <adf-breadcrumb root="APP.BROWSE.LIBRARIES.MENU.MY_LIBRARIES.TITLE"> </adf-breadcrumb>
<adf-toolbar class="adf-toolbar--inline"> <adf-toolbar class="adf-toolbar--inline">
<ng-container *ngFor="let entry of actions; trackBy: trackByActionId"> <ng-container *ngFor="let entry of actions; trackBy: trackByActionId">
<aca-toolbar-action [actionRef]="entry"></aca-toolbar-action> <aca-toolbar-action [actionRef]="entry"></aca-toolbar-action>

View File

@@ -1,6 +1,7 @@
<aca-page-layout> <aca-page-layout>
<aca-page-layout-header> <aca-page-layout-header>
<adf-breadcrumb root="APP.BROWSE.RECENT.TITLE"> </adf-breadcrumb> <adf-breadcrumb root="APP.BROWSE.RECENT.TITLE"> </adf-breadcrumb>
<adf-toolbar class="adf-toolbar--inline"> <adf-toolbar class="adf-toolbar--inline">
<ng-container *ngFor="let entry of actions; trackBy: trackByActionId"> <ng-container *ngFor="let entry of actions; trackBy: trackByActionId">
<aca-toolbar-action [actionRef]="entry"></aca-toolbar-action> <aca-toolbar-action [actionRef]="entry"></aca-toolbar-action>

View File

@@ -1,5 +1,4 @@
<div *ngIf="searchInputService.isSearchRoute()" <div class="app-search-container searchMenuTrigger"
class="app-search-container searchMenuTrigger"
[matMenuTriggerFor]="searchOptionsMenu" [matMenuTriggerFor]="searchOptionsMenu"
(menuOpened)="onMenuOpened()" (menuOpened)="onMenuOpened()"
(menuClosed)="syncInputValues()" (menuClosed)="syncInputValues()"

View File

@@ -61,7 +61,6 @@ describe('SearchInputComponent', () => {
}); });
it('should change flag on library400Error event', async () => { it('should change flag on library400Error event', async () => {
spyOn(searchInputService, 'isSearchRoute').and.returnValue(true);
fixture.detectChanges(); fixture.detectChanges();
await fixture.whenStable(); await fixture.whenStable();
@@ -77,7 +76,6 @@ describe('SearchInputComponent', () => {
}); });
it('should have library constraint on 400 error received', async () => { it('should have library constraint on 400 error received', async () => {
spyOn(searchInputService, 'isSearchRoute').and.returnValue(true);
fixture.detectChanges(); fixture.detectChanges();
await fixture.whenStable(); await fixture.whenStable();
@@ -212,7 +210,6 @@ describe('SearchInputComponent', () => {
describe('exitSearch()', () => { describe('exitSearch()', () => {
it('should exit search on click of close icon', async () => { it('should exit search on click of close icon', async () => {
spyOn(searchInputService, 'isSearchRoute').and.returnValue(true);
spyOn(component, 'exitSearch').and.callThrough(); spyOn(component, 'exitSearch').and.callThrough();
spyOn(searchInputService, 'navigateBack').and.callThrough(); spyOn(searchInputService, 'navigateBack').and.callThrough();

View File

@@ -93,7 +93,6 @@ export class SearchInputComponent implements OnInit, OnDestroy {
} }
ngOnInit() { ngOnInit() {
if (this.searchInputService.isSearchRoute()) {
this.showInputValue(); this.showInputValue();
this.router.events this.router.events
@@ -109,7 +108,6 @@ export class SearchInputComponent implements OnInit, OnDestroy {
this.has400LibraryError = true; this.has400LibraryError = true;
}); });
} }
}
exitSearch() { exitSearch() {
this.searchInputService.navigateBack(); this.searchInputService.navigateBack();

View File

@@ -38,10 +38,6 @@ export class SearchNavigationService {
constructor(private router: Router) {} constructor(private router: Router) {}
isSearchRoute(): boolean {
return this.router.url.includes('/search');
}
saveRoute(route: string): void { saveRoute(route: string): void {
this._previousRoute = route; this._previousRoute = route;
} }

View File

@@ -1,6 +1,7 @@
<aca-page-layout> <aca-page-layout>
<aca-page-layout-header> <aca-page-layout-header>
<adf-breadcrumb root="APP.BROWSE.SHARED.TITLE"></adf-breadcrumb> <adf-breadcrumb root="APP.BROWSE.SHARED.TITLE"></adf-breadcrumb>
<adf-toolbar class="adf-toolbar--inline"> <adf-toolbar class="adf-toolbar--inline">
<ng-container *ngFor="let entry of actions; trackBy: trackByActionId"> <ng-container *ngFor="let entry of actions; trackBy: trackByActionId">
<aca-toolbar-action [actionRef]="entry"></aca-toolbar-action> <aca-toolbar-action [actionRef]="entry"></aca-toolbar-action>

View File

@@ -1,6 +1,7 @@
<aca-page-layout> <aca-page-layout>
<aca-page-layout-header> <aca-page-layout-header>
<adf-breadcrumb root="APP.BROWSE.TRASHCAN.TITLE"> </adf-breadcrumb> <adf-breadcrumb root="APP.BROWSE.TRASHCAN.TITLE"> </adf-breadcrumb>
<adf-toolbar class="adf-toolbar--inline"> <adf-toolbar class="adf-toolbar--inline">
<ng-container *ngFor="let entry of actions; trackBy: trackByActionId"> <ng-container *ngFor="let entry of actions; trackBy: trackByActionId">
<aca-toolbar-action [actionRef]="entry"></aca-toolbar-action> <aca-toolbar-action [actionRef]="entry"></aca-toolbar-action>