diff --git a/lib/core/src/lib/pipes/full-name.pipe.spec.ts b/lib/core/src/lib/pipes/full-name.pipe.spec.ts index 48cb32d6cf..c9ac3396dd 100644 --- a/lib/core/src/lib/pipes/full-name.pipe.spec.ts +++ b/lib/core/src/lib/pipes/full-name.pipe.spec.ts @@ -18,7 +18,6 @@ import { FullNamePipe } from './full-name.pipe'; describe('FullNamePipe', () => { - let pipe: FullNamePipe; beforeEach(() => { @@ -31,27 +30,32 @@ describe('FullNamePipe', () => { }); it('should return only firstName as fullName when there is no lastName ', () => { - const user = {firstName : 'Abc'}; + const user = { firstName: 'Abc' }; expect(pipe.transform(user)).toBe('Abc'); }); it('should return only lastName as fullName when there is no firstName ', () => { - const user = {lastName : 'Xyz'}; + const user = { lastName: 'Xyz' }; expect(pipe.transform(user)).toBe('Xyz'); }); it('should return fullName when firstName and lastName are available', () => { - const user = {firstName : 'Abc', lastName : 'Xyz'}; + const user = { firstName: 'Abc', lastName: 'Xyz' }; expect(pipe.transform(user)).toBe('Abc Xyz'); }); it('should return username when firstName and lastName are not available', () => { - const user = {firstName : '', lastName : '', username: 'username'}; + const user = { firstName: '', lastName: '', username: 'username' }; expect(pipe.transform(user)).toBe('username'); }); it('should return user eamil when firstName, lastName and username are not available', () => { - const user = {firstName : '', lastName : '', username: '', email: 'abcXyz@gmail.com'}; + const user = { firstName: '', lastName: '', username: '', email: 'abcXyz@gmail.com' }; expect(pipe.transform(user)).toBe('abcXyz@gmail.com'); }); + + it('should display email and fullName if emailDisplayed param is true', () => { + const user = { firstName: 'John', lastName: 'Doe', username: '', email: 'abcXyz@gmail.com' }; + expect(pipe.transform(user, true)).toBe('John Doe '); + }); }); diff --git a/lib/core/src/lib/pipes/full-name.pipe.ts b/lib/core/src/lib/pipes/full-name.pipe.ts index 1567e22f5a..061104944c 100644 --- a/lib/core/src/lib/pipes/full-name.pipe.ts +++ b/lib/core/src/lib/pipes/full-name.pipe.ts @@ -23,8 +23,9 @@ import { UserLike } from './user-like.interface'; standalone: true }) export class FullNamePipe implements PipeTransform { - transform(user: UserLike): string { - return this.buildFullName(user) ? this.buildFullName(user) : this.buildFromUsernameOrEmail(user); + transform(user: UserLike, emailDisplayed?: boolean): string { + const fullName = this.buildFullName(user) ? this.buildFullName(user) : this.buildFromUsernameOrEmail(user); + return `${fullName} ${emailDisplayed ? '<' + user?.email + '>' : ''}`.trim(); } buildFullName(user: UserLike): string { diff --git a/lib/process-services-cloud/src/lib/people/components/people-cloud.component.html b/lib/process-services-cloud/src/lib/people/components/people-cloud.component.html index f9b151abd6..0e42607566 100644 --- a/lib/process-services-cloud/src/lib/people/components/people-cloud.component.html +++ b/lib/process-services-cloud/src/lib/people/components/people-cloud.component.html @@ -11,54 +11,60 @@ - {{user | fullName}} + [matTooltip]="showFullNameOnHover ? (user | fullName : true) : user.email" + > + {{ user | fullName }} + [attr.data-automation-id]="'adf-people-cloud-chip-remove-icon-' + user.username" + > cancel - + - - - -
-
- {{user | fullName}} -
-
+ + + +
+
+ {{ user | fullName : true }} +
+
- + {{ 'ADF_CLOUD_USERS.ERROR.NOT_FOUND' | translate : { userName: searchedValue } }} @@ -70,29 +76,40 @@
error_outline -
{{ 'ADF_CLOUD_USERS.ERROR.NOT_FOUND' | translate : { userName : validateUsersMessage } }}
+
{{ 'ADF_CLOUD_USERS.ERROR.NOT_FOUND' | translate : { userName: validateUsersMessage } }}
error_outline -
{{ 'ADF_CLOUD_PEOPLE_GROUPS.ERROR.INVALID_PATTERN' | translate: { pattern: getValidationPattern() } }}
+
{{ 'ADF_CLOUD_PEOPLE_GROUPS.ERROR.INVALID_PATTERN' | translate : { pattern: getValidationPattern() } }}
error_outline -
{{ 'ADF_CLOUD_PEOPLE_GROUPS.ERROR.INVALID_MAX_LENGTH' | translate: { requiredLength: getValidationMaxLength() } }}
+
+ {{ 'ADF_CLOUD_PEOPLE_GROUPS.ERROR.INVALID_MAX_LENGTH' | translate : { requiredLength: getValidationMaxLength() } }} +
error_outline -
{{ 'ADF_CLOUD_PEOPLE_GROUPS.ERROR.INVALID_MIN_LENGTH' | translate: { requiredLength: getValidationMinLength() } }}
+
+ {{ 'ADF_CLOUD_PEOPLE_GROUPS.ERROR.INVALID_MIN_LENGTH' | translate : { requiredLength: getValidationMinLength() } }} +
- + error_outline
{{ 'ADF_CLOUD_PEOPLE_GROUPS.ERROR.REQUIRED' | translate }}
- + error_outline -
{{ 'ADF_CLOUD_USERS.ERROR.NOT_FOUND' | translate : { userName : searchedValue } }}
+
{{ 'ADF_CLOUD_USERS.ERROR.NOT_FOUND' | translate : { userName: searchedValue } }}