@@ -50,10 +38,28 @@
-
-
-
{{ 'ADF_CLOUD_START_TASK.ERROR.MESSAGE' | translate }}
-
warning
-
-
+
+
+
+
+ warning
+ {{ 'ADF_CLOUD_USERS.ERROR.NOT_FOUND' | translate : { userName : validateUsersMessage } }}
+
+ warning
+ {{ 'ADF_CLOUD_PEOPLE_GROUPS.ERROR.INVALID_PATTERN' | translate: { pattern: getValidationPattern() } }}
+
+ warning
+ {{ 'ADF_CLOUD_PEOPLE_GROUPS.ERROR.INVALID_MAX_LENGTH' | translate: { requiredLength: getValidationMaxLength() } }}
+
+
+ warning
+ {{ 'ADF_CLOUD_PEOPLE_GROUPS.ERROR.INVALID_MIN_LENGTH' | translate: { requiredLength: getValidationMinLength() } }}
+
+ warning
+ {{ 'ADF_CLOUD_PEOPLE_GROUPS.ERROR.REQUIRED' | translate }}
+
+ warning
+ {{ 'ADF_CLOUD_USERS.ERROR.NOT_FOUND' | translate : { userName : searchedValue } }}
diff --git a/lib/process-services-cloud/src/lib/people/components/people-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/people/components/people-cloud.component.spec.ts
index 2140cb5e6f..a2218f6ae1 100644
--- a/lib/process-services-cloud/src/lib/people/components/people-cloud.component.spec.ts
+++ b/lib/process-services-cloud/src/lib/people/components/people-cloud.component.spec.ts
@@ -17,7 +17,12 @@
import { PeopleCloudComponent } from './people-cloud.component';
import { ComponentFixture, TestBed, async } from '@angular/core/testing';
-import { IdentityUserService, AlfrescoApiService, CoreModule, setupTestBed } from '@alfresco/adf-core';
+import {
+ IdentityUserService,
+ AlfrescoApiService,
+ CoreModule,
+ setupTestBed
+} from '@alfresco/adf-core';
import { ProcessServiceCloudTestingModule } from '../../testing/process-service-cloud.testing.module';
import { of } from 'rxjs';
import { mockUsers } from '../mock/user-cloud.mock';
@@ -32,7 +37,6 @@ describe('PeopleCloudComponent', () => {
let identityService: IdentityUserService;
let alfrescoApiService: AlfrescoApiService;
let findUsersByNameSpy: jasmine.Spy;
- let findUserByUsernameSpy: jasmine.Spy;
const mock = {
oauth2Auth: {
@@ -62,7 +66,6 @@ describe('PeopleCloudComponent', () => {
identityService = TestBed.get(IdentityUserService);
alfrescoApiService = TestBed.get(AlfrescoApiService);
spyOn(alfrescoApiService, 'getInstance').and.returnValue(mock);
- findUserByUsernameSpy = spyOn(identityService, 'findUserByUsername').and.returnValue(Promise.resolve([]));
});
it('should create PeopleCloudComponent', () => {
@@ -73,7 +76,7 @@ describe('PeopleCloudComponent', () => {
component.title = 'TITLE_KEY';
fixture.detectChanges();
const matLabel: HTMLInputElement =
fixture.nativeElement.querySelector('#adf-people-cloud-title-id');
- fixture.whenStable().then( () => {
+ fixture.whenStable().then(() => {
fixture.detectChanges();
expect(matLabel.textContent).toEqual('TITLE_KEY');
});
@@ -83,7 +86,7 @@ describe('PeopleCloudComponent', () => {
fixture.detectChanges();
const matLabel: HTMLInputElement = fixture.nativeElement.querySelector('#adf-people-cloud-title-id');
fixture.detectChanges();
- fixture.whenStable().then( () => {
+ fixture.whenStable().then(() => {
fixture.detectChanges();
expect(matLabel.textContent).toEqual('');
});
@@ -97,14 +100,14 @@ describe('PeopleCloudComponent', () => {
findUsersByNameSpy = spyOn(identityService, 'findUsersByName').and.returnValue(of(mockUsers));
}));
- it('should list the users if the typed result match', (done) => {
- findUsersByNameSpy.and.returnValue(of(mockUsers));
+ it('should list the users as dropdown options if the search term has results', (done) => {
const inputHTMLElement: HTMLInputElement = element.querySelector('input');
inputHTMLElement.focus();
inputHTMLElement.value = 'first';
inputHTMLElement.dispatchEvent(new Event('keyup'));
inputHTMLElement.dispatchEvent(new Event('input'));
fixture.detectChanges();
+
fixture.whenStable().then(() => {
fixture.detectChanges();
expect(fixture.debugElement.queryAll(By.css('mat-option')).length).toEqual(3);
@@ -127,13 +130,19 @@ describe('PeopleCloudComponent', () => {
});
});
- it('should emit selectedUser if option is valid', (done) => {
+ it('should selectedUser and changedUsers emit, update selected users when a user is selected', (done) => {
+ const user = { username: 'username' };
fixture.detectChanges();
+ spyOn(component, 'hasUserDetails').and.returnValue(true);
const selectEmitSpy = spyOn(component.selectUser, 'emit');
- component.onSelect({ username: 'username' });
+ const changedUsersSpy = spyOn(component.changedUsers, 'emit');
+ component.onSelect(user);
fixture.detectChanges();
+
fixture.whenStable().then(() => {
- expect(selectEmitSpy).toHaveBeenCalled();
+ expect(selectEmitSpy).toHaveBeenCalledWith(user);
+ expect(changedUsersSpy).toHaveBeenCalledWith([user]);
+ expect(component.getSelectedUsers()).toEqual([user]);
done();
});
});
@@ -150,9 +159,9 @@ describe('PeopleCloudComponent', () => {
fixture.whenStable().then(() => {
inputHTMLElement.blur();
fixture.detectChanges();
- const errorMessage = element.querySelector('.adf-start-task-cloud-error-message');
+ const errorMessage = element.querySelector('[data-automation-id="invalid-users-typing-error"]');
expect(errorMessage).not.toBeNull();
- expect(errorMessage.textContent).toContain('ADF_CLOUD_START_TASK.ERROR.MESSAGE');
+ expect(errorMessage.textContent).toContain('ADF_CLOUD_USERS.ERROR.NOT_FOUND');
done();
});
});
@@ -173,6 +182,18 @@ describe('PeopleCloudComponent', () => {
element = fixture.nativeElement;
}));
+ it('should fetch the client ID if appName specified', async (() => {
+ const getClientIdByApplicationNameSpy = spyOn(identityService, 'getClientIdByApplicationName').and.callThrough();
+ component.appName = 'mock-app-name';
+ const change = new SimpleChange(null, 'mock-app-name', false);
+ component.ngOnChanges({ 'appName': change });
+ fixture.detectChanges();
+ fixture.whenStable().then(() => {
+ fixture.detectChanges();
+ expect(getClientIdByApplicationNameSpy).toHaveBeenCalled();
+ });
+ }));
+
it('should list users who have access to the app when appName is specified', (done) => {
const inputHTMLElement: HTMLInputElement = element.querySelector('input');
inputHTMLElement.focus();
@@ -293,14 +314,34 @@ describe('PeopleCloudComponent', () => {
fixture.whenStable().then(() => {
inputHTMLElement.blur();
fixture.detectChanges();
- const errorMessage = element.querySelector('.adf-start-task-cloud-error-message');
+ const errorMessage = element.querySelector('[data-automation-id="invalid-users-typing-error"]');
expect(errorMessage).not.toBeNull();
- expect(errorMessage.textContent).toContain('ADF_CLOUD_START_TASK.ERROR.MESSAGE');
+ expect(errorMessage.textContent).toContain('ADF_CLOUD_USERS.ERROR.NOT_FOUND');
done();
});
});
});
+ describe('No preselected users', () => {
+ beforeEach(async () => {
+ fixture.detectChanges();
+ });
+
+ it('should not pre-select any user when preSelectUsers is empty - single mode', () => {
+ component.mode = 'single';
+ fixture.detectChanges();
+ const chips = fixture.debugElement.queryAll(By.css('mat-chip'));
+ expect(chips.length).toEqual(0);
+ });
+
+ it('should not pre-select any users when preSelectUsers is empty - multiple mode', () => {
+ component.mode = 'multiple';
+ fixture.detectChanges();
+ const chips = fixture.debugElement.queryAll(By.css('mat-chip'));
+ expect(chips.length).toEqual(0);
+ });
+ });
+
describe('When roles defined', () => {
let checkUserHasRoleSpy: jasmine.Spy;
@@ -360,311 +401,170 @@ describe('PeopleCloudComponent', () => {
});
});
- describe('Single Mode and Pre-selected users with no validate flag', () => {
+ describe('Single Mode with Pre-selected users', () => {
+
+ const changes = new SimpleChange(null, mockPreselectedUsers, false);
beforeEach(async(() => {
component.mode = 'single';
component.preSelectUsers = mockPreselectedUsers;
+ component.ngOnChanges({ 'preSelectUsers': changes });
fixture.detectChanges();
element = fixture.nativeElement;
}));
- it('should not show chip list when mode=single', (done) => {
- fixture.detectChanges();
- fixture.whenStable().then(() => {
- const chip = element.querySelector('mat-chip-list');
- expect(chip).toBeNull();
- done();
- });
- });
-
- it('should not pre-select any user when preSelectUsers is empty and mode=single', (done) => {
- component.preSelectUsers = [];
- fixture.detectChanges();
- fixture.whenStable().then(() => {
- const selectedUser = component.searchUserCtrl.value;
- expect(selectedUser).toBeNull();
- done();
- });
- });
- });
-
- describe('Single Mode and Pre-selected users with validate flag', () => {
-
- beforeEach(async(() => {
- component.mode = 'single';
- component.validate = true;
- component.preSelectUsers = mockPreselectedUsers;
- fixture.detectChanges();
- element = fixture.nativeElement;
- }));
-
- it('should not show chip list when mode=single', (done) => {
- fixture.detectChanges();
- fixture.whenStable().then(() => {
- const chip = element.querySelector('mat-chip-list');
- expect(chip).toBeNull();
- done();
- });
- });
- });
-
- describe('Multiple Mode and Pre-selected users with no validate flag', () => {
-
- const change = new SimpleChange(null, mockPreselectedUsers, false);
-
- beforeEach(async(() => {
- component.mode = 'multiple';
- component.preSelectUsers = mockPreselectedUsers;
- fixture.detectChanges();
- element = fixture.nativeElement;
- alfrescoApiService = TestBed.get(AlfrescoApiService);
- }));
-
- it('should show chip list when mode=multiple', (done) => {
- fixture.detectChanges();
- fixture.whenStable().then(() => {
- const chip = element.querySelector('mat-chip-list');
- expect(chip).toBeDefined();
- done();
- });
- });
-
- it('should pre-select all preSelectUsers when mode=multiple validation disabled', (done) => {
- component.mode = 'multiple';
- spyOn(component, 'filterPreselectUsers').and.returnValue(Promise.resolve(mockPreselectedUsers));
- component.ngOnChanges({ 'preSelectUsers': change });
- fixture.detectChanges();
+ it('should show only one mat chip with the first preSelectedUser', (done) => {
fixture.whenStable().then(() => {
fixture.detectChanges();
- component.selectedUsers$.subscribe((selectedUsers) => {
- expect(selectedUsers).toBeDefined();
- expect(selectedUsers.length).toEqual(2);
- expect(selectedUsers[0].id).toEqual('fake-id-2');
- done();
- });
+ const chips = fixture.debugElement.queryAll(By.css('mat-chip'));
+ expect(chips.length).toEqual(1);
+ expect(chips[0].attributes['data-automation-id']).toEqual(`adf-people-cloud-chip-${mockPreselectedUsers[0].username}`);
+ done();
});
});
});
- describe('Multiple Mode with read-only mode', () => {
+ describe('Multiple Mode with Pre-selected Users', () => {
it('Should not show remove icon for pre-selected users if readonly property set to true', (done) => {
- component.mode = 'multiple';
- const removeUserSpy = spyOn(component.removeUser, 'emit');
+ fixture.detectChanges();
component.preSelectUsers = [
{ id: mockUsers[0].id, username: mockUsers[0].username, readonly: true },
{ id: mockUsers[1].id, username: mockUsers[1].username, readonly: true }
];
- fixture.detectChanges();
- const chipList = fixture.nativeElement.querySelectorAll('mat-chip-list mat-chip');
- const removeIcon = fixture.nativeElement.querySelector('[data-automation-id="adf-people-cloud-chip-remove-icon-first-name-1 last-name-1"]');
- expect(chipList.length).toBe(2);
- expect(component.preSelectUsers[0].readonly).toBeTruthy();
- expect(component.preSelectUsers[1].readonly).toBeTruthy();
- fixture.detectChanges();
- fixture.whenStable().then(() => {
- fixture.detectChanges();
- expect(removeIcon).toBeNull();
- fixture.detectChanges();
- expect(removeUserSpy).not.toHaveBeenCalled();
- expect(component.preSelectUsers.length).toBe(2);
- expect(component.preSelectUsers[0].readonly).toBe(true, 'Not removable');
- expect(component.preSelectUsers[1].readonly).toBe(true, 'not removable');
- done();
- });
- });
- });
-
- describe('Multiple Mode and Pre-selected users with validate flag', () => {
-
- const change = new SimpleChange(null, mockPreselectedUsers, false);
-
- beforeEach(async(() => {
+ const change = new SimpleChange(null, component.preSelectUsers, false);
component.mode = 'multiple';
- component.validate = true;
- component.preSelectUsers = mockPreselectedUsers;
- element = fixture.nativeElement;
- alfrescoApiService = TestBed.get(AlfrescoApiService);
- fixture.detectChanges();
- }));
-
- it('should show chip list when mode=multiple', (done) => {
- fixture.detectChanges();
- fixture.whenStable().then(() => {
- const chip = element.querySelector('mat-chip-list');
- expect(chip).toBeDefined();
- done();
- });
- });
-
- it('should pre-select all preSelectUsers when mode=multiple', (done) => {
- spyOn(component, 'searchUser').and.returnValue(Promise.resolve(mockPreselectedUsers));
- component.mode = 'multiple';
- fixture.detectChanges();
component.ngOnChanges({ 'preSelectUsers': change });
fixture.detectChanges();
+
+ fixture.whenStable().then(() => {
+ fixture.detectChanges();
+ const chipList = fixture.nativeElement.querySelectorAll('mat-chip-list mat-chip');
+ const removeIcon = fixture.nativeElement.querySelector('[data-automation-id="adf-people-cloud-chip-remove-icon-first-name-1 last-name-1"]');
+ expect(chipList.length).toBe(2);
+ expect(component.preSelectUsers[0].readonly).toBeTruthy();
+ expect(component.preSelectUsers[1].readonly).toBeTruthy();
+ expect(removeIcon).toBeNull();
+ done();
+ });
+ });
+
+ it('Should be able to remove preselected users if readonly property set to false', (done) => {
+ fixture.detectChanges();
+ component.preSelectUsers = [
+ { id: mockUsers[0].id, username: mockUsers[0].username, readonly: false },
+ { id: mockUsers[1].id, username: mockUsers[1].username, readonly: false }
+ ];
+ const change = new SimpleChange(null, component.preSelectUsers, false);
+ component.mode = 'multiple';
+ component.ngOnChanges({ 'preSelectUsers': change });
+ const removeUserSpy = spyOn(component.removeUser, 'emit');
+ fixture.detectChanges();
+
fixture.whenStable().then(() => {
fixture.detectChanges();
const chips = fixture.debugElement.queryAll(By.css('mat-chip'));
+ const removeIcon = fixture.nativeElement.querySelector(`[data-automation-id="adf-people-cloud-chip-remove-icon-${mockPreselectedUsers[0].username}"]`);
expect(chips.length).toBe(2);
+ expect(component.preSelectUsers[0].readonly).toBe(false, 'Removable');
+ expect(component.preSelectUsers[1].readonly).toBe(false, 'Removable');
+ removeIcon.click();
+ fixture.detectChanges();
+ expect(removeUserSpy).toHaveBeenCalled();
+ expect(fixture.nativeElement.querySelectorAll('mat-chip-list mat-chip').length).toBe(1);
done();
});
});
- it('should emit removeUser when a selected user is removed if mode=multiple', (done) => {
- spyOn(component.removeUser, 'emit');
- component.mode = 'multiple';
- fixture.detectChanges();
- fixture.whenStable().then(() => {
+ describe('Component readonly mode', () => {
+ const change = new SimpleChange(null, mockPreselectedUsers, false);
+
+ it('should chip list be disabled and show one single chip - single mode', () => {
+ component.mode = 'single';
+ component.readOnly = true;
+ component.preSelectUsers = mockPreselectedUsers;
+ component.ngOnChanges({ 'preSelectUsers': change });
+
fixture.detectChanges();
- const removeIcon = fixture.debugElement.query(By.css('mat-chip mat-icon'));
- removeIcon.nativeElement.click();
+ const chips = fixture.debugElement.queryAll(By.css('mat-chip'));
+ const chipList = fixture.nativeElement.querySelector('mat-chip-list');
+ expect(chips).toBeDefined();
+ expect(chipList).toBeDefined();
+ expect(chips.length).toBe(1);
+ expect(chipList.attributes['ng-reflect-disabled'].value).toEqual('true');
+ });
+
+ it('should chip list be disabled and show mat chips for all the preselected users - multiple mode', () => {
+ component.mode = 'multiple';
+ component.readOnly = true;
+ component.preSelectUsers = mockPreselectedUsers;
+ component.ngOnChanges({ 'preSelectUsers': change });
fixture.detectChanges();
- expect(component.removeUser.emit).toHaveBeenCalled();
- done();
- });
- });
-
- it('should emit warning if are invalid users', (done) => {
- findUserByUsernameSpy.and.returnValue(Promise.resolve([]));
- const warnMessage = { message: 'INVALID_PRESELECTED_USERS', users: [{ username: 'invalidUsername' }] };
- component.validate = true;
- component.preSelectUsers = [{ username: 'invalidUsername' }];
- fixture.detectChanges();
- component.loadSinglePreselectUser();
- component.warning.subscribe((response) => {
- expect(response).toEqual(warnMessage);
- expect(response.message).toEqual(warnMessage.message);
- expect(response.users).toEqual(warnMessage.users);
- expect(response.users[0].username).toEqual('invalidUsername');
- done();
- });
- });
-
- it('should filter user by id if validate true', async(() => {
- const findByIdSpy = spyOn(identityService, 'findUserById').and.returnValue(of(mockUsers[0]));
- component.mode = 'multiple';
- component.validate = true;
- fixture.detectChanges();
- component.preSelectUsers = [{ id: mockUsers[0].id }, { id: mockUsers[1].id }];
- component.ngOnChanges({ 'preSelectUsers': change });
- fixture.detectChanges();
- component.filterPreselectUsers().then((result: any) => {
- fixture.detectChanges();
- expect(findByIdSpy).toHaveBeenCalled();
- expect(component.userExists(result[0])).toEqual(true);
- expect(result[1].id).toBe(mockUsers[0].id);
- });
- }));
-
- it('should filter user by username if validate true', (done) => {
- findUserByUsernameSpy.and.returnValue(of(mockUsers));
- component.mode = 'multiple';
- component.validate = true;
- component.preSelectUsers = [{ username: mockUsers[1].username }, { username: mockUsers[2].username }];
- fixture.detectChanges();
- fixture.whenStable().then(() => {
- component.filterPreselectUsers().then((result) => {
- expect(findUserByUsernameSpy).toHaveBeenCalled();
- expect(component.userExists(result[0])).toEqual(true);
- expect(component.userExists(result[1])).toEqual(true);
- done();
- });
- });
- });
-
- it('should filter user by email if validate true', (done) => {
- const findUserByEmailSpy = spyOn(identityService, 'findUserByEmail').and.returnValue(of(mockUsers));
- fixture.detectChanges();
- component.mode = 'multiple';
- component.validate = true;
- component.preSelectUsers = [{ email: mockUsers[1].email }, { email: mockUsers[2].email }];
- fixture.detectChanges();
- fixture.whenStable().then(() => {
- component.filterPreselectUsers().then((result) => {
- expect(findUserByEmailSpy).toHaveBeenCalled();
- expect(component.userExists(result[0])).toEqual(true);
- expect(component.userExists(result[1])).toEqual(true);
- done();
- });
- });
- });
-
- it('should search user by id on single selection mode', (done) => {
- const findUserByIdSpy = spyOn(identityService, 'findUserById').and.returnValue(of(mockUsers[0]));
- component.mode = 'single';
- component.validate = true;
- fixture.detectChanges();
- component.preSelectUsers = [{ id: mockUsers[0].id }];
- fixture.detectChanges();
- fixture.whenStable().then(() => {
- component.validatePreselectUsers().then((result) => {
- expect(findUserByIdSpy).toHaveBeenCalled();
- expect(result.length).toEqual(1);
- done();
- });
- });
- });
-
- it('should not preselect any user if email is invalid and validation enable', (done) => {
- const findUserByEmailSpy = spyOn(identityService, 'findUserByEmail').and.returnValue(of([]));
- component.mode = 'single';
- component.validate = true;
- component.preSelectUsers = [{ email: 'invalid email' }];
- fixture.detectChanges();
- fixture.whenStable().then(() => {
- component.validatePreselectUsers().then((result) => {
- expect(findUserByEmailSpy).toHaveBeenCalled();
- expect(result.length).toEqual(0);
- done();
- });
- });
- });
-
- it('should not preselect any user if id is invalid and validation enable', (done) => {
- const findUserByIdSpy = spyOn(identityService, 'findUserById').and.returnValue(of([]));
- component.mode = 'single';
- component.validate = true;
- component.preSelectUsers = [{ id: 'invalid id' }];
- fixture.detectChanges();
- fixture.whenStable().then(() => {
- component.validatePreselectUsers().then((result) => {
- expect(findUserByIdSpy).toHaveBeenCalled();
- expect(result.length).toEqual(0);
- done();
- });
- });
- });
-
- it('should not preselect any user if username is invalid and validation enable', (done) => {
- findUserByUsernameSpy.and.returnValue(of([]));
- component.mode = 'single';
- component.validate = true;
- component.preSelectUsers = [{ username: 'invalid user' }];
- fixture.detectChanges();
- fixture.whenStable().then(() => {
- component.validatePreselectUsers().then((result) => {
- fixture.detectChanges();
- expect(findUserByUsernameSpy).toHaveBeenCalled();
- expect(result.length).toEqual(0);
- done();
- });
- });
- });
-
- it('should remove duplicated preselcted users when a user is duplicated', () => {
- spyOn(identityService, 'findUserById').and.returnValue(of(mockUsers[0]));
- component.mode = 'multiple';
- component.validate = true;
- component.preSelectUsers = [{ id: mockUsers[0].id }, { id: mockUsers[0].id }];
- component.ngOnChanges({ 'preSelectUsers': change });
- fixture.detectChanges();
- fixture.whenStable().then(() => {
- component.validatePreselectUsers().then((result) => {
- expect(result.length).toEqual(1);
- });
+ const chips = fixture.debugElement.queryAll(By.css('mat-chip'));
+ const chipList = fixture.nativeElement.querySelector('mat-chip-list');
+ expect(chips).toBeDefined();
+ expect(chipList).toBeDefined();
+ expect(chips.length).toBe(2);
+ expect(chipList.attributes['ng-reflect-disabled'].value).toEqual('true');
});
});
});
+
+ describe('Preselected users and validation enabled', () => {
+
+ it('should check validation only for the first user and emit warning when user is invalid - single mode', (done) => {
+ spyOn(identityService, 'findUserById').and.returnValue(Promise.resolve([]));
+ spyOn(component, 'hasUserDetails').and.returnValue(false);
+
+ const expectedWarning = {
+ message: 'INVALID_PRESELECTED_USERS',
+ users: [{
+ id: mockPreselectedUsers[0].id,
+ username: mockPreselectedUsers[0].username
+ }]
+ };
+ component.warning.subscribe(warning => {
+ expect(warning).toEqual(expectedWarning);
+ done();
+ });
+
+ component.mode = 'single';
+ component.validate = true;
+ component.preSelectUsers = [mockPreselectedUsers[0], mockPreselectedUsers[1]];
+ component.ngOnChanges({ 'preSelectUsers': new SimpleChange(null, [mockPreselectedUsers[0], mockPreselectedUsers[1]], false) });
+ });
+
+ it('should check validation for all the users and emit warning - multiple mode', (done) => {
+ spyOn(identityService, 'findUserById').and.returnValue(Promise.resolve(undefined));
+
+ const expectedWarning = {
+ message: 'INVALID_PRESELECTED_USERS',
+ users: [
+ {
+ id: mockPreselectedUsers[0].id,
+ username: mockPreselectedUsers[0].username
+ },
+ {
+ id: mockPreselectedUsers[1].id,
+ username: mockPreselectedUsers[1].username
+ }]
+ };
+
+ component.warning.subscribe(warning => {
+ expect(warning).toEqual(expectedWarning);
+ done();
+ });
+
+ component.mode = 'multiple';
+ component.validate = true;
+ component.preSelectUsers = [mockPreselectedUsers[0], mockPreselectedUsers[1]];
+ component.ngOnChanges({ 'preSelectUsers': new SimpleChange(null, [mockPreselectedUsers[0], mockPreselectedUsers[1]], false) });
+ });
+ });
+
+ it('should removeDuplicateUsers return only unique users', () => {
+ const duplicatedUsers = [{ id: mockUsers[0].id }, { id: mockUsers[0].id }];
+ expect(component.removeDuplicatedUsers(duplicatedUsers)).toEqual([{ id: mockUsers[0].id }]);
+ });
+
});
diff --git a/lib/process-services-cloud/src/lib/people/components/people-cloud.component.ts b/lib/process-services-cloud/src/lib/people/components/people-cloud.component.ts
index c38e6bd8f2..8ce3bb74f0 100644
--- a/lib/process-services-cloud/src/lib/people/components/people-cloud.component.ts
+++ b/lib/process-services-cloud/src/lib/people/components/people-cloud.component.ts
@@ -16,10 +16,27 @@
*/
import { FormControl } from '@angular/forms';
-import { Component, OnInit, Output, EventEmitter, ViewEncapsulation, Input, ViewChild, ElementRef, SimpleChanges, OnChanges, OnDestroy, ChangeDetectionStrategy } from '@angular/core';
+import {
+ Component,
+ OnInit,
+ Output,
+ EventEmitter,
+ ViewEncapsulation,
+ Input,
+ SimpleChanges,
+ OnChanges,
+ OnDestroy,
+ ChangeDetectionStrategy,
+ ViewChild, ElementRef
+} from '@angular/core';
import { Observable, of, BehaviorSubject, Subject } from 'rxjs';
import { switchMap, debounceTime, distinctUntilChanged, mergeMap, tap, filter, map, takeUntil } from 'rxjs/operators';
-import { FullNamePipe, IdentityUserModel, IdentityUserService, LogService } from '@alfresco/adf-core';
+import {
+ FullNamePipe,
+ IdentityUserModel,
+ IdentityUserService,
+ LogService
+} from '@alfresco/adf-core';
import { trigger, state, style, transition, animate } from '@angular/animations';
@Component({
@@ -79,7 +96,7 @@ export class PeopleCloudComponent implements OnInit, OnChanges, OnDestroy {
/** FormControl to search the user */
@Input()
- searchUserCtrl: FormControl = new FormControl();
+ searchUserCtrl: FormControl = new FormControl({ value: '', disabled: false });
/** Placeholder translation key
*/
@@ -106,166 +123,63 @@ export class PeopleCloudComponent implements OnInit, OnChanges, OnDestroy {
private userInput: ElementRef;
private _searchUsers: IdentityUserModel[] = [];
- private selectedUsersSubject: BehaviorSubject;
private searchUsersSubject: BehaviorSubject;
private onDestroy$ = new Subject();
selectedUsers: IdentityUserModel[] = [];
- selectedUsers$: Observable;
+ invalidUsers: IdentityUserModel[] = [];
+
searchUsers$: Observable;
_subscriptAnimationState: string = 'enter';
clientId: string;
isFocused: boolean;
- invalidUsers: IdentityUserModel[] = [];
currentTimeout: any;
+ validateUsersMessage: string;
+ searchedValue = '';
- constructor(private identityUserService: IdentityUserService, private logService: LogService) {
- }
+ isLoading = false;
+
+ constructor(
+ private identityUserService: IdentityUserService,
+ private logService: LogService) {}
ngOnInit() {
- if (this.hasPreSelectUsers()) {
- this.selectedUsers = [...this.preSelectUsers];
- }
- this.initSubjects();
- this.initSearch();
-
- if (this.appName) {
- this.disableSearch();
- this.loadClientId();
- }
- }
-
- ngOnChanges(changes: SimpleChanges) {
- this.initSubjects();
-
- if (this.isPreselectedUserChanged(changes)) {
- if (this.isValidationEnabled()) {
- this.loadPreSelectUsers();
- } else {
- this.loadNoValidationPreselectUsers();
- }
- }
-
- if (changes.appName && this.isAppNameChanged(changes.appName)) {
- this.disableSearch();
- this.loadClientId();
- } else {
- this.enableSearch();
- }
- }
-
- ngOnDestroy() {
- clearTimeout(this.currentTimeout);
- this.onDestroy$.next(true);
- this.onDestroy$.complete();
- }
-
- initSubjects() {
- if (this.selectedUsersSubject === undefined) {
- this.selectedUsersSubject = new BehaviorSubject(this.preSelectUsers);
- this.selectedUsers$ = this.selectedUsersSubject.asObservable();
- }
-
if (this.searchUsersSubject === undefined) {
this.searchUsersSubject = new BehaviorSubject(this._searchUsers);
this.searchUsers$ = this.searchUsersSubject.asObservable();
}
+
+ this.loadClientId();
+ this.initSearch();
}
- private isAppNameChanged(change) {
- return change.previousValue !== change.currentValue && this.appName && this.appName.length > 0;
- }
+ ngOnChanges(changes: SimpleChanges) {
- isPreselectedUserChanged(changes: SimpleChanges) {
- return changes.preSelectUsers
- && changes.preSelectUsers.previousValue !== changes.preSelectUsers.currentValue
- && this.hasPreSelectUsers();
- }
-
- isValidationEnabled() {
- return this.validate === true;
- }
-
- async validatePreselectUsers(): Promise {
- let filteredPreselectUsers: IdentityUserModel[];
- let validUsers: IdentityUserModel[] = [];
-
- try {
- filteredPreselectUsers = await this.filterPreselectUsers();
- } catch (error) {
- validUsers = [];
- this.logService.error(error);
- }
-
- await this.preSelectUsers.map((user: IdentityUserModel) => {
- const validUser = this.isValidUser(filteredPreselectUsers, user);
-
- if (validUser) {
- validUsers.push(validUser);
- } else {
- this.invalidUsers.push(user);
+ if (this.hasPreselectedUsersChanged(changes) || this.hasModeChanged(changes) || this.isValidationChanged(changes)) {
+ if (this.hasPreSelectUsers()) {
+ this.loadPreSelectUsers();
+ } else if (this.hasPreselectedUsersCleared(changes)) {
+ this.selectedUsers = [];
+ this.invalidUsers = [];
}
- });
- validUsers = this.removeDuplicatedUsers(validUsers);
- return validUsers;
- }
- private removeDuplicatedUsers(users: IdentityUserModel[]): IdentityUserModel[] {
- return users.filter((user, index, self) =>
- index === self.findIndex((auxUser) => {
- return user.id === auxUser.id && user.username === auxUser.username;
- }));
- }
-
- 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);
+ if (!this.isValidationEnabled()) {
+ this.invalidUsers = [];
}
- const isUserValid: boolean = this.userExists(result);
- return isUserValid ? result : null;
- });
- return Promise.all(promiseBatch);
- }
-
- async searchUser(user: IdentityUserModel) {
- let key: string = '';
-
- if (user.id) {
- key = 'id';
- } else if (user.email) {
- key = 'email';
- } else if (user.username) {
- key = 'username';
}
- switch (key) {
- case 'id': return this.identityUserService.findUserById(user[key]).toPromise();
- case 'username': return (await this.identityUserService.findUserByUsername(user[key]).toPromise())[0];
- case 'email': return (await this.identityUserService.findUserByEmail(user[key]).toPromise())[0];
- default: return of([]);
+ if (changes.appName && this.isAppNameChanged(changes.appName)) {
+ this.loadClientId();
+ this.initSearch();
}
}
- private isValidUser(filteredUsers: IdentityUserModel[], user: IdentityUserModel) {
- return filteredUsers.find((filteredUser: IdentityUserModel) => {
- return filteredUser &&
- (filteredUser.id === user.id ||
- filteredUser.username === user.username ||
- filteredUser.email === user.email);
- });
- }
-
- public userExists(result: IdentityUserModel): boolean {
- return result
- && (result.id !== undefined
- || result.username !== undefined
- || result.email !== undefined);
+ private async loadClientId() {
+ this.clientId = await this.identityUserService.getClientIdByApplicationName(this.appName).toPromise();
+ if (this.clientId) {
+ this.searchUserCtrl.enable();
+ }
}
private initSearch() {
@@ -276,12 +190,9 @@ export class PeopleCloudComponent implements OnInit, OnChanges, OnDestroy {
return typeof value === 'string';
}),
tap((value) => {
+ this.searchedValue = value;
if (value) {
- this.setError();
- } else {
- if (!this.isMultipleMode()) {
- this.removeUser.emit();
- }
+ this.setTypingError();
}
}),
tap(() => {
@@ -296,7 +207,6 @@ export class PeopleCloudComponent implements OnInit, OnChanges, OnDestroy {
}),
mergeMap((user: any) => {
if (this.appName) {
-
return this.checkUserHasAccess(user.id).pipe(
mergeMap((hasRole) => {
return hasRole ? of(user) : of();
@@ -315,6 +225,20 @@ export class PeopleCloudComponent implements OnInit, OnChanges, OnDestroy {
});
}
+ ngOnDestroy() {
+ clearTimeout(this.currentTimeout);
+ this.onDestroy$.next(true);
+ this.onDestroy$.complete();
+ }
+
+ private isAppNameChanged(change): boolean {
+ return change && change.previousValue !== change.currentValue && this.appName && this.appName.length > 0;
+ }
+
+ isValidationEnabled(): boolean {
+ return this.validate === true;
+ }
+
private checkUserHasAccess(userId: string): Observable {
if (this.hasRoles()) {
return this.identityUserService.checkUserHasAnyClientAppRole(userId, this.clientId, this.roles);
@@ -345,79 +269,105 @@ export class PeopleCloudComponent implements OnInit, OnChanges, OnDestroy {
return false;
}
- private loadPreSelectUsers() {
- if (!this.isMultipleMode()) {
- this.loadSinglePreselectUser();
+ private async loadPreSelectUsers() {
+ this.selectedUsers = [];
+
+ if (this.isSingleMode()) {
+ this.selectedUsers = [this.preSelectUsers[0]];
} else {
- this.loadMultiplePreselectUsers();
+ this.selectedUsers = this.removeDuplicatedUsers(this.preSelectUsers);
+ }
+
+ if (this.isValidationEnabled()) {
+ this.isLoading = true;
+ await this.validatePreselectUsers();
}
}
- async loadNoValidationPreselectUsers() {
- this.selectedUsers = [...this.removeDuplicatedUsers(this.preSelectUsers)];
+ async validatePreselectUsers(): Promise {
+ this.invalidUsers = [];
+ const validUsers: IdentityUserModel[] = [];
- if (this.isMultipleMode()) {
- this.selectedUsersSubject.next(this.selectedUsers);
+ let preselectedUsersToValidate: IdentityUserModel[] = [];
+
+ if (this.isSingleMode()) {
+ preselectedUsersToValidate = [this.preSelectUsers[0]];
} else {
-
- if (this.currentTimeout) {
- clearTimeout(this.currentTimeout);
- }
-
- this.currentTimeout = setTimeout(() => {
- this.searchUserCtrl.setValue(this.selectedUsers[0]);
- this.onSelect(this.selectedUsers[0]);
- }, 0);
+ preselectedUsersToValidate = this.removeDuplicatedUsers(this.preSelectUsers);
}
- }
- public async loadSinglePreselectUser() {
- const users = await this.validatePreselectUsers();
- if (users && users.length > 0) {
- this.checkPreselectValidationErrors();
- this.searchUserCtrl.setValue(users[0]);
- } else {
- this.checkPreselectValidationErrors();
- }
- }
-
- public async loadMultiplePreselectUsers() {
- const users = await this.validatePreselectUsers();
- if (users && users.length > 0) {
- this.checkPreselectValidationErrors();
- this.selectedUsers = [...this.alignPreselectedReadonlyUsersAfterValidation(users)];
- this.selectedUsersSubject.next(this.selectedUsers);
- } else {
- this.checkPreselectValidationErrors();
- }
- }
-
- private alignPreselectedReadonlyUsersAfterValidation(users: IdentityUserModel[]) {
- this.preSelectUsers.forEach((preSelectedUser, index) => {
- if (users[index]) {
- if ((preSelectedUser.id === users[index].id) || (preSelectedUser.username === users[index].username)) {
- users[index].readonly = preSelectedUser.readonly;
+ await Promise.all(preselectedUsersToValidate.map(async (user: IdentityUserModel) => {
+ try {
+ const validationResult = await this.searchUser(user);
+ if (!this.hasUserDetails(validationResult)) {
+ this.invalidUsers.push(user);
+ } else {
+ validUsers.push(validationResult);
}
+ } catch (error) {
+ this.invalidUsers.push(user);
+ this.logService.error(error);
}
+ }));
+ this.checkPreselectValidationErrors();
+ this.alignUsersAfterValidation(validUsers);
+ this.isLoading = false;
+ }
+
+ private alignUsersAfterValidation(validatedUsers: IdentityUserModel[]) {
+ this.selectedUsers.forEach((selectedUser, index) => {
+ validatedUsers.forEach(validatedUser => {
+ if ((selectedUser.id === validatedUser.id) || (selectedUser.username === validatedUser.username)
+ || (selectedUser.email === validatedUser.email)) {
+ validatedUser.readonly = selectedUser.readonly;
+ this.selectedUsers[index] = validatedUser;
+ }
+ });
});
- return users;
+ }
+
+ async searchUser(user: IdentityUserModel) {
+ let key: string = '';
+
+ if (user.id) {
+ key = 'id';
+ } else if (user.email) {
+ key = 'email';
+ } else if (user.username) {
+ key = 'username';
+ }
+
+ switch (key) {
+ case 'id':
+ return this.identityUserService.findUserById(user[key]).toPromise();
+ case 'username':
+ return (await this.identityUserService.findUserByUsername(user[key]).toPromise())[0];
+ case 'email':
+ return (await this.identityUserService.findUserByEmail(user[key]).toPromise())[0];
+ default:
+ return of([]);
+ }
+ }
+
+ removeDuplicatedUsers(users: IdentityUserModel[]): IdentityUserModel[] {
+ return users.filter((user, index, self) =>
+ index === self.findIndex((auxUser) => {
+ return user.id === auxUser.id && user.username === auxUser.username && user.email === auxUser.email;
+ }));
}
public checkPreselectValidationErrors() {
+
+ this.invalidUsers = this.removeDuplicatedUsers(this.invalidUsers);
+
if (this.invalidUsers.length > 0) {
- this.warning.emit({
- message: 'INVALID_PRESELECTED_USERS',
- users: this.invalidUsers
- });
+ this.generateInvalidUsersMessage();
}
- }
- private async loadClientId() {
- this.clientId = await this.identityUserService.getClientIdByApplicationName(this.appName).toPromise();
-
- if (this.clientId) {
- this.enableSearch();
- }
+ this.warning.emit({
+ message: 'INVALID_PRESELECTED_USERS',
+ users: this.invalidUsers
+ });
}
onSelect(user: IdentityUserModel) {
@@ -425,26 +375,66 @@ export class PeopleCloudComponent implements OnInit, OnChanges, OnDestroy {
if (this.isMultipleMode()) {
if (!this.isUserAlreadySelected(user)) {
this.selectedUsers.push(user);
- this.selectedUsersSubject.next(this.selectedUsers);
}
-
- this.userInput.nativeElement.value = '';
- this.searchUserCtrl.setValue('');
} else {
+ this.invalidUsers = [];
this.selectedUsers = [user];
}
+ this.userInput.nativeElement.value = '';
+ this.searchUserCtrl.setValue('');
+
this.changedUsers.emit(this.selectedUsers);
- this.clearError();
this.resetSearchUsers();
}
- onRemove(user: IdentityUserModel) {
- this.removeUser.emit(user);
- const indexToRemove = this.selectedUsers.findIndex((selectedUser) => { return selectedUser.id === user.id; });
+ onRemove(userToRemove: IdentityUserModel) {
+ this.removeUser.emit(userToRemove);
+ const indexToRemove = this.selectedUsers.findIndex((selectedUser: IdentityUserModel) => {
+ return selectedUser.id === userToRemove.id;
+ });
this.selectedUsers.splice(indexToRemove, 1);
- this.selectedUsersSubject.next(this.selectedUsers);
this.changedUsers.emit(this.selectedUsers);
+ this.searchUserCtrl.markAsDirty();
+
+ if (this.isValidationEnabled()) {
+ this.removeUserFromValidation(userToRemove.username);
+ this.checkPreselectValidationErrors();
+ }
+ }
+
+ private removeUserFromValidation(username: string) {
+ const indexToRemove = this.invalidUsers.findIndex((invalidUser) => {
+ return invalidUser.username === username;
+ });
+
+ if (indexToRemove !== -1) {
+ this.invalidUsers.splice(indexToRemove, 1);
+ }
+ }
+
+ hasUserDetails(user: IdentityUserModel): boolean {
+ return user && (user.id !== undefined || user.username !== undefined || user.email !== undefined);
+ }
+
+ generateInvalidUsersMessage() {
+ this.validateUsersMessage = '';
+
+ this.invalidUsers.forEach((invalidUser: IdentityUserModel, index) => {
+ if (index === this.invalidUsers.length - 1) {
+ this.validateUsersMessage += `${invalidUser.username} `;
+ } else {
+ this.validateUsersMessage += `${invalidUser.username}, `;
+ }
+ });
+ }
+
+ setTypingError() {
+ this.searchUserCtrl.setErrors({ searchTypingError: true, ...this.searchUserCtrl.errors });
+ }
+
+ hasPreselectError(): boolean {
+ return this.invalidUsers && this.invalidUsers.length > 0;
}
getDisplayName(user): string {
@@ -455,21 +445,49 @@ export class PeopleCloudComponent implements OnInit, OnChanges, OnDestroy {
return this.mode === PeopleCloudComponent.MODE_MULTIPLE;
}
+ isSingleMode(): boolean {
+ return this.mode === PeopleCloudComponent.MODE_SINGLE;
+ }
+
+ private isSingleSelectionReadonly(): boolean {
+ return this.isSingleMode() && this.selectedUsers.length === 1 && this.selectedUsers[0].readonly === true;
+ }
+
private hasPreSelectUsers(): boolean {
return this.preSelectUsers && this.preSelectUsers.length > 0;
}
+ private hasModeChanged(changes): boolean {
+ return changes && changes.mode && changes.mode.currentValue !== changes.mode.previousValue;
+ }
+
+ private isValidationChanged(changes): boolean {
+ return changes && changes.validate && changes.validate.currentValue !== changes.validate.previousValue;
+ }
+
+ private hasPreselectedUsersChanged(changes): boolean {
+ return changes && changes.preSelectUsers && changes.preSelectUsers.currentValue !== changes.preSelectUsers.previousValue;
+ }
+
+ private hasPreselectedUsersCleared(changes): boolean {
+ return changes && changes.preSelectUsers && changes.preSelectUsers.currentValue.length === 0;
+ }
+
private resetSearchUsers() {
this._searchUsers = [];
this.searchUsersSubject.next(this._searchUsers);
}
- private setError() {
- this.searchUserCtrl.setErrors({ invalid: true });
+ getSelectedUsers(): IdentityUserModel[] {
+ return this.selectedUsers;
}
- private clearError() {
- this.searchUserCtrl.setErrors(null);
+ isReadonly(): boolean {
+ return this.readOnly || this.isSingleSelectionReadonly();
+ }
+
+ isValidationLoading(): boolean {
+ return this.isValidationEnabled() && this.isLoading;
}
setFocus(isFocused: boolean) {
@@ -480,16 +498,15 @@ export class PeopleCloudComponent implements OnInit, OnChanges, OnDestroy {
return !!this.searchUserCtrl.errors;
}
- hasErrorMessage(): boolean {
- return !this.isFocused && this.hasError();
+ getValidationPattern(): string {
+ return this.searchUserCtrl.errors.pattern.requiredPattern;
}
- private disableSearch() {
- this.searchUserCtrl.disable();
+ getValidationMaxLength(): string {
+ return this.searchUserCtrl.errors.maxlength.requiredLength;
}
- private enableSearch() {
- this.searchUserCtrl.enable();
+ getValidationMinLength(): string {
+ return this.searchUserCtrl.errors.minlength.requiredLength;
}
-
}
diff --git a/lib/testing/src/lib/process-services-cloud/pages/people-cloud-component.page.ts b/lib/testing/src/lib/process-services-cloud/pages/people-cloud-component.page.ts
index 718abb924d..f5d945ba85 100644
--- a/lib/testing/src/lib/process-services-cloud/pages/people-cloud-component.page.ts
+++ b/lib/testing/src/lib/process-services-cloud/pages/people-cloud-component.page.ts
@@ -29,6 +29,11 @@ export class PeopleCloudComponentPage {
await this.peopleCloudSearch.sendKeys(protractor.Key.BACK_SPACE);
}
+ async clearAssigneeFromChip(username: string): Promise {
+ const assigneeChipRemoveIcon = element(by.css(`[data-automation-id="adf-people-cloud-chip-remove-icon-${username}"]`));
+ await assigneeChipRemoveIcon.click();
+ }
+
async searchAssigneeAndSelect(name: string): Promise {
await BrowserActions.clearSendKeys(this.peopleCloudSearch, name);
await this.selectAssigneeFromList(name);