mirror of
https://github.com/Alfresco/alfresco-content-app.git
synced 2025-07-24 17:31:52 +00:00
[ACS-3742] Layout changes for workspace (#2980)
* Layout changes for workspace sidemenu * added header and search layout changes * implemented review comments and removed process related code * Added expand and collapse functionality * Modified the paths * linting fixes * use standard material settings icon * use only specific modules needed for page layout * use standard "menu" icon for now * use standard avatar icon for now * cleanup user profile menu item * cleanup About component layout * remove hardcoded settings route * deprecate "headerImagePath" * deprecate "headerTextColor" customisation * deprecate "headerColor" customisation * proper toggle of the side menu * proper sidebar header implementation * user profile basic cleanup * minor fixes * cleanup buttons * remove old app layout and use ADF one * remove old header component * cleanup old layout module * fix unit tests * cleanup unit tests * cleanup header actions module * deprecate unused main-action component * cleanup styles * restore removed method * cleanup search results toolbar * restore expand menu functionality * cleanup code, back buttons for about and profile * restore original code * proper collapse button * remove unused i18n key * styles cleanup * cleanup sidebar * cleanup user profile * add safety checks for focus after close * layout fixes * update view profile unit tests * code cleanup after reviews * cleanup header actions * fix menu population, user info * improved upload and create actions * remove useless tests * fix folder rules tests * search button workaround * e2e: remove wait * add create/upload tooltips * e2e fix * e2e fix * e2e fix * e2e fix * e2e fix * e2e fix * e2e fix * e2e fix * e2e fix * e2e fix * e2e fix * e2e fix * try fix e2e * update e2e extension configs * try fix e2e * try fix e2e * fix eslint config * try fix e2e * move search button to extensions * move upload and create to extensions * remove header actions as no longer needed * cleanup * e2e fixes and cleanup for unwanted files * linting fixes * linting fixes * added button type to support text buttons * linting fixes * added more unit tests to achieve code coverage requirement * fixing code covergae for aca-content * fixed code coverage for aca-shared * linting fixes * linting fixes * cleanup * version fix --------- Co-authored-by: SheenaMalhotra182 <sheena.malhotra@globallogic.com> Co-authored-by: Denys Vuika <denys.vuika@gmail.com> Co-authored-by: SheenaMalhotra182 <sheena.malhotra@contractors.onbase.com>
This commit is contained in:
Yasa-Nataliya
GitHub
@@ -33,9 +33,10 @@ import { LanguagePickerComponent } from './language-picker/language-picker.compo
|
||||
import { LogoutComponent } from './logout/logout.component';
|
||||
import { ContentModule } from '@alfresco/adf-content-services';
|
||||
import { UserInfoComponent } from './user-info/user-info.component';
|
||||
import { RouterModule } from '@angular/router';
|
||||
|
||||
@NgModule({
|
||||
imports: [CommonModule, CoreModule.forChild(), ContentModule.forChild(), ExtensionsModule, GenericErrorModule],
|
||||
imports: [CommonModule, CoreModule.forChild(), ContentModule.forChild(), ExtensionsModule, GenericErrorModule, RouterModule],
|
||||
declarations: [LocationLinkComponent, ToggleSharedComponent, LanguagePickerComponent, LogoutComponent, UserInfoComponent],
|
||||
exports: [
|
||||
ExtensionsModule,
|
||||
|
||||
@@ -1,14 +1,4 @@
|
||||
<ng-container>
|
||||
<adf-content-user-info
|
||||
*ngIf="mode === userInfoMode.CONTENT || mode === userInfoMode.CONTENT_SSO"
|
||||
[ecmUser]="ecmUser$ | async"
|
||||
[identityUser]="identityUser$ | async"
|
||||
[isLoggedIn]="isLoggedIn"
|
||||
[mode]="mode"
|
||||
></adf-content-user-info>
|
||||
<adf-identity-user-info
|
||||
*ngIf="mode === userInfoMode.SSO"
|
||||
[identityUser]="identityUser$ | async"
|
||||
[isLoggedIn]="isLoggedIn"
|
||||
></adf-identity-user-info>
|
||||
</ng-container>
|
||||
<button mat-menu-item [routerLink]="['/profile']" title="{{'APP.TOOLTIPS.MY_PROFILE' | translate}}">
|
||||
<mat-icon>account_circle</mat-icon>
|
||||
<span>{{ (displayName$ | async) }}</span>
|
||||
</button>
|
||||
|
||||
@@ -0,0 +1,121 @@
|
||||
/*!
|
||||
* Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
|
||||
*
|
||||
* Alfresco Example Content Application
|
||||
*
|
||||
* 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
|
||||
* from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
import { AuthenticationService } from '@alfresco/adf-core';
|
||||
import { PeopleContentService } from '@alfresco/adf-content-services';
|
||||
import { UserInfoComponent } from './user-info.component';
|
||||
import { AppTestingModule } from '../../../testing/app-testing.module';
|
||||
import { of } from 'rxjs';
|
||||
|
||||
describe('UserInfoComponent', () => {
|
||||
let component: UserInfoComponent;
|
||||
let fixture: ComponentFixture<UserInfoComponent>;
|
||||
let authServiceStub: Partial<AuthenticationService>;
|
||||
let peopleContentServiceStub: Partial<PeopleContentService>;
|
||||
let identityUserServiceStub: Partial<PeopleContentService>;
|
||||
|
||||
beforeEach(() => {
|
||||
authServiceStub = {
|
||||
isOauth: () => true,
|
||||
isECMProvider: () => true,
|
||||
isEcmLoggedIn: () => true,
|
||||
isKerberosEnabled: () => false,
|
||||
isLoggedIn: () => true
|
||||
};
|
||||
|
||||
peopleContentServiceStub = {
|
||||
getCurrentUserInfo: () =>
|
||||
of({
|
||||
firstName: 'John',
|
||||
email: 'john@example.com',
|
||||
id: 'johnDoe1',
|
||||
enabled: true,
|
||||
company: {
|
||||
organization: 'ABC Organization',
|
||||
address1: 'XYZ Road',
|
||||
address2: 'Ohio',
|
||||
address3: 'Westlake',
|
||||
postcode: '44145',
|
||||
telephone: '456876',
|
||||
fax: '323984',
|
||||
email: 'contact.us@abc.com'
|
||||
},
|
||||
isAdmin: () => true
|
||||
})
|
||||
};
|
||||
|
||||
identityUserServiceStub = {
|
||||
getCurrentUserInfo: () =>
|
||||
of({
|
||||
firstName: 'John',
|
||||
email: 'john@example.com',
|
||||
id: 'johnDoe1',
|
||||
enabled: true,
|
||||
company: {
|
||||
organization: 'ABC Organization',
|
||||
address1: 'XYZ Road',
|
||||
address2: 'Ohio',
|
||||
address3: 'Westlake',
|
||||
postcode: '44145',
|
||||
telephone: '456876',
|
||||
fax: '323984',
|
||||
email: 'contact.us@abc.com'
|
||||
},
|
||||
isAdmin: () => true
|
||||
})
|
||||
};
|
||||
|
||||
TestBed.configureTestingModule({
|
||||
imports: [AppTestingModule],
|
||||
declarations: [UserInfoComponent],
|
||||
providers: [
|
||||
{ provide: AuthenticationService, useValue: authServiceStub },
|
||||
{ provide: PeopleContentService, useValue: peopleContentServiceStub },
|
||||
{ provide: identityUserServiceStub, useValue: identityUserServiceStub }
|
||||
]
|
||||
}).compileComponents();
|
||||
|
||||
fixture = TestBed.createComponent(UserInfoComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should check if user is logged in', async () => {
|
||||
const loggedIn = component.isLoggedIn;
|
||||
expect(loggedIn).toBeTrue();
|
||||
});
|
||||
|
||||
it('should parse display name without email', async () => {
|
||||
const model = { firstName: 'John' };
|
||||
const displayName = component['parseDisplayName'](model);
|
||||
expect(displayName).toBe('John');
|
||||
});
|
||||
|
||||
it('should parse display name with email', async () => {
|
||||
const model = { firstName: 'John', email: 'john@example.com' };
|
||||
const displayName = component['parseDisplayName'](model);
|
||||
expect(displayName).toBe('John (john@example.com)');
|
||||
});
|
||||
});
|
||||
@@ -22,21 +22,18 @@
|
||||
* from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
import { IdentityUserModel, IdentityUserService, AuthenticationService, UserInfoMode } from '@alfresco/adf-core';
|
||||
import { IdentityUserService, AuthenticationService } from '@alfresco/adf-core';
|
||||
import { Component, OnInit } from '@angular/core';
|
||||
import { Observable, of } from 'rxjs';
|
||||
import { EcmUserModel, PeopleContentService } from '@alfresco/adf-content-services';
|
||||
import { PeopleContentService } from '@alfresco/adf-content-services';
|
||||
import { map } from 'rxjs/operators';
|
||||
|
||||
@Component({
|
||||
selector: 'app-user-info',
|
||||
templateUrl: './user-info.component.html'
|
||||
})
|
||||
export class UserInfoComponent implements OnInit {
|
||||
mode: UserInfoMode;
|
||||
ecmUser$: Observable<EcmUserModel>;
|
||||
identityUser$: Observable<IdentityUserModel>;
|
||||
selectedIndex: number;
|
||||
userInfoMode = UserInfoMode;
|
||||
displayName$: Observable<string>;
|
||||
|
||||
constructor(
|
||||
private peopleContentService: PeopleContentService,
|
||||
@@ -51,15 +48,12 @@ export class UserInfoComponent implements OnInit {
|
||||
getUserInfo() {
|
||||
if (this.authService.isOauth()) {
|
||||
this.loadIdentityUserInfo();
|
||||
this.mode = UserInfoMode.SSO;
|
||||
|
||||
if (this.authService.isECMProvider() && this.authService.isEcmLoggedIn()) {
|
||||
this.mode = UserInfoMode.CONTENT_SSO;
|
||||
this.loadEcmUserInfo();
|
||||
}
|
||||
} else if (this.isEcmLoggedIn()) {
|
||||
this.loadEcmUserInfo();
|
||||
this.mode = UserInfoMode.CONTENT;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -71,11 +65,21 @@ export class UserInfoComponent implements OnInit {
|
||||
}
|
||||
|
||||
private loadEcmUserInfo(): void {
|
||||
this.ecmUser$ = this.peopleContentService.getCurrentUserInfo();
|
||||
this.displayName$ = this.peopleContentService.getCurrentUserInfo().pipe(map((model) => this.parseDisplayName(model)));
|
||||
}
|
||||
|
||||
private loadIdentityUserInfo() {
|
||||
this.identityUser$ = of(this.identityUserService.getCurrentUserInfo());
|
||||
this.displayName$ = of(this.identityUserService.getCurrentUserInfo()).pipe(map((model) => this.parseDisplayName(model)));
|
||||
}
|
||||
|
||||
private parseDisplayName(model: { firstName?: string; email?: string }): string {
|
||||
let result = model.firstName;
|
||||
|
||||
if (model.email) {
|
||||
result = `${model.firstName} (${model.email})`;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private isEcmLoggedIn() {
|
||||
|
||||
Reference in New Issue
Block a user