From de0dd72f17360ab205852d0a598a7015a6a926b3 Mon Sep 17 00:00:00 2001 From: Eric Doughty-Papassideris Date: Sun, 21 Apr 2024 22:10:33 +0200 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=20Front:=20extract=20getF?= =?UTF-8?q?ullName=20from=20UserService=20to=20its=20own=20utils=20file?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../users/services/current-user-service.ts | 21 +++---------------- .../app/features/users/utils/get-full-name.ts | 21 +++++++++++++++++++ 2 files changed, 24 insertions(+), 18 deletions(-) create mode 100644 tdrive/frontend/src/app/features/users/utils/get-full-name.ts diff --git a/tdrive/frontend/src/app/features/users/services/current-user-service.ts b/tdrive/frontend/src/app/features/users/services/current-user-service.ts index 6d4c3005..fc1fe12f 100755 --- a/tdrive/frontend/src/app/features/users/services/current-user-service.ts +++ b/tdrive/frontend/src/app/features/users/services/current-user-service.ts @@ -3,12 +3,12 @@ import Login from '@features/auth/login-service'; import Collections, { Collection } from '@deprecated/CollectionsV1/Collections/Collections'; import Api from '@features/global/framework/api-service'; -import Languages from '@features/global/services/languages-service'; import { UserType } from '@features/users/types/user'; import { TdriveService } from '@features/global/framework/registry-decorator-service'; import { addApiUrlIfNeeded } from '@features/global/utils/URLUtils'; -import { getUser } from '../hooks/use-user-list'; +import { getUser } from '@features/users/hooks/use-user-list'; import { getGradient } from '@atoms/avatar'; +import { getFullName } from '../utils/get-full-name'; type SearchQueryType = { searching: boolean; @@ -41,22 +41,7 @@ class User { } getFullName(user: Pick): string { - let name: string = user?.username; - - if (!name) { - return 'Anonymous'; - } - // @author https://stackoverflow.com/a/17200679 - const toNameCase = (str?: string) => (str || '').toLowerCase().replace(/(? m.toUpperCase()); - - if (user.deleted) { - name = Languages.t('general.user.deleted'); - } else { - name = [user.first_name, user.last_name].filter(a => a).map(toNameCase).join(' '); - name = name || user.username; - } - - return name; + return getFullName(user); } getThumbnail(user: UserType) { diff --git a/tdrive/frontend/src/app/features/users/utils/get-full-name.ts b/tdrive/frontend/src/app/features/users/utils/get-full-name.ts new file mode 100644 index 00000000..c69af37c --- /dev/null +++ b/tdrive/frontend/src/app/features/users/utils/get-full-name.ts @@ -0,0 +1,21 @@ +import Languages from '@features/global/services/languages-service'; +import { UserType } from '@features/users/types/user'; + +export function getFullName(user: Pick): string { + let name: string = user?.username; + + if (!name) { + return 'Anonymous'; + } + // @author https://stackoverflow.com/a/17200679 + const toNameCase = (str?: string) => (str || '').toLowerCase().replace(/(? m.toUpperCase()); + + if (user.deleted) { + name = Languages.t('general.user.deleted'); + } else { + name = [user.first_name, user.last_name].filter(a => a).map(toNameCase).join(' '); + name = name || user.username; + } + + return name; +} \ No newline at end of file