diff --git a/projects/aca-content/src/lib/aca-content.module.ts b/projects/aca-content/src/lib/aca-content.module.ts index 7fa59ccc9..1604e84a3 100644 --- a/projects/aca-content/src/lib/aca-content.module.ts +++ b/projects/aca-content/src/lib/aca-content.module.ts @@ -66,7 +66,6 @@ import { AppLayoutModule } from './components/layout/layout.module'; import { AppSearchInputModule } from './components/search/search-input.module'; import { DocumentListCustomComponentsModule } from './components/dl-custom-components/document-list-custom-components.module'; import { AppSearchResultsModule } from './components/search/search-results.module'; -import { AppHeaderModule } from './components/header/header.module'; import { AppNodeVersionModule } from './components/node-version/node-version.module'; import { FavoritesComponent } from './components/favorites/favorites.component'; import { RecentFilesComponent } from './components/recent-files/recent-files.component'; @@ -164,7 +163,6 @@ registerLocaleData(localeSv); AppSearchInputModule, AppHeaderActionsModule, AppSearchResultsModule, - AppHeaderModule, AppNodeVersionModule, HammerModule, ViewProfileModule, @@ -207,8 +205,6 @@ export class ContentServiceExtensionModule { extensions.setComponents({ 'app.layout.main': ShellLayoutComponent, - // This allows providing custom application header, disabled for ACA the time being - // 'app.layout.header': AppHeaderComponent, 'app.layout.sidenav': SidenavComponent, 'app.shell.sibling': UploadFilesDialogComponent, 'app.components.tabs.metadata': MetadataTabComponent, diff --git a/projects/aca-content/src/lib/components/header/header.component.html b/projects/aca-content/src/lib/components/header/header.component.html deleted file mode 100644 index a0d9a0d84..000000000 --- a/projects/aca-content/src/lib/components/header/header.component.html +++ /dev/null @@ -1,18 +0,0 @@ - -
- - - - - - - - - diff --git a/projects/aca-content/src/lib/components/header/header.component.scss b/projects/aca-content/src/lib/components/header/header.component.scss deleted file mode 100644 index 9f7036af8..000000000 --- a/projects/aca-content/src/lib/components/header/header.component.scss +++ /dev/null @@ -1,17 +0,0 @@ -.app-header { - box-shadow: 0 3px 5px -1px rgba(0, 0, 0, 0.02), 0px 6px 10px 0px rgba(0, 0, 0, 0.014), 0px 1px 18px 0px rgba(0, 0, 0, 0.012); - z-index: 2; - - .mat-toolbar { - background-image: var(--header-background-image) !important; - background-repeat: no-repeat !important; - - .aca-current-user { - color: var(--theme-foreground-text-color) !important; - } - - .adf-toolbar-divider div { - background-color: var(--theme-foreground-text-color) !important; - } - } -} diff --git a/projects/aca-content/src/lib/components/header/header.component.spec.ts b/projects/aca-content/src/lib/components/header/header.component.spec.ts deleted file mode 100644 index a82fa17b3..000000000 --- a/projects/aca-content/src/lib/components/header/header.component.spec.ts +++ /dev/null @@ -1,92 +0,0 @@ -/*! - * @license - * Alfresco Example Content Application - * - * Copyright (C) 2005 - 2020 Alfresco Software Limited - * - * This file is part of the Alfresco Example Content Application. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * The Alfresco Example Content Application is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * The Alfresco Example Content Application is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - */ - -import { AppHeaderComponent } from './header.component'; -import { AppState } from '@alfresco/aca-shared/store'; -import { of } from 'rxjs'; -import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; -import { ContentActionRef } from '@alfresco/adf-extensions'; -import { Store } from '@ngrx/store'; -import { AppTestingModule } from '../../testing/app-testing.module'; -import { AppExtensionService, SharedToolbarModule } from '@alfresco/aca-shared'; -import { CoreModule } from '@alfresco/adf-core'; -import { AppSearchInputModule } from '../search/search-input.module'; - -describe('AppHeaderComponent', () => { - let component: AppHeaderComponent; - let fixture: ComponentFixture; - - const actions = [ - { id: 'action-1', type: 'button' }, - { id: 'action-2', type: 'button' } - ] as Array; - - const store = { - select: jasmine.createSpy('select'), - dispatch: () => {} - } as any; - - const appExtensionService = { - getHeaderActions: () => of(actions) - } as any; - - const app = { - appName: 'name', - logoPath: 'some/path' - } as AppState; - - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [AppTestingModule, CoreModule.forChild(), AppSearchInputModule, SharedToolbarModule], - declarations: [AppHeaderComponent], - providers: [ - { - provide: AppExtensionService, - useValue: appExtensionService - }, - { - provide: Store, - useValue: store - } - ] - }); - - store.select.and.callFake((memoizeFn) => of(memoizeFn({ app }))); - - fixture = TestBed.createComponent(AppHeaderComponent); - component = fixture.componentInstance; - }); - - it('should set header color, header text color, name and logo', fakeAsync(() => { - component.appName$.subscribe((val) => expect(val).toBe(app.appName)); - component.logo$.subscribe((val) => expect(val).toBe(app.logoPath)); - })); - - it('should get header actions', fakeAsync(() => { - component.ngOnInit(); - tick(); - expect(component.actions).toEqual(actions); - })); -}); diff --git a/projects/aca-content/src/lib/components/header/header.component.ts b/projects/aca-content/src/lib/components/header/header.component.ts deleted file mode 100644 index 63aa1f1ef..000000000 --- a/projects/aca-content/src/lib/components/header/header.component.ts +++ /dev/null @@ -1,95 +0,0 @@ -/*! - * @license - * Alfresco Example Content Application - * - * Copyright (C) 2005 - 2020 Alfresco Software Limited - * - * This file is part of the Alfresco Example Content Application. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * The Alfresco Example Content Application is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * The Alfresco Example Content Application is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - */ - -import { Component, ViewEncapsulation, Output, EventEmitter, OnInit, Input, OnDestroy } from '@angular/core'; -import { Store } from '@ngrx/store'; -import { Observable, Subject } from 'rxjs'; -import { ContentActionRef } from '@alfresco/adf-extensions'; -import { AppStore, getAppName, getLogoPath } from '@alfresco/aca-shared/store'; -import { AppExtensionService } from '@alfresco/aca-shared'; -import { takeUntil } from 'rxjs/operators'; -import { AppConfigService, SidenavLayoutComponent } from '@alfresco/adf-core'; -import { isContentServiceEnabled } from '@alfresco/aca-shared/rules'; - -/** @deprecated */ -@Component({ - selector: 'app-header', - templateUrl: './header.component.html', - styleUrls: ['./header.component.scss'], - encapsulation: ViewEncapsulation.None, - host: { class: 'app-header' } -}) -export class AppHeaderComponent implements OnInit, OnDestroy { - private onDestroy$: Subject = new Subject(); - - @Output() - toggleClicked = new EventEmitter(); - - @Input() expandedSidenav = true; - - @Input() data: { layout?: SidenavLayoutComponent; isMenuMinimized?: boolean } = {}; - - get isSidenavExpanded(): boolean { - return !this.data.isMenuMinimized ?? this.expandedSidenav; - } - - appName$: Observable; - logo$: Observable; - landingPage: string; - - actions: Array = []; - - constructor(public store: Store, private appExtensions: AppExtensionService, private appConfigService: AppConfigService) { - this.appName$ = store.select(getAppName); - this.logo$ = store.select(getLogoPath); - this.landingPage = this.appConfigService.get('landingPage', '/personal-files'); - } - - ngOnInit() { - this.appExtensions - .getHeaderActions() - .pipe(takeUntil(this.onDestroy$)) - .subscribe((actions) => { - this.actions = actions; - }); - } - - onToggleSidenav(_event: boolean): void { - this.data.layout.toggleMenu(); - } - - isContentServiceEnabled(): boolean { - return isContentServiceEnabled(); - } - - ngOnDestroy() { - this.onDestroy$.next(true); - this.onDestroy$.complete(); - } - - trackByActionId(_: number, action: ContentActionRef) { - return action.id; - } -} diff --git a/projects/aca-content/src/lib/components/header/header.module.ts b/projects/aca-content/src/lib/components/header/header.module.ts deleted file mode 100644 index 21381e4ff..000000000 --- a/projects/aca-content/src/lib/components/header/header.module.ts +++ /dev/null @@ -1,38 +0,0 @@ -/*! - * @license - * Alfresco Example Content Application - * - * Copyright (C) 2005 - 2020 Alfresco Software Limited - * - * This file is part of the Alfresco Example Content Application. - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - * The Alfresco Example Content Application is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * The Alfresco Example Content Application is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . - */ - -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { CoreModule } from '@alfresco/adf-core'; -import { AppHeaderComponent } from './header.component'; -import { AppSearchInputModule } from '../search/search-input.module'; -import { AppToolbarModule } from '../toolbar/toolbar.module'; - -@NgModule({ - imports: [CommonModule, CoreModule.forChild(), AppSearchInputModule, AppToolbarModule], - declarations: [AppHeaderComponent], - exports: [AppHeaderComponent] -}) -export class AppHeaderModule {} diff --git a/projects/aca-content/src/lib/components/layout/layout.module.ts b/projects/aca-content/src/lib/components/layout/layout.module.ts index dab9c1e61..1ebd7cae2 100644 --- a/projects/aca-content/src/lib/components/layout/layout.module.ts +++ b/projects/aca-content/src/lib/components/layout/layout.module.ts @@ -31,7 +31,6 @@ import { ContentModule } from '@alfresco/adf-content-services'; import { RouterModule } from '@angular/router'; import { AppSidenavModule } from '../sidenav/sidenav.module'; import { AppCommonModule } from '../common/common.module'; -import { AppHeaderModule } from '../header/header.module'; import { HttpClientModule } from '@angular/common/http'; import { PageLayoutModule } from '@alfresco/aca-shared'; @@ -43,7 +42,6 @@ import { PageLayoutModule } from '@alfresco/aca-shared'; ContentModule.forChild(), AppCommonModule, AppSidenavModule, - AppHeaderModule, HttpClientModule, PageLayoutModule ],