inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2025-10-01 14:41:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

1
projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.html
View File

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

1
projects/aca-content/src/lib/components/favorites/favorites.component.html
View File

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

1
projects/aca-content/src/lib/components/files/files.component.html
View File

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

1
projects/aca-content/src/lib/components/libraries/libraries.component.html
View File

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

1
projects/aca-content/src/lib/components/recent-files/recent-files.component.html
View File

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

3
projects/aca-content/src/lib/components/search/search-input/search-input.component.html
View File

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

3
projects/aca-content/src/lib/components/search/search-input/search-input.component.spec.ts
View File

@@ -61,7 +61,6 @@ describe('SearchInputComponent', () => {
});
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();

26
projects/aca-content/src/lib/components/search/search-input/search-input.component.ts
View File

@@ -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() {

4
projects/aca-content/src/lib/components/search/search-navigation.service.ts
View File

@@ -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;
}

1
projects/aca-content/src/lib/components/shared-files/shared-files.component.html
View File

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

1
projects/aca-content/src/lib/components/trashcan/trashcan.component.html
View File

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