From e50bab65836b0aa153fbbc0fb46693f5b77655d1 Mon Sep 17 00:00:00 2001 From: Gandalf Date: Fri, 21 Jun 2024 00:09:59 +0530 Subject: [PATCH 1/6] change workspace naming logic --- src/libs/actions/Policy/Policy.ts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts index b15bcc93a6f5..4aaa572d0cc3 100644 --- a/src/libs/actions/Policy/Policy.ts +++ b/src/libs/actions/Policy/Policy.ts @@ -41,6 +41,7 @@ import * as ErrorUtils from '@libs/ErrorUtils'; import getIsNarrowLayout from '@libs/getIsNarrowLayout'; import Log from '@libs/Log'; import * as NumberUtils from '@libs/NumberUtils'; +import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils'; import * as PhoneNumber from '@libs/PhoneNumber'; import * as PolicyUtils from '@libs/PolicyUtils'; import {navigateWhenEnableFeature} from '@libs/PolicyUtils'; @@ -1355,11 +1356,17 @@ function generateDefaultWorkspaceName(email = ''): string { } const username = emailParts[0]; const domain = emailParts[1]; + const userDetails = PersonalDetailsUtils.getPersonalDetailByEmail(sessionEmail); + const displayName = userDetails?.firstName + (userDetails?.lastName ? ' ' + userDetails?.lastName : ''); - if (PUBLIC_DOMAINS.some((publicDomain) => publicDomain === domain.toLowerCase())) { + if (!PUBLIC_DOMAINS.some((publicDomain) => publicDomain === domain.toLowerCase())) { + defaultWorkspaceName = `${Str.UCFirst(domain.split('.')[0])}'s Workspace`; + } else if (displayName !== '') { + defaultWorkspaceName = `${Str.UCFirst(displayName)}'s Workspace`; + } else if (PUBLIC_DOMAINS.some((publicDomain) => publicDomain === domain.toLowerCase())) { defaultWorkspaceName = `${Str.UCFirst(username)}'s Workspace`; } else { - defaultWorkspaceName = `${Str.UCFirst(domain.split('.')[0])}'s Workspace`; + defaultWorkspaceName = userDeatils?.phoneNumber ?? ''; } if (`@${domain.toLowerCase()}` === CONST.SMS.DOMAIN) { From e91e4729afe4074e8167a08f70ffa68225d3ff4f Mon Sep 17 00:00:00 2001 From: Gandalf Date: Fri, 21 Jun 2024 00:20:35 +0530 Subject: [PATCH 2/6] Fix type --- src/libs/actions/Policy/Policy.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts index 4aaa572d0cc3..3d773677207a 100644 --- a/src/libs/actions/Policy/Policy.ts +++ b/src/libs/actions/Policy/Policy.ts @@ -1366,7 +1366,7 @@ function generateDefaultWorkspaceName(email = ''): string { } else if (PUBLIC_DOMAINS.some((publicDomain) => publicDomain === domain.toLowerCase())) { defaultWorkspaceName = `${Str.UCFirst(username)}'s Workspace`; } else { - defaultWorkspaceName = userDeatils?.phoneNumber ?? ''; + defaultWorkspaceName = userDetails?.phoneNumber ?? ''; } if (`@${domain.toLowerCase()}` === CONST.SMS.DOMAIN) { From 7f2896c3b4307d0e4e7968677454dd7c6f3f572b Mon Sep 17 00:00:00 2001 From: Gandalf Date: Fri, 21 Jun 2024 00:33:31 +0530 Subject: [PATCH 3/6] fix lint --- src/libs/actions/Policy/Policy.ts | 2 +- src/libs/actions/Policy/test.md | 0 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 src/libs/actions/Policy/test.md diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts index 3d773677207a..ee36e1189ee0 100644 --- a/src/libs/actions/Policy/Policy.ts +++ b/src/libs/actions/Policy/Policy.ts @@ -1357,7 +1357,7 @@ function generateDefaultWorkspaceName(email = ''): string { const username = emailParts[0]; const domain = emailParts[1]; const userDetails = PersonalDetailsUtils.getPersonalDetailByEmail(sessionEmail); - const displayName = userDetails?.firstName + (userDetails?.lastName ? ' ' + userDetails?.lastName : ''); + const displayName = `${userDetails?.firstName ?? ''}${userDetails?.lastName ? ` ${userDetails.lastName}` : ''}`; if (!PUBLIC_DOMAINS.some((publicDomain) => publicDomain === domain.toLowerCase())) { defaultWorkspaceName = `${Str.UCFirst(domain.split('.')[0])}'s Workspace`; diff --git a/src/libs/actions/Policy/test.md b/src/libs/actions/Policy/test.md new file mode 100644 index 000000000000..e69de29bb2d1 From 10cdf4059071594866de4b31b21308691ac8c0fb Mon Sep 17 00:00:00 2001 From: Gandalf Date: Sun, 30 Jun 2024 02:32:20 +0530 Subject: [PATCH 4/6] remove test file --- src/libs/actions/Policy/test.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/libs/actions/Policy/test.md diff --git a/src/libs/actions/Policy/test.md b/src/libs/actions/Policy/test.md deleted file mode 100644 index e69de29bb2d1..000000000000 From 6a403d3c24b06943b5534475d981485a4f24e42f Mon Sep 17 00:00:00 2001 From: Gandalf Date: Wed, 10 Jul 2024 18:48:27 +0530 Subject: [PATCH 5/6] apply suggestions --- src/libs/actions/Policy/Policy.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts index ee36e1189ee0..8ce92784f604 100644 --- a/src/libs/actions/Policy/Policy.ts +++ b/src/libs/actions/Policy/Policy.ts @@ -1357,11 +1357,11 @@ function generateDefaultWorkspaceName(email = ''): string { const username = emailParts[0]; const domain = emailParts[1]; const userDetails = PersonalDetailsUtils.getPersonalDetailByEmail(sessionEmail); - const displayName = `${userDetails?.firstName ?? ''}${userDetails?.lastName ? ` ${userDetails.lastName}` : ''}`; + const displayName = userDetails?.displayName.trim(); if (!PUBLIC_DOMAINS.some((publicDomain) => publicDomain === domain.toLowerCase())) { defaultWorkspaceName = `${Str.UCFirst(domain.split('.')[0])}'s Workspace`; - } else if (displayName !== '') { + } else if (!!displayName) { defaultWorkspaceName = `${Str.UCFirst(displayName)}'s Workspace`; } else if (PUBLIC_DOMAINS.some((publicDomain) => publicDomain === domain.toLowerCase())) { defaultWorkspaceName = `${Str.UCFirst(username)}'s Workspace`; From fee8c1265075d9ba778b8e8ab079f24ad97a4ac8 Mon Sep 17 00:00:00 2001 From: Gandalf Date: Sat, 13 Jul 2024 20:47:05 +0530 Subject: [PATCH 6/6] Apply suggestions from code review Co-authored-by: Getabalew <75031127+getusha@users.noreply.github.com> --- src/libs/actions/Policy/Policy.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts index 8ce92784f604..ef66181f88dd 100644 --- a/src/libs/actions/Policy/Policy.ts +++ b/src/libs/actions/Policy/Policy.ts @@ -1357,11 +1357,11 @@ function generateDefaultWorkspaceName(email = ''): string { const username = emailParts[0]; const domain = emailParts[1]; const userDetails = PersonalDetailsUtils.getPersonalDetailByEmail(sessionEmail); - const displayName = userDetails?.displayName.trim(); + const displayName = userDetails?.displayName?.trim(); if (!PUBLIC_DOMAINS.some((publicDomain) => publicDomain === domain.toLowerCase())) { defaultWorkspaceName = `${Str.UCFirst(domain.split('.')[0])}'s Workspace`; - } else if (!!displayName) { + } else if (displayName) { defaultWorkspaceName = `${Str.UCFirst(displayName)}'s Workspace`; } else if (PUBLIC_DOMAINS.some((publicDomain) => publicDomain === domain.toLowerCase())) { defaultWorkspaceName = `${Str.UCFirst(username)}'s Workspace`;