wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-01-23 03:49:49 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

uberf-8481: upgrade desktop upgrade UX (#6957)

Browse Source 
Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com>
This commit is contained in:
Alexey Zinoviev 2024-10-16 15:58:24 +04:00 committed by GitHub
parent 23e8729b61
commit 343a80f642
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
plugins/guest-resources/src/connect.ts
View File

@ -16,7 +16,8 @@ import presentation, {
loadServerConfig,
refreshClient,
setClient,
setPresentationCookie
setPresentationCookie,
upgradeDownloadProgress
} from '@hcengineering/presentation'
import {
desktopPlatform,
@ -25,7 +26,8 @@ import {
navigate,
setMetadataLocalStorage
} from '@hcengineering/ui'
import { writable } from 'svelte/store'
import { writable, get } from 'svelte/store'
export const versionError = writable<string | undefined>(undefined)
const versionStorageKey = 'last_server_version'
@ -82,20 +84,29 @@ export async function connect (title: string): Promise<Client | undefined> {
frontVersion !== serverVersion
) {
const reloaded = localStorage.getItem(`versionUpgrade:s${serverVersion}:f${frontVersion}`)
const isUpgrading = get(upgradeDownloadProgress) >= 0
if (reloaded === null) {
localStorage.setItem(`versionUpgrade:s${serverVersion}:f${frontVersion}`, 't')
location.reload()
// It might have been refreshed manually and download has started - do not reload
if (!isUpgrading) {
location.reload()
}
return false
} else {
versionError.set(`Front version ${frontVersion} is not in sync with server version ${serverVersion}`)
if (!desktopPlatform) {
if (!desktopPlatform || !isUpgrading) {
setTimeout(() => {
location.reload()
}, 5000)
// It might be possible that this callback will fire after the user has spent some time
// in the upgrade !modal! dialog and clicked upgrade - check again and do not reload
if (get(upgradeDownloadProgress) < 0) {
location.reload()
}
}, 10000)
}
// For embedded it should download the upgrade and restart the app
// For embedded if the download has started it should download the upgrade and restart the app
return false
}

25
plugins/workbench-resources/src/connect.ts
View File

@ -24,7 +24,8 @@ import presentation, {
refreshClient,
setClient,
setPresentationCookie,
uiContext
uiContext,
upgradeDownloadProgress
} from '@hcengineering/presentation'
import {
desktopPlatform,
@ -34,7 +35,8 @@ import {
navigate,
setMetadataLocalStorage
} from '@hcengineering/ui'
import { writable } from 'svelte/store'
import { writable, get } from 'svelte/store'
import plugin from './plugin'
import { workspaceCreating } from './utils'
@ -164,20 +166,29 @@ export async function connect (title: string): Promise<Client | undefined> {
frontVersion !== serverVersion
) {
const reloaded = localStorage.getItem(`versionUpgrade:s${serverVersion}:f${frontVersion}`)
const isUpgrading = get(upgradeDownloadProgress) >= 0
if (reloaded === null) {
localStorage.setItem(`versionUpgrade:s${serverVersion}:f${frontVersion}`, 't')
location.reload()
// It might have been refreshed manually and download has started - do not reload
if (!isUpgrading) {
location.reload()
}
return false
} else {
versionError.set(`Front version ${frontVersion} is not in sync with server version ${serverVersion}`)
if (!desktopPlatform) {
if (!desktopPlatform || !isUpgrading) {
setTimeout(() => {
location.reload()
}, 5000)
// It might be possible that this callback will fire after the user has spent some time
// in the upgrade !modal! dialog and clicked upgrade - check again and do not reload
if (get(upgradeDownloadProgress) < 0) {
location.reload()
}
}, 10000)
}
// For embedded it should download the upgrade and restart the app
// For embedded if the download has started it should download the upgrade and restart the app
return false
}