code improvements

This commit is contained in:
Denys Vuika
2024-07-02 17:24:19 -04:00
parent e457dd3a78
commit 7309b5abaf
4 changed files with 17 additions and 37 deletions
@@ -18,7 +18,6 @@
import { FullNamePipe } from './full-name.pipe'; import { FullNamePipe } from './full-name.pipe';
describe('FullNamePipe', () => { describe('FullNamePipe', () => {
let pipe: FullNamePipe; let pipe: FullNamePipe;
beforeEach(() => { beforeEach(() => {
@@ -50,7 +49,7 @@ describe('FullNamePipe', () => {
expect(pipe.transform(user)).toBe('username'); expect(pipe.transform(user)).toBe('username');
}); });
it('should return user eamil when firstName, lastName and username are not available', () => { it('should return user email 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'); expect(pipe.transform(user)).toBe('abcXyz@gmail.com');
}); });
+6 -14
View File
@@ -18,25 +18,17 @@
import { Pipe, PipeTransform } from '@angular/core'; import { Pipe, PipeTransform } from '@angular/core';
import { UserLike } from './user-like.interface'; import { UserLike } from './user-like.interface';
@Pipe({
name: 'fullName',
standalone: true
})
@Pipe({ @Pipe({
name: 'fullName', name: 'fullName',
standalone: true standalone: true
}) })
export class FullNamePipe implements PipeTransform { export class FullNamePipe implements PipeTransform {
transform(user: UserLike): string { transform(user: UserLike): string {
return this.buildFullName(user) ? this.buildFullName(user) : this.buildFromUsernameOrEmail(user); const fullName = `${user?.firstName || ''} ${user?.lastName || ''}`.trim();
} return fullName || user?.username || user?.email || '';
buildFullName(user: UserLike): string {
const fullName: string[] = [];
fullName.push(user?.firstName);
fullName.push(user?.lastName);
return fullName.join(' ').trim();
}
buildFromUsernameOrEmail(user: UserLike): string {
return (user?.username || user?.email) ?? '';
} }
} }
@@ -19,20 +19,7 @@
import { ExtensionElement } from './extension-element'; import { ExtensionElement } from './extension-element';
export interface DataColumnTypes { export type DataColumnType = 'text' | 'image' | 'date' | 'json' | 'icon' | 'fileSize' | 'location' | 'boolean' | 'amount' | 'number';
text: string;
image: string;
date: string;
json: string;
icon: string;
fileSize: string;
location: string;
boolean: string;
amount: string;
number: string;
}
export type DataColumnType = keyof DataColumnTypes;
export interface DocumentListPresetRef extends ExtensionElement { export interface DocumentListPresetRef extends ExtensionElement {
key: string; key: string;
@@ -38,6 +38,7 @@ import { ComponentSelectionMode } from '../../types';
import { IdentityUserModel } from '../models/identity-user.model'; import { IdentityUserModel } from '../models/identity-user.model';
import { IdentityUserServiceInterface } from '../services/identity-user.service.interface'; import { IdentityUserServiceInterface } from '../services/identity-user.service.interface';
import { IDENTITY_USER_SERVICE_TOKEN } from '../services/identity-user-service.token'; import { IDENTITY_USER_SERVICE_TOKEN } from '../services/identity-user-service.token';
import { UserLike } from '../../../../../core/src/lib/pipes/user-like.interface';
@Component({ @Component({
selector: 'adf-cloud-people', selector: 'adf-cloud-people',
@@ -141,6 +142,7 @@ export class PeopleCloudComponent implements OnInit, OnChanges, OnDestroy {
@ViewChild('userInput') @ViewChild('userInput')
private userInput: ElementRef<HTMLInputElement>; private userInput: ElementRef<HTMLInputElement>;
private fullNamePipe = new FullNamePipe();
private searchUsers: IdentityUserModel[] = []; private searchUsers: IdentityUserModel[] = [];
private onDestroy$ = new Subject<boolean>(); private onDestroy$ = new Subject<boolean>();
@@ -409,8 +411,8 @@ export class PeopleCloudComponent implements OnInit, OnChanges, OnDestroy {
return this.invalidUsers && this.invalidUsers.length > 0; return this.invalidUsers && this.invalidUsers.length > 0;
} }
getDisplayName(user): string { getDisplayName(user: UserLike): string {
return FullNamePipe.prototype.transform(user); return this.fullNamePipe.transform(user);
} }
private isMultipleMode(): boolean { private isMultipleMode(): boolean {