From d8b4b84c9c96b09aa2971f733b0dc617cc99eb83 Mon Sep 17 00:00:00 2001
From: Alexey Zinoviev <alexey.zinoviev@xored.com>
Date: Sat, 29 Jun 2024 17:22:19 +0400
Subject: [PATCH] uberf-7434: show dowload progress (#5944)

---
 packages/presentation/src/utils.ts            | 10 +++++
 .../src/components/GuestApp.svelte            |  6 +++
 plugins/workbench-assets/lang/en.json         |  3 +-
 plugins/workbench-assets/lang/es.json         |  3 +-
 plugins/workbench-assets/lang/fr.json         |  3 +-
 plugins/workbench-assets/lang/pt.json         |  3 +-
 plugins/workbench-assets/lang/ru.json         |  3 +-
 plugins/workbench-assets/lang/zh.json         |  3 +-
 .../src/components/WorkbenchApp.svelte        | 42 ++++++++++++-------
 plugins/workbench/src/index.ts                |  3 +-
 10 files changed, 58 insertions(+), 21 deletions(-)

diff --git a/packages/presentation/src/utils.ts b/packages/presentation/src/utils.ts
index 28001a69a0..1679dfe2cc 100644
--- a/packages/presentation/src/utils.ts
+++ b/packages/presentation/src/utils.ts
@@ -704,3 +704,13 @@ export function setPresentationCookie (token: string, workspaceId: string): void
   }
   setToken('/files/' + workspaceId)
 }
+
+export const upgradeDownloadProgress = writable(0)
+
+export function setDownloadProgress (percent: number): void {
+  if (Number.isNaN(percent)) {
+    return
+  }
+
+  upgradeDownloadProgress.set(Math.round(percent))
+}
diff --git a/plugins/guest-resources/src/components/GuestApp.svelte b/plugins/guest-resources/src/components/GuestApp.svelte
index cd9893882d..46b9a6542f 100644
--- a/plugins/guest-resources/src/components/GuestApp.svelte
+++ b/plugins/guest-resources/src/components/GuestApp.svelte
@@ -15,6 +15,7 @@
 <script lang="ts">
   import { getMetadata } from '@hcengineering/platform'
   import { Label, Loading, Notifications, location } from '@hcengineering/ui'
+  import { upgradeDownloadProgress } from '@hcengineering/presentation'
   import { connect, versionError } from '../connect'
 
   import { guestId } from '@hcengineering/guest'
@@ -31,6 +32,11 @@
         <div class="antiPopup version-popup">
           <h1><Label label={workbench.string.ServerUnderMaintenance} /></h1>
           {$versionError}
+          {#if $upgradeDownloadProgress > 0}
+            <div class="mt-1">
+              <Label label={workbench.string.UpgradeDownloadProgress} params={{ percent: $upgradeDownloadProgress }} />
+            </div>
+          {/if}
         </div>
       </div>
     {:else if client}
diff --git a/plugins/workbench-assets/lang/en.json b/plugins/workbench-assets/lang/en.json
index 777194b480..cdf6477902 100644
--- a/plugins/workbench-assets/lang/en.json
+++ b/plugins/workbench-assets/lang/en.json
@@ -28,6 +28,7 @@
     "MobileNotSupported": "Sorry, mobile devices support coming soon. In the meantime, please use Desktop",
     "LogInAnyway": "Log in anyway",
     "WorkspaceCreating": "Creation in progress...",
-    "AccessDenied": "Object doesn't exist or you are not permitted to access it."
+    "AccessDenied": "Object doesn't exist or you are not permitted to access it.",
+    "UpgradeDownloadProgress": "Downloading upgrade: {percent}%"
   }
 }
diff --git a/plugins/workbench-assets/lang/es.json b/plugins/workbench-assets/lang/es.json
index 82db7b5ba6..203834a283 100644
--- a/plugins/workbench-assets/lang/es.json
+++ b/plugins/workbench-assets/lang/es.json
@@ -28,6 +28,7 @@
     "MobileNotSupported": "Disculpa, el soporte para dispositivos móviles estará disponible próximamente. Mientras tanto, por favor usa el escritorio.",
     "LogInAnyway": "Iniciar sesión de todas formas",
     "WorkspaceCreating": "Creation in progress...",
-    "AccessDenied": "El objeto no existe o no tienes permiso para acceder a él."
+    "AccessDenied": "El objeto no existe o no tienes permiso para acceder a él.",
+    "UpgradeDownloadProgress": "Descargando actualización: {percent}%"
   }
 }
\ No newline at end of file
diff --git a/plugins/workbench-assets/lang/fr.json b/plugins/workbench-assets/lang/fr.json
index acfa0dae8b..269bb121ff 100644
--- a/plugins/workbench-assets/lang/fr.json
+++ b/plugins/workbench-assets/lang/fr.json
@@ -28,6 +28,7 @@
     "MobileNotSupported": "Désolé, le support pour les appareils mobiles arrive bientôt. En attendant, veuillez utiliser un ordinateur de bureau",
     "LogInAnyway": "Se connecter quand même",
     "WorkspaceCreating": "Création en cours...",
-    "AccessDenied": "L'objet n'existe pas ou vous n'êtes pas autorisé à y accéder."
+    "AccessDenied": "L'objet n'existe pas ou vous n'êtes pas autorisé à y accéder.",
+    "UpgradeDownloadProgress": "Téléchargement de la mise à jour: {percent}%"
   }
 }
\ No newline at end of file
diff --git a/plugins/workbench-assets/lang/pt.json b/plugins/workbench-assets/lang/pt.json
index 240cd8520b..24e226fc95 100644
--- a/plugins/workbench-assets/lang/pt.json
+++ b/plugins/workbench-assets/lang/pt.json
@@ -28,6 +28,7 @@
     "MobileNotSupported": "Desculpe, o suporte para dispositivos móveis estará disponível em breve. Enquanto isso, por favor, use o Desktop.",
     "LogInAnyway": "Entrar de qualquer maneira",
     "WorkspaceCreating": "Creation in progress...",
-    "AccessDenied": "O objeto não existe ou você não tem permissão para acessá-lo."
+    "AccessDenied": "O objeto não existe ou você não tem permissão para acessá-lo.",
+    "UpgradeDownloadProgress": "Baixando atualização: {percent}%"
   }
 }
\ No newline at end of file
diff --git a/plugins/workbench-assets/lang/ru.json b/plugins/workbench-assets/lang/ru.json
index 931205924e..c71d476a03 100644
--- a/plugins/workbench-assets/lang/ru.json
+++ b/plugins/workbench-assets/lang/ru.json
@@ -28,6 +28,7 @@
     "MobileNotSupported": "Простите, поддержка мобильных устройств скоро будет доступна. Пока воспользуйтесь компьютером.",
     "LogInAnyway": "Все равно войти",
     "WorkspaceCreating": "Пространство создается...",
-    "AccessDenied": "Объект не существует или у вас нет прав доступа."
+    "AccessDenied": "Объект не существует или у вас нет прав доступа.",
+    "UpgradeDownloadProgress": "Загрузка обновления: {percent}%"
   }
 }
diff --git a/plugins/workbench-assets/lang/zh.json b/plugins/workbench-assets/lang/zh.json
index 4bd1923296..71eda58a65 100644
--- a/plugins/workbench-assets/lang/zh.json
+++ b/plugins/workbench-assets/lang/zh.json
@@ -28,6 +28,7 @@
     "MobileNotSupported": "抱歉，移动设备支持即将推出。在此期间，请使用桌面设备",
     "LogInAnyway": "仍然登录",
     "WorkspaceCreating": "创建进行中...",
-    "AccessDenied": "对象不存在或您无权访问"
+    "AccessDenied": "对象不存在或您无权访问",
+    "UpgradeDownloadProgress": "正在下载更新：{percent}%"
   }
 }
diff --git a/plugins/workbench-resources/src/components/WorkbenchApp.svelte b/plugins/workbench-resources/src/components/WorkbenchApp.svelte
index d13c1204bb..43dbfb090b 100644
--- a/plugins/workbench-resources/src/components/WorkbenchApp.svelte
+++ b/plugins/workbench-resources/src/components/WorkbenchApp.svelte
@@ -25,65 +25,79 @@
     location,
     setMetadataLocalStorage
   } from '@hcengineering/ui'
+  import { upgradeDownloadProgress } from '@hcengineering/presentation'
   import { connect, disconnect, versionError } from '../connect'
 
-  import { workbenchId } from '@hcengineering/workbench'
+  import workbench, { workbenchId } from '@hcengineering/workbench'
   import { onDestroy } from 'svelte'
-  import workbench from '../plugin'
+  import workbenchRes from '../plugin'
   import { workspaceCreating } from '../utils'
 
   const isNeedUpgrade = window.location.host === ''
 
-  let mobileAllowed = fetchMetadataLocalStorage(workbench.metadata.MobileAllowed)
+  let mobileAllowed = fetchMetadataLocalStorage(workbenchRes.metadata.MobileAllowed)
 
   function allowMobile () {
-    setMetadataLocalStorage(workbench.metadata.MobileAllowed, true)
+    setMetadataLocalStorage(workbenchRes.metadata.MobileAllowed, true)
     mobileAllowed = true
   }
 
   onDestroy(disconnect)
 </script>
 
-{#if $location.path[0] === workbenchId || $location.path[0] === workbench.component.WorkbenchApp}
+{#if $location.path[0] === workbenchId || $location.path[0] === workbenchRes.component.WorkbenchApp}
   {#if $deviceOptionsStore.isMobile && mobileAllowed !== true}
     <div class="version-wrapper">
       <div class="antiPopup version-popup">
-        <h1><Label label={workbench.string.MobileNotSupported} /></h1>
-        <Button label={workbench.string.LogInAnyway} on:click={allowMobile} />
+        <h1><Label label={workbenchRes.string.MobileNotSupported} /></h1>
+        <Button label={workbenchRes.string.LogInAnyway} on:click={allowMobile} />
       </div>
     </div>
   {:else}
     {#key $location.path[1]}
-      {#await connect(getMetadata(workbench.metadata.PlatformTitle) ?? 'Platform')}
+      {#await connect(getMetadata(workbenchRes.metadata.PlatformTitle) ?? 'Platform')}
         <Loading>
           {#if ($workspaceCreating ?? -1) > 0}
             <div class="ml-1">
-              <Label label={workbench.string.WorkspaceCreating} />
+              <Label label={workbenchRes.string.WorkspaceCreating} />
               {$workspaceCreating} %
             </div>
           {/if}
           {#if $versionError}
-            <div class="ml-1">
+            <div class="ml-2">
               {$versionError}
             </div>
           {/if}
+          {#if $upgradeDownloadProgress > 0}
+            <div class="ml-2" class:mt-1={$versionError !== undefined}>
+              <Label label={workbench.string.UpgradeDownloadProgress} params={{ percent: $upgradeDownloadProgress }} />
+            </div>
+          {/if}
         </Loading>
       {:then client}
         {#if $versionError}
           <div class="version-wrapper">
             <div class="antiPopup version-popup">
               {#if isNeedUpgrade}
-                <h1><Label label={workbench.string.NewVersionAvailable} /></h1>
-                <span class="please-update"><Label label={workbench.string.PleaseUpdate} /></span>
+                <h1><Label label={workbenchRes.string.NewVersionAvailable} /></h1>
+                <span class="please-update"><Label label={workbenchRes.string.PleaseUpdate} /></span>
               {:else}
-                <h1><Label label={workbench.string.ServerUnderMaintenance} /></h1>
+                <h1><Label label={workbenchRes.string.ServerUnderMaintenance} /></h1>
               {/if}
               {$versionError}
+              {#if $upgradeDownloadProgress > 0}
+                <div class="mt-1">
+                  <Label
+                    label={workbench.string.UpgradeDownloadProgress}
+                    params={{ percent: $upgradeDownloadProgress }}
+                  />
+                </div>
+              {/if}
             </div>
           </div>
         {:else if client}
           <Notifications>
-            <Component is={workbench.component.Workbench} />
+            <Component is={workbenchRes.component.Workbench} />
           </Notifications>
         {/if}
       {:catch error}
diff --git a/plugins/workbench/src/index.ts b/plugins/workbench/src/index.ts
index 144665da16..59a74a0e29 100644
--- a/plugins/workbench/src/index.ts
+++ b/plugins/workbench/src/index.ts
@@ -154,7 +154,8 @@ export default plugin(workbenchId, {
   string: {
     Archive: '' as IntlString,
     View: '' as IntlString,
-    ServerUnderMaintenance: '' as IntlString
+    ServerUnderMaintenance: '' as IntlString,
+    UpgradeDownloadProgress: '' as IntlString
   },
   icon: {
     Search: '' as Asset