[ADF-4048] PeopleCloudComponent - improve preselect input functionality (#4286)

* fix conflicts

* [ADF-4048] - fix add same user on multiple selection

* [ADF-4048] PeopleCloudComponent change validation users functionality

* [ADF-4048] PeopleCloudComponent - focus input when preselected user exists

* [ADF-4048] PeopleCloudComponent - pull request changes

* [ADF-4048] - lint

* [ADF-4048] PeopleCloud - PR changes

* [ADF-4048] - fix conflicts

* [ADF-4048] fx lint
This commit is contained in:
Silviu Popa
2019-03-06 15:26:51 +02:00
committed by Maurizio Vitale
parent 5d3f47eacf
commit f7a399c3e8
8 changed files with 352 additions and 71 deletions

View File

@@ -85,7 +85,7 @@ describe('PeopleCloudComponent', () => {
it('should emit selectedUser if option is valid', async(() => {
fixture.detectChanges();
let selectEmitSpy = spyOn(component.selectUser, 'emit');
component.onSelect(new IdentityUserModel({ username: 'username'}));
component.onSelect(new IdentityUserModel({ username: 'username' }));
fixture.whenStable().then(() => {
expect(selectEmitSpy).toHaveBeenCalled();
});
@@ -130,7 +130,7 @@ describe('PeopleCloudComponent', () => {
it('should pre-select all preSelectUsers when mode=multiple', async(() => {
spyOn(identityService, 'getUsersByRolesWithCurrentUser').and.returnValue(Promise.resolve(mockUsers));
component.mode = 'multiple';
component.preSelectUsers = <any> [{id: mockUsers[1].id}, {id: mockUsers[2].id}];
component.preSelectUsers = <any> [{ id: mockUsers[1].id }, { id: mockUsers[2].id }];
fixture.detectChanges();
fixture.whenStable().then(() => {
fixture.detectChanges();
@@ -153,7 +153,7 @@ describe('PeopleCloudComponent', () => {
it('should pre-select preSelectUsers[0] when mode=single', async(() => {
spyOn(identityService, 'getUsersByRolesWithCurrentUser').and.returnValue(Promise.resolve(mockUsers));
component.mode = 'single';
component.preSelectUsers = <any> [{id: mockUsers[1].id}, {id: mockUsers[2].id}];
component.preSelectUsers = <any> [{ id: mockUsers[1].id }, { id: mockUsers[2].id }];
fixture.detectChanges();
fixture.whenStable().then(() => {
const selectedUser = component.searchUserCtrl.value;
@@ -176,7 +176,7 @@ describe('PeopleCloudComponent', () => {
let removeUserSpy = spyOn(component.removeUser, 'emit');
component.mode = 'multiple';
component.preSelectUsers = <any> [{id: mockUsers[1].id}, {id: mockUsers[2].id}];
component.preSelectUsers = <any> [{ id: mockUsers[1].id }, { id: mockUsers[2].id }];
fixture.detectChanges();
fixture.whenStable().then(() => {
@@ -296,10 +296,10 @@ describe('PeopleCloudComponent', () => {
});
}));
it('should load the clients if appName change', async( () => {
it('should load the clients if appName change', async(() => {
component.appName = 'ADF';
fixture.detectChanges();
fixture.whenStable().then( () => {
fixture.whenStable().then(() => {
fixture.detectChanges();
expect(loadClientsByApplicationNameSpy).toHaveBeenCalled();
});
@@ -310,9 +310,91 @@ describe('PeopleCloudComponent', () => {
fixture.detectChanges();
component.appName = 'ADF';
fixture.detectChanges();
fixture.whenStable().then( () => {
fixture.whenStable().then(() => {
fixture.detectChanges();
expect(checkUserHasAccessSpy).toHaveBeenCalled();
});
}));
it('should not validate preselect values if preselectValidation flag is set to false', () => {
component.mode = 'multiple';
component.validate = false;
component.preSelectUsers = <any> [{ id: mockUsers[1].id }, { id: mockUsers[2].id }];
fixture.detectChanges();
fixture.whenStable().then(() => {
fixture.detectChanges();
expect(component.validatePreselectUsers).not.toHaveBeenCalled();
});
});
it('should filter users when validation flag is true', async(() => {
component.mode = 'multiple';
component.validate = true;
component.preSelectUsers = <any> [{ id: mockUsers[1].id }, { id: mockUsers[2].id }];
fixture.detectChanges();
fixture.whenStable().then(() => {
component.filterPreselectUsers().then((result) => {
expect(component.userExists(result)).toEqual(false);
});
});
}));
it('should emit warning if are invalid users', async((done) => {
const warningSpy = spyOn(component.warning, 'emit').and.returnValue(of(false));
component.mode = 'single';
component.validate = true;
component.preSelectUsers = <any> [{ username: 'invalidUsername' }];
fixture.detectChanges();
fixture.whenStable().then(() => {
component.loadSinglePreselectUser().then((result) => {
fixture.detectChanges();
expect(warningSpy).toHaveBeenCalled();
});
});
}));
it('should filter user by id if validate true', async((done) => {
const findByIdSpy = spyOn(identityService, 'findUserById').and.returnValue(Promise.resolve(mockUsers));
component.mode = 'multiple';
component.validate = true;
component.preSelectUsers = <any> [{ id: mockUsers[1].id }, { id: mockUsers[2].id }];
fixture.detectChanges();
fixture.whenStable().then(() => {
component.filterPreselectUsers().then((result) => {
expect(findByIdSpy).toHaveBeenCalled();
expect(component.userExists(result)).toEqual(true);
done();
});
});
}));
it('should filter user by username if validate true', async((done) => {
const findUserByUsernameSpy = spyOn(identityService, 'findUserByUsername').and.returnValue(Promise.resolve(mockUsers));
component.mode = 'multiple';
component.validate = true;
component.preSelectUsers = <any> [{ username: mockUsers[1].username }, { username: mockUsers[2].username }];
fixture.detectChanges();
fixture.whenStable().then(() => {
component.filterPreselectUsers().then((result) => {
expect(findUserByUsernameSpy).toHaveBeenCalled();
expect(component.userExists(result)).toEqual(true);
done();
});
});
}));
it('should filter user by email if validate true', async((done) => {
const findUserByEmailSpy = spyOn(identityService, 'findUserByEmail').and.returnValue(Promise.resolve(mockUsers));
component.mode = 'multiple';
component.validate = true;
component.preSelectUsers = <any> [{ email: mockUsers[1].email }, { email: mockUsers[2].email }];
fixture.detectChanges();
fixture.whenStable().then(() => {
component.filterPreselectUsers().then((result) => {
expect(findUserByEmailSpy).toHaveBeenCalled();
expect(component.userExists(result)).toEqual(true);
done();
});
});
}));
});

View File

@@ -19,7 +19,7 @@ import { FormControl } from '@angular/forms';
import { Component, OnInit, Output, EventEmitter, ViewEncapsulation, Input, ViewChild, ElementRef, SimpleChanges, OnChanges } from '@angular/core';
import { Observable, of, BehaviorSubject } from 'rxjs';
import { switchMap, debounceTime, distinctUntilChanged, mergeMap, tap, filter } from 'rxjs/operators';
import { FullNamePipe, IdentityUserModel, IdentityUserService } from '@alfresco/adf-core';
import { FullNamePipe, IdentityUserModel, IdentityUserService, LogService } from '@alfresco/adf-core';
import { trigger, state, style, transition, animate } from '@angular/animations';
@Component({
@@ -28,9 +28,9 @@ import { trigger, state, style, transition, animate } from '@angular/animations'
styleUrls: ['./people-cloud.component.scss'],
animations: [
trigger('transitionMessages', [
state('enter', style({opacity: 1, transform: 'translateY(0%)'})),
state('enter', style({ opacity: 1, transform: 'translateY(0%)' })),
transition('void => enter', [
style({opacity: 0, transform: 'translateY(-100%)'}),
style({ opacity: 0, transform: 'translateY(-100%)' }),
animate('300ms cubic-bezier(0.55, 0, 0.55, 0.2)')
])
])
@@ -56,10 +56,17 @@ export class PeopleCloudComponent implements OnInit, OnChanges {
@Input()
roles: string[];
/**
* Array of users to be pre-selected. All users in the
/** This flag enables the validation on the preSelectUsers passed as input.
* In case the flag is true the components call the identity service to verify the validity of the information passed as input.
* Otherwise, no check will be done.
*/
@Input()
validate: Boolean = false;
/** Array of users to be pre-selected. All users in the
* array are pre-selected in multi selection mode, but only the first user
* is pre-selected in single selection mode.
* Mandatory properties are: id, email, username
*/
@Input()
preSelectUsers: IdentityUserModel[];
@@ -72,9 +79,9 @@ export class PeopleCloudComponent implements OnInit, OnChanges {
@Output()
removeUser: EventEmitter<IdentityUserModel> = new EventEmitter<IdentityUserModel>();
/** Emitted when an error occurs. */
/** Emitted when an warning occurs. */
@Output()
error: EventEmitter<any> = new EventEmitter<any>();
warning: EventEmitter<any> = new EventEmitter<any>();
@ViewChild('userInput')
private userInput: ElementRef<HTMLInputElement>;
@@ -93,7 +100,9 @@ export class PeopleCloudComponent implements OnInit, OnChanges {
isFocused: boolean;
constructor(private identityUserService: IdentityUserService) {
invalidUsers: IdentityUserModel[];
constructor(private identityUserService: IdentityUserService, private logService: LogService) {
this.searchUsersSubject = new BehaviorSubject<IdentityUserModel[]>(this._searchUsers);
this.searchUsers$ = this.searchUsersSubject.asObservable();
}
@@ -102,11 +111,18 @@ export class PeopleCloudComponent implements OnInit, OnChanges {
this.selectedUsersSubject = new BehaviorSubject<IdentityUserModel[]>(this.preSelectUsers);
this.selectedUsers$ = this.selectedUsersSubject.asObservable();
this.initSearch();
if (this.appName) {
this.disableSearch();
this.loadClientId();
}
}
ngOnChanges(changes: SimpleChanges) {
if (changes.preSelectUsers && this.hasPreSelectUsers()) {
if (this.isPreselectedUserChanged(changes) && this.isValidationEnabled()) {
this.loadPreSelectUsers();
} else {
this.loadNoValidationPreselctUsers();
}
if (changes.appName && this.isAppNameChanged(changes.appName)) {
@@ -121,6 +137,70 @@ export class PeopleCloudComponent implements OnInit, OnChanges {
return change.previousValue !== change.currentValue && this.appName && this.appName.length > 0;
}
isPreselectedUserChanged(changes: SimpleChanges) {
return changes.preSelectUsers
&& changes.preSelectUsers.previousValue !== changes.preSelectUsers.currentValue
&& this.hasPreSelectUsers();
}
isValidationEnabled() {
return this.validate === true;
}
async validatePreselectUsers(): Promise<any> {
this.invalidUsers = [];
let filteredPreSelectUsers: IdentityUserModel[];
try {
filteredPreSelectUsers = await this.filterPreselectUsers();
} catch (error) {
filteredPreSelectUsers = [];
this.logService.error(error);
}
return filteredPreSelectUsers.reduce((validUsers, user: IdentityUserModel) => {
if (this.userExists(user)) {
validUsers.push(user);
} else {
this.invalidUsers.push(user);
}
return validUsers;
}, []);
}
async filterPreselectUsers() {
const promiseBatch = this.preSelectUsers.map(async (user: IdentityUserModel) => {
let result: any;
try {
result = await this.searchUser(user);
} catch (error) {
result = [];
this.logService.error(error);
}
const isUserValid: Boolean = this.userExists(result);
return isUserValid ? new IdentityUserModel(result[0]) : user;
});
return await Promise.all(promiseBatch);
}
async searchUser(user: IdentityUserModel) {
const key: string = Object.keys(user)[0];
switch (key) {
case 'id': return this.identityUserService.findUserById(user[key]).toPromise();
case 'username': return this.identityUserService.findUserByUsername(user[key]).toPromise();
case 'email': return this.identityUserService.findUserByEmail(user[key]).toPromise();
default: return of([]);
}
}
public userExists(result: any) {
return result.length > 0 ||
result.id !== undefined ||
result.username !== undefined ||
result.amil !== undefined;
}
private initSearch() {
this.searchUserCtrl.valueChanges.pipe(
filter((value) => {
@@ -135,7 +215,7 @@ export class PeopleCloudComponent implements OnInit, OnChanges {
}
this.clearError();
}
}),
}),
debounceTime(500),
distinctUntilChanged(),
tap(() => {
@@ -190,7 +270,7 @@ export class PeopleCloudComponent implements OnInit, OnChanges {
private isUserAlreadySelected(user: IdentityUserModel): boolean {
if (this.preSelectUsers && this.preSelectUsers.length > 0) {
const result = this.preSelectUsers.find((selectedUser) => {
return selectedUser.id === user.id || selectedUser.email === user.email;
return selectedUser.id === user.id || selectedUser.email === user.email || selectedUser.username === user.username;
});
return !!result;
@@ -200,15 +280,46 @@ export class PeopleCloudComponent implements OnInit, OnChanges {
private loadPreSelectUsers() {
if (!this.isMultipleMode()) {
this.searchUserCtrl.setValue(this.preSelectUsers[0]);
this.preSelectUsers = [];
this.loadSinglePreselectUser();
} else {
this.loadMultiplePreselectUsers();
}
if (this.userInput) {
this.userInput.nativeElement.click();
}
}
loadNoValidationPreselctUsers() {
if (this.isMultipleMode()) {
this.selectedUsersSubject.next(this.preSelectUsers);
} else {
this.searchUserCtrl.setValue(this.preSelectUsers[0]);
}
}
public async loadSinglePreselectUser() {
const users = await this.validatePreselectUsers();
this.checkPreselectValidationErrors();
this.searchUserCtrl.setValue(users[0]);
}
public async loadMultiplePreselectUsers() {
let users = await this.validatePreselectUsers();
this.checkPreselectValidationErrors();
this.preSelectUsers = [...users];
this.selectedUsersSubject.next(users);
}
public checkPreselectValidationErrors() {
if (this.invalidUsers.length > 0) {
this.warning.emit({
message: 'INVALID_PRESELECTED_USERS',
users: this.invalidUsers
});
}
}
private async loadClientId() {
this.clientId = await this.identityUserService.getClientIdByApplicationName(this.appName).toPromise();
if (this.clientId) {
@@ -260,7 +371,7 @@ export class PeopleCloudComponent implements OnInit, OnChanges {
}
private setError() {
this.searchUserCtrl.setErrors({invalid: true});
this.searchUserCtrl.setErrors({ invalid: true });
}
private clearError() {