Fix Backup info size display (#7540)

plugins/login-resources/src/components/AdminWorkspaces.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { groupByArray, type BaseWorkspaceInfo } from '@hcengineering/core'
+  import { groupByArray, isActiveMode, type BaseWorkspaceInfo } from '@hcengineering/core'
   import { getEmbeddedLabel } from '@hcengineering/platform'
   import { isAdminUser } from '@hcengineering/presentation'
   import {
@@ -84,6 +84,9 @@
 {#if isAdmin}
   <div class="anticrm-panel flex-row flex-grow p-5">
     <div class="fs-title p-3">Workspaces administration panel</div>
+    <div class="fs-title p-3">
+      Workspaces: {workspaces.length} active: {workspaces.filter((it) => isActiveMode(it.mode)).length}
+    </div>
     <div class="fs-title p-3 flex-no-shrink">
       <SearchEdit bind:value={search} width={'100%'} />
     </div>
@@ -174,7 +177,7 @@
                       </span>
 
                       <span class="label overflow-label" style:width={'10rem'}>
-                        {workspace.mode}
+                        {workspace.mode ?? '-'}
                       </span>
 
                       <span class="label overflow-label" style:width={'2rem'}>
@@ -191,7 +194,10 @@
                       </span>
                       <span class="flex flex-between" style:width={'5rem'}>
                         {#if workspace.backupInfo != null}
-                          {@const sz = workspace.backupInfo.dataSize + workspace.backupInfo.blobsSize}
+                          {@const sz = Math.max(
+                            workspace.backupInfo.backupSize,
+                            workspace.backupInfo.dataSize + workspace.backupInfo.blobsSize
+                          )}
                           {@const szGb = Math.round((sz * 100) / 1024) / 100}
                           {#if szGb > 0}
                             {Math.round((sz * 100) / 1024) / 100}Gb

plugins/login-resources/src/utils.ts

@@ -215,6 +215,7 @@ function getWorkspaceSize (it: Pick<Workspace, 'backupInfo'>): number {
   let sz = 0
   sz += it.backupInfo?.dataSize ?? 0
   sz += it.backupInfo?.blobsSize ?? 0
+  sz += it.backupInfo?.backupSize ?? 0
   return sz
 }
 

plugins/workbench-resources/src/components/SelectWorkspaceMenu.svelte

@@ -189,7 +189,10 @@
                   {#if isAdmin && ws.lastVisit != null && ws.lastVisit !== 0}
                     <div class="text-sm">
                       {#if ws.backupInfo != null}
-                        {@const sz = ws.backupInfo.dataSize + ws.backupInfo.blobsSize}
+                        {@const sz = Math.max(
+                          ws.backupInfo.backupSize,
+                          ws.backupInfo.dataSize + ws.backupInfo.blobsSize
+                        )}
                         {@const szGb = Math.round((sz * 100) / 1024) / 100}
                         {#if szGb > 0}
                           {Math.round((sz * 100) / 1024) / 100}Gb -