[MM-22239] Downloads dropdown (#2227)
* WIP: show/hide temp downloads dropdown * WIP: Position downloads dropdown correctly under the button * WIP: Use correct width for dropdown so that right radius and shadows are displayed * WIP: Add items to download list after finished downloading * WIP: Add download item base components * Add "clear all" functionality * Use type Record<> for downloads saved in config * Add styling to files in the downloads dropdown * Open file in folder when clicking it from downloads dropdown. Center svg in parent element * Update scrollbar styling * Update scrollbar styling * Update state of downloaded items if deleted from folder * Add progress bar in downloads * Use "x-uncompressed-content-length" in file downloads. * Keep downloads open when clicking outside their browserview * Use correct color for downloads dropdown button * Add better styling to downloads dropdown button * Allow only 50 download files maximum. Oldest file is being removed if reached * Autoclose downloads dropdown after 4s of download finish * Add file thumbnails * Dont show second dialog if first dismissed * Add red badge when downloads running and dropdown closed * Add menu item for Downloads * Add support for more code file extensions * Open downloads dropdown instead of folder from the menu * Run lint:js and fix problems * Add tests for utils * Fix issue with dropdown not displaying * Remove unecessary comment * Move downloads to separate json file, outside Config * Add downloads dropdown menu for the 3-dot button * Dont show dev tools for downloads * Add cancel download functionality * Add dark mode styling * Use View state for downloadsMenu open state * Fix some style issues * Add image preview for downloaded images * Remove extra devTool in weback config * Fix issue with paths on windows * Align items left in downloads menu * Use pretty-bytes for file sizes * Show download remaining time * Close downloads dropdown when clicking outside * Show different units in received bytes when they are different from the total units (kb/mb) * Dont hide downloads when mattermost view is clicked * Keep downloads open if download button is clicked * Use closest() to check for download clicks * Fix unit tests. Add tests for new Views and downloadManager Add @types/jest as devDependency for intellisense * Remove unecessary tsconfig for jest * Fix types error * Add all critical tests for downloadsManager * WIP: add e2e tests for downloads * WIP: add e2e tests for downloads * Rename downloads spec file * WIP: make vscode debugger work for e2e tests * Remove unused mock * Remove defaults for v4 config * Use electron-mocha for e2e debugger * Fix e2e tests spawning JsonFileManager twice * Add async fs functions and add tests for download item UI * Add async fs functions and add tests for download item UI * Improve tests with "waitForSelector" to wait for visible elements * Wait for page load before assertions * Add tests for file uploads/downloads * Dont show native notification for completed downloads if dropdown is open * Increment filenames if file already exists * Fix antializing in downloads dropdown * Fix styling of downloads header * Increase dimensions of green/red icons in downloads * Fix styling of 3-dot button * Fix unit tests * Show 3-dot button only on hover or click * PR review fixes * Revert vscode debug fixes * Mock fs.constants * Mock fs instead of JsonFileManager in downlaods tests * Mock fs instead of JsonFileManager in downlaods tests * Add necessary mocks for downloads manager * Mark file as deleted if user deleted it * Fix min-height of downloads dropdown and 3-dot icon position * Add more tests * Make size of downloads dropdown dynamic based on content * Combine log statements * Close 3-dot menu if user clicks elsewhere * Move application updates inside downloads dropdown * Fix update issues * Fix ipc event payload * Add missing prop * Remove unused translations * Fix failing test * Fix version unknown * Remove commented out component
This commit is contained in:
@@ -6,16 +6,24 @@ import path from 'path';
|
||||
import {dialog, ipcMain, app, nativeImage} from 'electron';
|
||||
import log from 'electron-log';
|
||||
|
||||
import {autoUpdater, ProgressInfo, UpdateInfo} from 'electron-updater';
|
||||
import {autoUpdater, CancellationToken, ProgressInfo, UpdateInfo} from 'electron-updater';
|
||||
|
||||
import {localizeMessage} from 'main/i18nManager';
|
||||
import {displayUpgrade, displayRestartToUpgrade} from 'main/notifications';
|
||||
|
||||
import {CANCEL_UPGRADE, UPDATE_AVAILABLE, UPDATE_DOWNLOADED, CHECK_FOR_UPDATES, UPDATE_SHORTCUT_MENU, UPDATE_PROGRESS} from 'common/communication';
|
||||
import {
|
||||
CANCEL_UPGRADE,
|
||||
UPDATE_AVAILABLE,
|
||||
UPDATE_DOWNLOADED,
|
||||
CHECK_FOR_UPDATES,
|
||||
UPDATE_SHORTCUT_MENU,
|
||||
UPDATE_PROGRESS,
|
||||
NO_UPDATE_AVAILABLE,
|
||||
CANCEL_UPDATE_DOWNLOAD,
|
||||
UPDATE_REMIND_LATER,
|
||||
} from 'common/communication';
|
||||
import Config from 'common/config';
|
||||
|
||||
import WindowManager from './windows/windowManager';
|
||||
|
||||
const NEXT_NOTIFY = 86400000; // 24 hours
|
||||
const NEXT_CHECK = 3600000; // 1 hour
|
||||
|
||||
@@ -44,12 +52,15 @@ const appIcon = nativeImage.createFromPath(appIconURL);
|
||||
**/
|
||||
|
||||
export class UpdateManager {
|
||||
cancellationToken?: CancellationToken;
|
||||
lastNotification?: NodeJS.Timeout;
|
||||
lastCheck?: NodeJS.Timeout;
|
||||
versionAvailable?: string;
|
||||
versionDownloaded?: string;
|
||||
|
||||
constructor() {
|
||||
this.cancellationToken = new CancellationToken();
|
||||
|
||||
autoUpdater.on('error', (err: Error) => {
|
||||
log.error(`[Mattermost] There was an error while trying to update: ${err}`);
|
||||
});
|
||||
@@ -70,7 +81,7 @@ export class UpdateManager {
|
||||
});
|
||||
|
||||
autoUpdater.on('download-progress', (progress: ProgressInfo) => {
|
||||
WindowManager.sendToRenderer(UPDATE_PROGRESS, progress.total, progress.delta, progress.transferred, progress.percent, progress.bytesPerSecond);
|
||||
ipcMain.emit(UPDATE_PROGRESS, null, progress);
|
||||
});
|
||||
|
||||
ipcMain.on(CANCEL_UPGRADE, () => {
|
||||
@@ -80,6 +91,9 @@ export class UpdateManager {
|
||||
ipcMain.on(CHECK_FOR_UPDATES, () => {
|
||||
this.checkForUpdates(true);
|
||||
});
|
||||
|
||||
ipcMain.on(CANCEL_UPDATE_DOWNLOAD, this.handleCancelDownload);
|
||||
ipcMain.on(UPDATE_REMIND_LATER, this.handleRemindLater);
|
||||
}
|
||||
|
||||
notify = (): void => {
|
||||
@@ -95,12 +109,12 @@ export class UpdateManager {
|
||||
}
|
||||
|
||||
notifyUpgrade = (): void => {
|
||||
WindowManager.sendToRenderer(UPDATE_AVAILABLE, this.versionAvailable);
|
||||
ipcMain.emit(UPDATE_AVAILABLE, null, this.versionAvailable);
|
||||
displayUpgrade(this.versionAvailable || 'unknown', this.handleDownload);
|
||||
}
|
||||
|
||||
notifyDownloaded = (): void => {
|
||||
WindowManager.sendToRenderer(UPDATE_DOWNLOADED, this.versionDownloaded);
|
||||
ipcMain.emit(UPDATE_DOWNLOADED, null, this.versionDownloaded);
|
||||
displayRestartToUpgrade(this.versionDownloaded || 'unknown', this.handleUpdate);
|
||||
}
|
||||
|
||||
@@ -108,23 +122,16 @@ export class UpdateManager {
|
||||
if (this.lastCheck) {
|
||||
clearTimeout(this.lastCheck);
|
||||
}
|
||||
dialog.showMessageBox({
|
||||
title: app.name,
|
||||
message: localizeMessage('main.autoUpdater.download.dialog.message', 'New desktop version available'),
|
||||
detail: localizeMessage('main.autoUpdater.download.dialog.detail', 'A new version of the {appName} Desktop App is available for you to download and install now.', {appName: app.name}),
|
||||
icon: appIcon,
|
||||
buttons: [
|
||||
localizeMessage('main.autoUpdater.download.dialog.button.download', 'Download'),
|
||||
localizeMessage('main.autoUpdater.download.dialog.button.remindMeLater', 'Remind me Later'),
|
||||
],
|
||||
type: 'info',
|
||||
defaultId: 0,
|
||||
cancelId: 1,
|
||||
}).then(({response}) => {
|
||||
if (response === 0) {
|
||||
autoUpdater.downloadUpdate();
|
||||
}
|
||||
});
|
||||
autoUpdater.downloadUpdate(this.cancellationToken);
|
||||
}
|
||||
|
||||
handleCancelDownload = (): void => {
|
||||
this.cancellationToken?.cancel();
|
||||
this.cancellationToken = new CancellationToken();
|
||||
}
|
||||
|
||||
handleRemindLater = (): void => {
|
||||
// TODO
|
||||
}
|
||||
|
||||
handleOnQuit = (): void => {
|
||||
@@ -134,27 +141,12 @@ export class UpdateManager {
|
||||
}
|
||||
|
||||
handleUpdate = (): void => {
|
||||
dialog.showMessageBox({
|
||||
title: app.name,
|
||||
message: localizeMessage('main.autoUpdater.update.dialog.message', 'A new version is ready to install'),
|
||||
detail: localizeMessage('main.autoUpdater.update.dialog.detail', 'A new version of the {appName} Desktop App is ready to install.', {appName: app.name}),
|
||||
icon: appIcon,
|
||||
buttons: [
|
||||
localizeMessage('main.autoUpdater.update.dialog.button.restartAndUpdate', 'Restart and Update'),
|
||||
localizeMessage('main.autoUpdater.update.dialog.button.remindMeLater', 'Remind me Later'),
|
||||
],
|
||||
type: 'info',
|
||||
defaultId: 0,
|
||||
cancelId: 1,
|
||||
}).then(({response}) => {
|
||||
if (response === 0) {
|
||||
autoUpdater.quitAndInstall();
|
||||
}
|
||||
});
|
||||
autoUpdater.quitAndInstall();
|
||||
}
|
||||
|
||||
displayNoUpgrade = (): void => {
|
||||
const version = app.getVersion();
|
||||
ipcMain.emit(NO_UPDATE_AVAILABLE);
|
||||
dialog.showMessageBox({
|
||||
title: app.name,
|
||||
icon: appIcon,
|
||||
@@ -177,7 +169,12 @@ export class UpdateManager {
|
||||
if (manually) {
|
||||
autoUpdater.once('update-not-available', this.displayNoUpgrade);
|
||||
}
|
||||
autoUpdater.checkForUpdates().catch((reason) => {
|
||||
autoUpdater.checkForUpdates().then((result) => {
|
||||
if (!result?.updateInfo) {
|
||||
ipcMain.emit(NO_UPDATE_AVAILABLE);
|
||||
}
|
||||
}).catch((reason) => {
|
||||
ipcMain.emit(NO_UPDATE_AVAILABLE);
|
||||
log.error(`[Mattermost] Failed to check for updates: ${reason}`);
|
||||
});
|
||||
this.lastCheck = setTimeout(() => this.checkForUpdates(false), NEXT_CHECK);
|
||||
|
Reference in New Issue
Block a user