From c370fdb1a8bdcbf2d65b71e62f5ef02e1ae1d9d4 Mon Sep 17 00:00:00 2001
From: Artyom Savchenko <armisav@gmail.com>
Date: Wed, 16 Apr 2025 20:30:05 +0700
Subject: [PATCH] UBERF-10248: Fix timezone loading (#8586)

* UBERF-10248: Fix local timezone

Signed-off-by: Artem Savchenko <armisav@gmail.com>

* UBERF-10248: Remove unused import

Signed-off-by: Artem Savchenko <armisav@gmail.com>

* UBERF-10248: Remove redundant arg

Signed-off-by: Artem Savchenko <armisav@gmail.com>

---------

Signed-off-by: Artem Savchenko <armisav@gmail.com>
---
 plugins/contact-assets/lang/cs.json           |  3 ++-
 plugins/contact-assets/lang/de.json           |  3 ++-
 plugins/contact-assets/lang/en.json           |  3 ++-
 plugins/contact-assets/lang/es.json           |  3 ++-
 plugins/contact-assets/lang/fr.json           |  3 ++-
 plugins/contact-assets/lang/it.json           |  3 ++-
 plugins/contact-assets/lang/pt.json           |  3 ++-
 plugins/contact-assets/lang/ru.json           |  3 ++-
 plugins/contact-assets/lang/zh.json           |  3 ++-
 .../person/EmployeePreviewPopup.svelte        |  8 ++-----
 .../components/person/TimePresenter.svelte    | 14 ++++++++---
 plugins/contact/src/index.ts                  |  3 ++-
 server/account/src/operations.ts              | 23 ++++++++-----------
 13 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/plugins/contact-assets/lang/cs.json b/plugins/contact-assets/lang/cs.json
index 81d61626aa..bfd7f03191 100644
--- a/plugins/contact-assets/lang/cs.json
+++ b/plugins/contact-assets/lang/cs.json
@@ -111,6 +111,7 @@
     "ViberPlaceholder": "Viber",
     "UserProfile": "Uživatelský profil",
     "DeactivatedAccount": "Deaktivovaný účet",
-    "LocalTime": "místní čas"
+    "LocalTime": "místní čas",
+    "LocalTimeNotSet": "Místní čas není nastaven"
   }
 }
diff --git a/plugins/contact-assets/lang/de.json b/plugins/contact-assets/lang/de.json
index 5a38c4773d..ea68d5114b 100644
--- a/plugins/contact-assets/lang/de.json
+++ b/plugins/contact-assets/lang/de.json
@@ -111,6 +111,7 @@
     "ViberPlaceholder": "Viber",
     "UserProfile": "Benutzerprofil",
     "DeactivatedAccount": "Deaktivierter Account",
-    "LocalTime": "Ortszeit"
+    "LocalTime": "Ortszeit",
+    "LocalTimeNotSet": "Ortszeit nicht festgelegt"
   }
 }
diff --git a/plugins/contact-assets/lang/en.json b/plugins/contact-assets/lang/en.json
index c5d25e8618..71991aa27f 100644
--- a/plugins/contact-assets/lang/en.json
+++ b/plugins/contact-assets/lang/en.json
@@ -115,6 +115,7 @@
     "Confirmed": "Confirmed",
     "UserProfile": "User profile",
     "DeactivatedAccount": "Deactivated account",
-    "LocalTime": "local time"
+    "LocalTime": "local time",
+    "LocalTimeNotSet": "Local time not set"
   }
 }
diff --git a/plugins/contact-assets/lang/es.json b/plugins/contact-assets/lang/es.json
index 9ee90c6ba6..88724a7754 100644
--- a/plugins/contact-assets/lang/es.json
+++ b/plugins/contact-assets/lang/es.json
@@ -115,6 +115,7 @@
     "Confirmed": "Confirmado",
     "UserProfile": "Perfil de usuario",
     "DeactivatedAccount": "Cuenta desactivada",
-    "LocalTime": "hora local"
+    "LocalTime": "hora local",
+    "LocalTimeNotSet": "Hora local no establecida"
   }
 }
diff --git a/plugins/contact-assets/lang/fr.json b/plugins/contact-assets/lang/fr.json
index ee5f2962c8..61b1b598d3 100644
--- a/plugins/contact-assets/lang/fr.json
+++ b/plugins/contact-assets/lang/fr.json
@@ -115,6 +115,7 @@
     "Confirmed": "Confirmé",
     "UserProfile": "Profil utilisateur",
     "DeactivatedAccount": "Compte désactivé",
-    "LocalTime": "heure locale"
+    "LocalTime": "heure locale",
+    "LocalTimeNotSet": "Heure locale non définie"
   }
 }
diff --git a/plugins/contact-assets/lang/it.json b/plugins/contact-assets/lang/it.json
index 254716e877..bdfc11ffbc 100644
--- a/plugins/contact-assets/lang/it.json
+++ b/plugins/contact-assets/lang/it.json
@@ -115,6 +115,7 @@
     "Confirmed": "Confermato",
     "UserProfile": "Profilo utente",
     "DeactivatedAccount": "Account disattivato",
-    "LocalTime": "ora locale"
+    "LocalTime": "ora locale",
+    "LocalTimeNotSet": "Ora locale non impostata"
   }
 }
diff --git a/plugins/contact-assets/lang/pt.json b/plugins/contact-assets/lang/pt.json
index 51423a2acd..a2ac28ce92 100644
--- a/plugins/contact-assets/lang/pt.json
+++ b/plugins/contact-assets/lang/pt.json
@@ -115,6 +115,7 @@
     "Confirmed": "Confirmado",
     "UserProfile": "Perfil do usuário",
     "DeactivatedAccount": "Conta desativada",
-    "LocalTime": "hora local"
+    "LocalTime": "hora local",
+    "LocalTimeNotSet": "Hora local não definida"
   }
 }
diff --git a/plugins/contact-assets/lang/ru.json b/plugins/contact-assets/lang/ru.json
index b7abf0a27d..e2f10d034c 100644
--- a/plugins/contact-assets/lang/ru.json
+++ b/plugins/contact-assets/lang/ru.json
@@ -115,6 +115,7 @@
     "Confirmed": "Подтвержден",
     "UserProfile": "Профиль пользователя",
     "DeactivatedAccount": "Деактивированный аккаунт",
-    "LocalTime": "местного времени"
+    "LocalTime": "местного времени",
+    "LocalTimeNotSet": "Местное время не задано"
   }
 }
diff --git a/plugins/contact-assets/lang/zh.json b/plugins/contact-assets/lang/zh.json
index 5039114a37..d62416c381 100644
--- a/plugins/contact-assets/lang/zh.json
+++ b/plugins/contact-assets/lang/zh.json
@@ -115,6 +115,7 @@
     "Confirmed": "已确认",
     "UserProfile": "用户资料",
     "DeactivatedAccount": "已停用账户",
-    "LocalTime": "当地时间"
+    "LocalTime": "当地时间",
+    "LocalTimeNotSet": "未设置当地时间"
   }
 }
diff --git a/plugins/contact-resources/src/components/person/EmployeePreviewPopup.svelte b/plugins/contact-resources/src/components/person/EmployeePreviewPopup.svelte
index fb1eb87d88..f12e8ec199 100644
--- a/plugins/contact-resources/src/components/person/EmployeePreviewPopup.svelte
+++ b/plugins/contact-resources/src/components/person/EmployeePreviewPopup.svelte
@@ -15,7 +15,7 @@
 <script lang="ts">
   import { Employee } from '@hcengineering/contact'
   import { AccountUuid, Class, Doc, Ref } from '@hcengineering/core'
-  import { ButtonIcon, Loading, navigate } from '@hcengineering/ui'
+  import { ButtonIcon, navigate } from '@hcengineering/ui'
   import view from '@hcengineering/view'
   import { getObjectLinkFragment } from '@hcengineering/view-resources'
   import { ComponentExtensions, getClient } from '@hcengineering/presentation'
@@ -97,11 +97,7 @@
         <div class="flex-col flex-gap-0-5">
           <EmployeePresenter value={employee} shouldShowAvatar={false} showPopup={false} compact accent />
           <span class="flex-presenter cursor-default">
-            {#if isTimezoneLoading}
-              <Loading size="small" />
-            {:else if timezone != null}
-              <TimePresenter {timezone} />
-            {/if}
+            <TimePresenter {timezone} {isTimezoneLoading} />
           </span>
         </div>
       </div>
diff --git a/plugins/contact-resources/src/components/person/TimePresenter.svelte b/plugins/contact-resources/src/components/person/TimePresenter.svelte
index 270e405e3f..657de761b7 100644
--- a/plugins/contact-resources/src/components/person/TimePresenter.svelte
+++ b/plugins/contact-resources/src/components/person/TimePresenter.svelte
@@ -16,8 +16,10 @@
   import { Icon, Label } from '@hcengineering/ui'
 
   import contact from '@hcengineering/contact'
+  import view from '@hcengineering/view'
 
-  export let timezone: string
+  export let timezone: string | undefined
+  export let isTimezoneLoading: boolean
 
   function displayTimeInTimezone (timezone: string): string {
     const options: Intl.DateTimeFormatOptions = {
@@ -34,10 +36,16 @@
 
 <div class="time-container">
   <div class="clock-icon">
-    <Icon icon={contact.icon.Clock} size={'x-small'} />
+    <Icon icon={contact.icon.Clock} size={'smaller'} />
   </div>
   <div class="text-normal font-normal content-color select-text">
-    <span class="time-text-span">{displayTimeInTimezone(timezone)} <Label label={contact.string.LocalTime} /></span>
+    {#if isTimezoneLoading}
+      <span class="time-text-span"><Label label={view.string.Loading} /></span>
+    {:else if timezone != null}
+      <span class="time-text-span">{displayTimeInTimezone(timezone)} <Label label={contact.string.LocalTime} /></span>
+    {:else}
+      <span class="time-text-span"><Label label={contact.string.LocalTimeNotSet} /></span>
+    {/if}
   </div>
 </div>
 
diff --git a/plugins/contact/src/index.ts b/plugins/contact/src/index.ts
index 83f8e77a3a..0473c750b1 100644
--- a/plugins/contact/src/index.ts
+++ b/plugins/contact/src/index.ts
@@ -336,7 +336,8 @@ export const contactPlugin = plugin(contactId, {
     Confirmed: '' as IntlString,
     UserProfile: '' as IntlString,
     DeactivatedAccount: '' as IntlString,
-    LocalTime: '' as IntlString
+    LocalTime: '' as IntlString,
+    LocalTimeNotSet: '' as IntlString
   },
   viewlet: {
     TableMember: '' as Ref<Viewlet>,
diff --git a/server/account/src/operations.ts b/server/account/src/operations.ts
index a9e84f1c18..84c9528bd5 100644
--- a/server/account/src/operations.ts
+++ b/server/account/src/operations.ts
@@ -117,8 +117,7 @@ export async function login (
   params: {
     email: string
     password: string
-  },
-  meta?: Meta
+  }
 ): Promise<LoginInfo> {
   const { email, password } = params
   const normalizedEmail = cleanEmail(email)
@@ -149,7 +148,6 @@ export async function login (
 
     const extraToken: Record<string, string> = isAdminEmail(email) ? { admin: 'true' } : {}
     ctx.info('Login succeeded', { email, normalizedEmail, isConfirmed, emailSocialId, ...extraToken })
-    void setTimezoneIfNotDefined(ctx, db, existingAccount.uuid, existingAccount, meta)
 
     return {
       account: existingAccount.uuid,
@@ -172,8 +170,7 @@ export async function loginOtp (
   db: AccountDB,
   branding: Branding | null,
   token: string,
-  params: { email: string },
-  meta?: Meta
+  params: { email: string }
 ): Promise<OtpInfo> {
   const { email } = params
 
@@ -191,8 +188,6 @@ export async function loginOtp (
     throw new PlatformError(new Status(Severity.ERROR, platform.status.AccountNotFound, {}))
   }
 
-  void setTimezoneIfNotDefined(ctx, db, account.uuid, account, meta)
-
   return await sendOtp(ctx, db, branding, emailSocialId)
 }
 
@@ -287,8 +282,7 @@ export async function validateOtp (
   params: {
     email: string
     code: string
-  },
-  meta?: Meta
+  }
 ): Promise<LoginInfo> {
   const { email, code } = params
 
@@ -326,8 +320,6 @@ export async function validateOtp (
     ctx.info('OTP login success', emailSocialId)
   }
 
-  void setTimezoneIfNotDefined(ctx, db, emailSocialId.personUuid as AccountUuid, account, meta)
-
   const person = await db.person.findOne({ uuid: emailSocialId.personUuid })
   if (person == null) {
     throw new PlatformError(new Status(Severity.ERROR, platform.status.InternalServerError, {}))
@@ -667,7 +659,7 @@ export async function join (
 
   ctx.info('Joining a workspace using invite', { email, normalizedEmail, ...invite })
 
-  const { token, account } = await login(ctx, db, branding, _token, { email: normalizedEmail, password }, meta)
+  const { token, account } = await login(ctx, db, branding, _token, { email: normalizedEmail, password })
 
   if (token == null) {
     return {
@@ -1258,7 +1250,8 @@ export async function getLoginInfoByToken (
   ctx: MeasureContext,
   db: AccountDB,
   branding: Branding | null,
-  token: string
+  token: string,
+  meta?: Meta
 ): Promise<LoginInfo | WorkspaceLoginInfo> {
   let accountUuid: AccountUuid
   let workspaceUuid: WorkspaceUuid
@@ -1317,6 +1310,10 @@ export async function getLoginInfoByToken (
     token
   }
 
+  if (!isSystem) {
+    void setTimezoneIfNotDefined(ctx, db, accountUuid, null, meta)
+  }
+
   if (workspaceUuid != null && workspaceUuid !== '') {
     const workspace = await getWorkspaceById(db, workspaceUuid)