Add a loading toast when update download begins
This commit is contained in:
3
interface.d.ts
vendored
3
interface.d.ts
vendored
@ -63,6 +63,9 @@ export interface IElectronAPI {
|
|||||||
kittycad: (access: string, args: any) => any
|
kittycad: (access: string, args: any) => any
|
||||||
listMachines: () => Promise<MachinesListing>
|
listMachines: () => Promise<MachinesListing>
|
||||||
getMachineApiIp: () => Promise<string | null>
|
getMachineApiIp: () => Promise<string | null>
|
||||||
|
onUpdateDownloadStart: (
|
||||||
|
callback: (value: { version: string }) => void
|
||||||
|
) => Electron.IpcRenderer
|
||||||
onUpdateDownloaded: (
|
onUpdateDownloaded: (
|
||||||
callback: (value: string) => void
|
callback: (value: string) => void
|
||||||
) => Electron.IpcRenderer
|
) => Electron.IpcRenderer
|
||||||
|
|||||||
@ -8,6 +8,7 @@ import ModalContainer from 'react-modal-promise'
|
|||||||
import { isDesktop } from 'lib/isDesktop'
|
import { isDesktop } from 'lib/isDesktop'
|
||||||
import { AppStreamProvider } from 'AppState'
|
import { AppStreamProvider } from 'AppState'
|
||||||
import { ToastUpdate } from 'components/ToastUpdate'
|
import { ToastUpdate } from 'components/ToastUpdate'
|
||||||
|
import { AUTO_UPDATER_TOAST_ID } from 'lib/constants'
|
||||||
|
|
||||||
// uncomment for xstate inspector
|
// uncomment for xstate inspector
|
||||||
// import { DEV } from 'env'
|
// import { DEV } from 'env'
|
||||||
@ -53,7 +54,15 @@ root.render(
|
|||||||
// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
|
// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
|
||||||
reportWebVitals()
|
reportWebVitals()
|
||||||
|
|
||||||
isDesktop() &&
|
if (isDesktop()) {
|
||||||
|
// List for update download progress to begin
|
||||||
|
// to show a loading toast.
|
||||||
|
// TODO: Make use of the progress value in future. Currently this fires only once.
|
||||||
|
window.electron.onUpdateDownloadProgress(({ version }) => {
|
||||||
|
const message = `Downloading update (${version})...`
|
||||||
|
console.log(message)
|
||||||
|
toast.loading(message, { id: AUTO_UPDATER_TOAST_ID })
|
||||||
|
})
|
||||||
window.electron.onUpdateDownloaded((version: string) => {
|
window.electron.onUpdateDownloaded((version: string) => {
|
||||||
const message = `A new update (${version}) was downloaded and will be available next time you open the app.`
|
const message = `A new update (${version}) was downloaded and will be available next time you open the app.`
|
||||||
console.log(message)
|
console.log(message)
|
||||||
@ -64,6 +73,7 @@ isDesktop() &&
|
|||||||
window.electron.appRestart()
|
window.electron.appRestart()
|
||||||
},
|
},
|
||||||
}),
|
}),
|
||||||
{ duration: 30000 }
|
{ duration: 30000, id: AUTO_UPDATER_TOAST_ID }
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
}
|
||||||
|
|||||||
@ -102,3 +102,6 @@ export const KCL_SAMPLES_MANIFEST_URLS = {
|
|||||||
'https://raw.githubusercontent.com/KittyCAD/kcl-samples/main/manifst.json',
|
'https://raw.githubusercontent.com/KittyCAD/kcl-samples/main/manifst.json',
|
||||||
localFallback: '/kcl-samples-manifest-fallback.json',
|
localFallback: '/kcl-samples-manifest-fallback.json',
|
||||||
} as const
|
} as const
|
||||||
|
|
||||||
|
/** Toast id for the app auto-updater toast */
|
||||||
|
export const AUTO_UPDATER_TOAST_ID = 'auto-updater-toast'
|
||||||
|
|||||||
13
src/main.ts
13
src/main.ts
@ -263,6 +263,19 @@ app.on('ready', () => {
|
|||||||
|
|
||||||
autoUpdater.on('update-available', (info) => {
|
autoUpdater.on('update-available', (info) => {
|
||||||
console.log('update-available', info)
|
console.log('update-available', info)
|
||||||
|
autoUpdater.prependOnceListener('download-progress', (progress) => {
|
||||||
|
// For now, we'll send the version to the loading toast start.
|
||||||
|
console.log('update-download-start', {
|
||||||
|
version: info.version,
|
||||||
|
})
|
||||||
|
mainWindow?.webContents.send('update-download-start', progress)
|
||||||
|
})
|
||||||
|
|
||||||
|
autoUpdater.on('download-progress', (progress) => {
|
||||||
|
// TODO: in a future PR (https://github.com/KittyCAD/modeling-app/issues/3994)
|
||||||
|
// send this data to mainWindow to show a progress bar for the download.
|
||||||
|
console.log('download-progress', progress)
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
autoUpdater.on('update-downloaded', (info) => {
|
autoUpdater.on('update-downloaded', (info) => {
|
||||||
|
|||||||
@ -15,6 +15,10 @@ const startDeviceFlow = (host: string): Promise<string> =>
|
|||||||
ipcRenderer.invoke('startDeviceFlow', host)
|
ipcRenderer.invoke('startDeviceFlow', host)
|
||||||
const loginWithDeviceFlow = (): Promise<string> =>
|
const loginWithDeviceFlow = (): Promise<string> =>
|
||||||
ipcRenderer.invoke('loginWithDeviceFlow')
|
ipcRenderer.invoke('loginWithDeviceFlow')
|
||||||
|
const onUpdateDownloadStart = (
|
||||||
|
callback: (value: { version: string; }) => void
|
||||||
|
) =>
|
||||||
|
ipcRenderer.on('update-download-start', (_event, value) => callback(value))
|
||||||
const onUpdateDownloaded = (callback: (value: string) => void) =>
|
const onUpdateDownloaded = (callback: (value: string) => void) =>
|
||||||
ipcRenderer.on('update-downloaded', (_event, value) => callback(value))
|
ipcRenderer.on('update-downloaded', (_event, value) => callback(value))
|
||||||
const appRestart = () => ipcRenderer.invoke('app.restart')
|
const appRestart = () => ipcRenderer.invoke('app.restart')
|
||||||
@ -126,6 +130,7 @@ contextBridge.exposeInMainWorld('electron', {
|
|||||||
kittycad,
|
kittycad,
|
||||||
listMachines,
|
listMachines,
|
||||||
getMachineApiIp,
|
getMachineApiIp,
|
||||||
|
onUpdateDownloadStart,
|
||||||
onUpdateDownloaded,
|
onUpdateDownloaded,
|
||||||
appRestart,
|
appRestart,
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user