[MM-60308] Add a set of "Developer Mode" settings that allow the user to turn off systems or force the app to behave a certain way (#3144)
* Add developer mode manager, implement browser-only mode * Add indicator when developer mode is enabled * Add switch to disable notification storage * Add setting to disable the user activity monitor * Add switchOff method for easily creating switches to disable/enable functionality, added setting to disable context menu * Add setting to force legacy API * Add force new API to remove any support for legacy mode, fix i18n * Fix lint * Use one call to `push`
This commit is contained in:
Devin Binnie
GitHub
parent
61cf759b23
commit
42a0bc4759
|
|
@ -81,6 +81,12 @@
|
|||
"main.menus.app.view": "&View",
|
||||
"main.menus.app.view.actualSize": "Actual Size",
|
||||
"main.menus.app.view.clearCacheAndReload": "Clear Cache and Reload",
|
||||
"main.menus.app.view.developerModeBrowserOnly": "Browser Only Mode",
|
||||
"main.menus.app.view.developerModeDisableContextMenu": "Disable Context Menu",
|
||||
"main.menus.app.view.developerModeDisableNotificationStorage": "Disable Notification Storage",
|
||||
"main.menus.app.view.developerModeDisableUserActivityMonitor": "Disable User Activity Monitor",
|
||||
"main.menus.app.view.developerModeForceLegacyAPI": "Force Legacy API",
|
||||
"main.menus.app.view.developerModeForceNewAPI": "Force New API",
|
||||
"main.menus.app.view.devToolsAppWrapper": "Developer Tools for Application Wrapper",
|
||||
"main.menus.app.view.devToolsCurrentCallWidget": "Developer Tools for Call Widget",
|
||||
"main.menus.app.view.devToolsCurrentServer": "Developer Tools for Current Server",
|
||||
|
|
@ -151,6 +157,7 @@
|
|||
"renderer.components.configureServer.url.urlNotMatched": "The server URL provided does not match the configured Site URL on your Mattermost server. Server version: {serverVersion}",
|
||||
"renderer.components.configureServer.url.urlUpdated": "The server URL provided has been updated to match the configured Site URL on your Mattermost server. Server version: {serverVersion}",
|
||||
"renderer.components.configureServer.url.validating": "Validating...",
|
||||
"renderer.components.developerModeIndicator.tooltip": "Developer mode is enabled. You should only have this enabled if a Mattermost developer has instructed you to.",
|
||||
"renderer.components.errorView.cannotConnectToAppName": "Cannot connect to {appName}",
|
||||
"renderer.components.errorView.havingTroubleConnecting": "We're having trouble connecting to {appName}. We'll continue to try and establish a connection.",
|
||||
"renderer.components.errorView.refreshThenVerify": "If refreshing this page (Ctrl+R or Command+R) does not work please verify that:",
|
||||
|
|
|
|||
|
|
@ -193,3 +193,7 @@ export const GET_MEDIA_ACCESS_STATUS = 'get-media-access-status';
|
|||
export const LEGACY_OFF = 'legacy-off';
|
||||
|
||||
export const GET_NONCE = 'get-nonce';
|
||||
|
||||
export const DEVELOPER_MODE_UPDATED = 'developer-mode-updated';
|
||||
export const IS_DEVELOPER_MODE_ENABLED = 'is-developer-mode-enabled';
|
||||
export const GET_DEVELOPER_MODE_SETTING = 'get-developer-mode-setting';
|
||||
|
|
|
|||
|
|
@ -82,6 +82,7 @@ export class UserActivityMonitor extends EventEmitter {
|
|||
*/
|
||||
stopMonitoring() {
|
||||
clearInterval(this.systemIdleTimeIntervalID);
|
||||
this.systemIdleTimeIntervalID = -1;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ import {
|
|||
TOGGLE_SECURE_INPUT,
|
||||
GET_APP_INFO,
|
||||
SHOW_SETTINGS_WINDOW,
|
||||
DEVELOPER_MODE_UPDATED,
|
||||
} from 'common/communication';
|
||||
import Config from 'common/config';
|
||||
import {Logger} from 'common/log';
|
||||
|
|
@ -43,6 +44,7 @@ import {setupBadge} from 'main/badge';
|
|||
import CertificateManager from 'main/certificateManager';
|
||||
import {configPath, updatePaths} from 'main/constants';
|
||||
import CriticalErrorHandler from 'main/CriticalErrorHandler';
|
||||
import DeveloperMode from 'main/developerMode';
|
||||
import downloadsManager from 'main/downloadsManager';
|
||||
import i18nManager from 'main/i18nManager';
|
||||
import NonceManager from 'main/nonceManager';
|
||||
|
|
@ -405,14 +407,16 @@ async function initializeAfterAppReady() {
|
|||
// Call this to initiate a permissions check for DND state
|
||||
getDoNotDisturb();
|
||||
|
||||
DeveloperMode.switchOff('disableUserActivityMonitor', () => {
|
||||
// listen for status updates and pass on to renderer
|
||||
UserActivityMonitor.on('status', (status) => {
|
||||
log.debug('UserActivityMonitor.on(status)', status);
|
||||
ViewManager.sendToAllViews(USER_ACTIVITY_UPDATE, status.userIsActive, status.idleTime, status.isSystemEvent);
|
||||
});
|
||||
UserActivityMonitor.on('status', onUserActivityStatus);
|
||||
|
||||
// start monitoring user activity (needs to be started after the app is ready)
|
||||
UserActivityMonitor.startMonitoring();
|
||||
}, () => {
|
||||
UserActivityMonitor.off('status', onUserActivityStatus);
|
||||
UserActivityMonitor.stopMonitoring();
|
||||
});
|
||||
|
||||
if (shouldShowTrayIcon()) {
|
||||
Tray.init(Config.trayIconTheme);
|
||||
|
|
@ -430,6 +434,7 @@ async function initializeAfterAppReady() {
|
|||
}
|
||||
|
||||
handleUpdateMenuEvent();
|
||||
DeveloperMode.on(DEVELOPER_MODE_UPDATED, handleUpdateMenuEvent);
|
||||
|
||||
ipcMain.emit('update-dict');
|
||||
|
||||
|
|
@ -445,6 +450,15 @@ async function initializeAfterAppReady() {
|
|||
handleMainWindowIsShown();
|
||||
}
|
||||
|
||||
function onUserActivityStatus(status: {
|
||||
userIsActive: boolean;
|
||||
idleTime: number;
|
||||
isSystemEvent: boolean;
|
||||
}) {
|
||||
log.debug('UserActivityMonitor.on(status)', status);
|
||||
ViewManager.sendToAllViews(USER_ACTIVITY_UPDATE, status.userIsActive, status.idleTime, status.isSystemEvent);
|
||||
}
|
||||
|
||||
function handleStartDownload() {
|
||||
if (updateManager) {
|
||||
updateManager.handleDownload();
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ export let boundsInfoPath = '';
|
|||
export let migrationInfoPath = '';
|
||||
export let downloadsJson = '';
|
||||
export let permissionsJson = '';
|
||||
export let developerModeJson = '';
|
||||
|
||||
export function updatePaths(emit = false) {
|
||||
userDataPath = app.getPath('userData');
|
||||
|
|
@ -33,6 +34,7 @@ export function updatePaths(emit = false) {
|
|||
migrationInfoPath = path.resolve(userDataPath, 'migration-info.json');
|
||||
downloadsJson = path.resolve(userDataPath, 'downloads.json');
|
||||
permissionsJson = path.resolve(userDataPath, 'permissions.json');
|
||||
developerModeJson = path.resolve(userDataPath, 'developerMode.json');
|
||||
|
||||
if (emit) {
|
||||
ipcMain.emit(UPDATE_PATHS);
|
||||
|
|
|
|||
34
src/main/developerMode.test.js
Normal file
34
src/main/developerMode.test.js
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
|
||||
// See LICENSE.txt for license information.
|
||||
|
||||
import {DeveloperMode} from './developerMode';
|
||||
|
||||
jest.mock('fs', () => ({
|
||||
readFileSync: jest.fn(),
|
||||
writeFile: jest.fn(),
|
||||
}));
|
||||
|
||||
jest.mock('electron', () => ({
|
||||
ipcMain: {
|
||||
on: jest.fn(),
|
||||
handle: jest.fn(),
|
||||
},
|
||||
}));
|
||||
|
||||
describe('main/developerMode', () => {
|
||||
it('should toggle values correctly', () => {
|
||||
const developerMode = new DeveloperMode('file.json');
|
||||
|
||||
// Should be false unless developer mode is enabled
|
||||
developerMode.toggle('setting1');
|
||||
expect(developerMode.get('setting1')).toBe(false);
|
||||
|
||||
developerMode.enabled = () => true;
|
||||
|
||||
developerMode.toggle('setting1');
|
||||
expect(developerMode.get('setting1')).toBe(true);
|
||||
|
||||
developerMode.toggle('setting1');
|
||||
expect(developerMode.get('setting1')).toBe(false);
|
||||
});
|
||||
});
|
||||
68
src/main/developerMode.ts
Normal file
68
src/main/developerMode.ts
Normal file
|
|
@ -0,0 +1,68 @@
|
|||
// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
|
||||
// See LICENSE.txt for license information.
|
||||
|
||||
import {ipcMain} from 'electron';
|
||||
import {EventEmitter} from 'events';
|
||||
|
||||
import {DEVELOPER_MODE_UPDATED, IS_DEVELOPER_MODE_ENABLED, UPDATE_PATHS, GET_DEVELOPER_MODE_SETTING} from 'common/communication';
|
||||
import JsonFileManager from 'common/JsonFileManager';
|
||||
import {developerModeJson} from 'main/constants';
|
||||
|
||||
import type {DeveloperSettings} from 'types/settings';
|
||||
|
||||
export class DeveloperMode extends EventEmitter {
|
||||
private json: JsonFileManager<DeveloperSettings>;
|
||||
|
||||
constructor(file: string) {
|
||||
super();
|
||||
this.json = new JsonFileManager(file);
|
||||
|
||||
ipcMain.handle(IS_DEVELOPER_MODE_ENABLED, this.enabled);
|
||||
ipcMain.handle(GET_DEVELOPER_MODE_SETTING, (_, setting) => this.get(setting));
|
||||
}
|
||||
|
||||
enabled = () => process.env.MM_DESKTOP_DEVELOPER_MODE === 'true';
|
||||
|
||||
toggle = (setting: keyof DeveloperSettings) => {
|
||||
if (!this.enabled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.json.setValue(setting, !this.json.getValue(setting));
|
||||
this.emit(DEVELOPER_MODE_UPDATED, {[setting]: this.json.getValue(setting)});
|
||||
};
|
||||
|
||||
get = (setting: keyof DeveloperSettings) => {
|
||||
if (!this.enabled()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return this.json.getValue(setting);
|
||||
};
|
||||
|
||||
switchOff = (
|
||||
setting: keyof DeveloperSettings,
|
||||
onStart: () => void,
|
||||
onStop: () => void,
|
||||
) => {
|
||||
if (!this.get(setting)) {
|
||||
onStart();
|
||||
}
|
||||
|
||||
this.on(DEVELOPER_MODE_UPDATED, (settings: DeveloperSettings) => {
|
||||
if (typeof settings[setting] !== 'undefined') {
|
||||
if (settings[setting]) {
|
||||
onStop();
|
||||
} else {
|
||||
onStart();
|
||||
}
|
||||
}
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
let developerMode = new DeveloperMode(developerModeJson);
|
||||
ipcMain.on(UPDATE_PATHS, () => {
|
||||
developerMode = new DeveloperMode(developerModeJson);
|
||||
});
|
||||
export default developerMode;
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
// See LICENSE.txt for license information.
|
||||
'use strict';
|
||||
|
||||
import type {MenuItemConstructorOptions, MenuItem, WebContents} from 'electron';
|
||||
import type {MenuItemConstructorOptions, MenuItem, BrowserWindow} from 'electron';
|
||||
import {app, ipcMain, Menu, session, shell, clipboard} from 'electron';
|
||||
import log from 'electron-log';
|
||||
|
||||
|
|
@ -15,6 +15,7 @@ import {t} from 'common/utils/util';
|
|||
import {getViewDisplayName} from 'common/views/View';
|
||||
import type {ViewType} from 'common/views/View';
|
||||
import type {UpdateManager} from 'main/autoUpdater';
|
||||
import DeveloperMode from 'main/developerMode';
|
||||
import Diagnostics from 'main/diagnostics';
|
||||
import downloadsManager from 'main/downloadsManager';
|
||||
import {localizeMessage} from 'main/i18nManager';
|
||||
|
|
@ -139,7 +140,7 @@ export function createTemplate(config: Config, updateManager: UpdateManager) {
|
|||
}],
|
||||
});
|
||||
|
||||
const devToolsSubMenu = [
|
||||
const devToolsSubMenu: Electron.MenuItemConstructorOptions[] = [
|
||||
{
|
||||
label: localizeMessage('main.menus.app.view.devToolsAppWrapper', 'Developer Tools for Application Wrapper'),
|
||||
accelerator: (() => {
|
||||
|
|
@ -148,13 +149,13 @@ export function createTemplate(config: Config, updateManager: UpdateManager) {
|
|||
}
|
||||
return 'Ctrl+Shift+I';
|
||||
})(),
|
||||
click(item: Electron.MenuItem, focusedWindow?: WebContents) {
|
||||
click(item: Electron.MenuItem, focusedWindow?: BrowserWindow) {
|
||||
if (focusedWindow) {
|
||||
// toggledevtools opens it in the last known position, so sometimes it goes below the browserview
|
||||
if (focusedWindow.isDevToolsOpened()) {
|
||||
focusedWindow.closeDevTools();
|
||||
if (focusedWindow.webContents.isDevToolsOpened()) {
|
||||
focusedWindow.webContents.closeDevTools();
|
||||
} else {
|
||||
focusedWindow.openDevTools({mode: 'detach'});
|
||||
focusedWindow.webContents.openDevTools({mode: 'detach'});
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -176,6 +177,60 @@ export function createTemplate(config: Config, updateManager: UpdateManager) {
|
|||
});
|
||||
}
|
||||
|
||||
if (DeveloperMode.enabled()) {
|
||||
devToolsSubMenu.push(...[
|
||||
separatorItem,
|
||||
{
|
||||
label: localizeMessage('main.menus.app.view.developerModeBrowserOnly', 'Browser Only Mode'),
|
||||
type: 'checkbox' as const,
|
||||
checked: DeveloperMode.get('browserOnly'),
|
||||
click() {
|
||||
DeveloperMode.toggle('browserOnly');
|
||||
},
|
||||
},
|
||||
{
|
||||
label: localizeMessage('main.menus.app.view.developerModeDisableNotificationStorage', 'Disable Notification Storage'),
|
||||
type: 'checkbox' as const,
|
||||
checked: DeveloperMode.get('disableNotificationStorage'),
|
||||
click() {
|
||||
DeveloperMode.toggle('disableNotificationStorage');
|
||||
},
|
||||
},
|
||||
{
|
||||
label: localizeMessage('main.menus.app.view.developerModeDisableUserActivityMonitor', 'Disable User Activity Monitor'),
|
||||
type: 'checkbox' as const,
|
||||
checked: DeveloperMode.get('disableUserActivityMonitor'),
|
||||
click() {
|
||||
DeveloperMode.toggle('disableUserActivityMonitor');
|
||||
},
|
||||
},
|
||||
{
|
||||
label: localizeMessage('main.menus.app.view.developerModeDisableContextMenu', 'Disable Context Menu'),
|
||||
type: 'checkbox' as const,
|
||||
checked: DeveloperMode.get('disableContextMenu'),
|
||||
click() {
|
||||
DeveloperMode.toggle('disableContextMenu');
|
||||
},
|
||||
},
|
||||
{
|
||||
label: localizeMessage('main.menus.app.view.developerModeForceLegacyAPI', 'Force Legacy API'),
|
||||
type: 'checkbox' as const,
|
||||
checked: DeveloperMode.get('forceLegacyAPI'),
|
||||
click() {
|
||||
DeveloperMode.toggle('forceLegacyAPI');
|
||||
},
|
||||
},
|
||||
{
|
||||
label: localizeMessage('main.menus.app.view.developerModeForceNewAPI', 'Force New API'),
|
||||
type: 'checkbox' as const,
|
||||
checked: DeveloperMode.get('forceNewAPI'),
|
||||
click() {
|
||||
DeveloperMode.toggle('forceNewAPI');
|
||||
},
|
||||
},
|
||||
]);
|
||||
}
|
||||
|
||||
const viewSubMenu = [{
|
||||
label: localizeMessage('main.menus.app.view.find', 'Find..'),
|
||||
accelerator: 'CmdOrCtrl+F',
|
||||
|
|
|
|||
|
|
@ -106,7 +106,9 @@ jest.mock('../windows/mainWindow', () => ({
|
|||
show: jest.fn(),
|
||||
sendToRenderer: jest.fn(),
|
||||
}));
|
||||
|
||||
jest.mock('main/developerMode', () => ({
|
||||
switchOff: (_: string, onStart: () => void) => onStart(),
|
||||
}));
|
||||
jest.mock('main/i18nManager', () => ({
|
||||
localizeMessage: jest.fn(),
|
||||
}));
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ import {getDoNotDisturb as getDarwinDoNotDisturb} from 'macos-notification-state
|
|||
import {PLAY_SOUND, NOTIFICATION_CLICKED, BROWSER_HISTORY_PUSH, OPEN_NOTIFICATION_PREFERENCES} from 'common/communication';
|
||||
import Config from 'common/config';
|
||||
import {Logger} from 'common/log';
|
||||
import DeveloperMode from 'main/developerMode';
|
||||
|
||||
import getLinuxDoNotDisturb from './dnd-linux';
|
||||
import getWindowsDoNotDisturb from './dnd-windows';
|
||||
|
|
@ -22,13 +23,23 @@ import MainWindow from '../windows/mainWindow';
|
|||
const log = new Logger('Notifications');
|
||||
|
||||
class NotificationManager {
|
||||
private mentionsPerChannel: Map<string, Mention> = new Map();
|
||||
private allActiveNotifications: Map<string, Notification> = new Map();
|
||||
private mentionsPerChannel?: Map<string, Mention>;
|
||||
private allActiveNotifications?: Map<string, Notification>;
|
||||
private upgradeNotification?: NewVersionNotification;
|
||||
private restartToUpgradeNotification?: UpgradeNotification;
|
||||
|
||||
constructor() {
|
||||
ipcMain.on(OPEN_NOTIFICATION_PREFERENCES, this.openNotificationPreferences);
|
||||
|
||||
DeveloperMode.switchOff('disableNotificationStorage', () => {
|
||||
this.mentionsPerChannel = new Map();
|
||||
this.allActiveNotifications = new Map();
|
||||
}, () => {
|
||||
this.mentionsPerChannel?.clear();
|
||||
delete this.mentionsPerChannel;
|
||||
this.allActiveNotifications?.clear();
|
||||
delete this.allActiveNotifications;
|
||||
});
|
||||
}
|
||||
|
||||
public async displayMention(title: string, body: string, channelId: string, teamId: string, url: string, silent: boolean, webcontents: Electron.WebContents, soundName: string) {
|
||||
|
|
@ -68,12 +79,12 @@ class NotificationManager {
|
|||
}
|
||||
|
||||
const mention = new Mention(options, channelId, teamId);
|
||||
this.allActiveNotifications.set(mention.uId, mention);
|
||||
this.allActiveNotifications?.set(mention.uId, mention);
|
||||
|
||||
mention.on('click', () => {
|
||||
log.debug('notification click', serverName, mention.uId);
|
||||
|
||||
this.allActiveNotifications.delete(mention.uId);
|
||||
this.allActiveNotifications?.delete(mention.uId);
|
||||
|
||||
// Show the window after navigation has finished to avoid the focus handler
|
||||
// being called before the current channel has updated
|
||||
|
|
@ -87,7 +98,7 @@ class NotificationManager {
|
|||
});
|
||||
|
||||
mention.on('close', () => {
|
||||
this.allActiveNotifications.delete(mention.uId);
|
||||
this.allActiveNotifications?.delete(mention.uId);
|
||||
});
|
||||
|
||||
return new Promise((resolve) => {
|
||||
|
|
@ -107,12 +118,12 @@ class NotificationManager {
|
|||
// On Windows, manually dismiss notifications from the same channel and only show the latest one
|
||||
if (process.platform === 'win32') {
|
||||
const mentionKey = `${mention.teamId}:${mention.channelId}`;
|
||||
if (this.mentionsPerChannel.has(mentionKey)) {
|
||||
if (this.mentionsPerChannel?.has(mentionKey)) {
|
||||
log.debug(`close ${mentionKey}`);
|
||||
this.mentionsPerChannel.get(mentionKey)?.close();
|
||||
this.mentionsPerChannel.delete(mentionKey);
|
||||
this.mentionsPerChannel?.get(mentionKey)?.close();
|
||||
this.mentionsPerChannel?.delete(mentionKey);
|
||||
}
|
||||
this.mentionsPerChannel.set(mentionKey, mention);
|
||||
this.mentionsPerChannel?.set(mentionKey, mention);
|
||||
}
|
||||
const notificationSound = mention.getNotificationSound();
|
||||
if (notificationSound) {
|
||||
|
|
@ -127,7 +138,7 @@ class NotificationManager {
|
|||
|
||||
mention.on('failed', (_, error) => {
|
||||
failed = true;
|
||||
this.allActiveNotifications.delete(mention.uId);
|
||||
this.allActiveNotifications?.delete(mention.uId);
|
||||
clearTimeout(timeout);
|
||||
|
||||
// Special case for Windows - means that notifications are disabled at the OS level
|
||||
|
|
@ -156,7 +167,7 @@ class NotificationManager {
|
|||
}
|
||||
|
||||
const download = new DownloadNotification(fileName, serverName);
|
||||
this.allActiveNotifications.set(download.uId, download);
|
||||
this.allActiveNotifications?.set(download.uId, download);
|
||||
|
||||
download.on('show', () => {
|
||||
flashFrame(true);
|
||||
|
|
@ -164,15 +175,15 @@ class NotificationManager {
|
|||
|
||||
download.on('click', () => {
|
||||
shell.showItemInFolder(path.normalize());
|
||||
this.allActiveNotifications.delete(download.uId);
|
||||
this.allActiveNotifications?.delete(download.uId);
|
||||
});
|
||||
|
||||
download.on('close', () => {
|
||||
this.allActiveNotifications.delete(download.uId);
|
||||
this.allActiveNotifications?.delete(download.uId);
|
||||
});
|
||||
|
||||
download.on('failed', () => {
|
||||
this.allActiveNotifications.delete(download.uId);
|
||||
this.allActiveNotifications?.delete(download.uId);
|
||||
});
|
||||
download.show();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,27 +43,36 @@ import {
|
|||
UNREADS_AND_MENTIONS,
|
||||
LEGACY_OFF,
|
||||
TAB_LOGIN_CHANGED,
|
||||
GET_DEVELOPER_MODE_SETTING,
|
||||
} from 'common/communication';
|
||||
|
||||
import type {ExternalAPI} from 'types/externalAPI';
|
||||
|
||||
const createListener: ExternalAPI['createListener'] = (channel: string, listener: (...args: never[]) => void) => {
|
||||
let legacyEnabled = false;
|
||||
let legacyOff: () => void;
|
||||
|
||||
ipcRenderer.invoke(GET_DEVELOPER_MODE_SETTING, 'forceLegacyAPI').then((force) => {
|
||||
if (force) {
|
||||
return;
|
||||
}
|
||||
|
||||
const createListener: ExternalAPI['createListener'] = (channel: string, listener: (...args: never[]) => void) => {
|
||||
const listenerWithEvent = (_: IpcRendererEvent, ...args: unknown[]) =>
|
||||
listener(...args as never[]);
|
||||
ipcRenderer.on(channel, listenerWithEvent);
|
||||
return () => {
|
||||
ipcRenderer.off(channel, listenerWithEvent);
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
const desktopAPI: DesktopAPI = {
|
||||
const desktopAPI: DesktopAPI = {
|
||||
|
||||
// Initialization
|
||||
isDev: () => ipcRenderer.invoke(GET_IS_DEV_MODE),
|
||||
getAppInfo: () => {
|
||||
// Using this signal as the sign to disable the legacy code, since it is run before the app is rendered
|
||||
if (legacyEnabled) {
|
||||
legacyOff();
|
||||
legacyOff?.();
|
||||
}
|
||||
|
||||
return ipcRenderer.invoke(GET_APP_INFO);
|
||||
|
|
@ -124,8 +133,9 @@ const desktopAPI: DesktopAPI = {
|
|||
|
||||
// Utility
|
||||
unregister: (channel) => ipcRenderer.removeAllListeners(channel),
|
||||
};
|
||||
contextBridge.exposeInMainWorld('desktopAPI', desktopAPI);
|
||||
};
|
||||
contextBridge.exposeInMainWorld('desktopAPI', desktopAPI);
|
||||
});
|
||||
|
||||
// Specific info for the testing environment
|
||||
if (process.env.NODE_ENV === 'test') {
|
||||
|
|
@ -181,18 +191,23 @@ setInterval(() => {
|
|||
webFrame.clearCache();
|
||||
}, CLEAR_CACHE_INTERVAL);
|
||||
|
||||
/****************************************************************************
|
||||
ipcRenderer.invoke(GET_DEVELOPER_MODE_SETTING, 'forceNewAPI').then((force) => {
|
||||
if (force) {
|
||||
return;
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
* LEGACY CODE BELOW
|
||||
* All of this code is deprecated and should be removed eventually
|
||||
* Current it is there to support older versions of the web app
|
||||
****************************************************************************
|
||||
*/
|
||||
|
||||
/**
|
||||
/**
|
||||
* Legacy helper functions
|
||||
*/
|
||||
|
||||
const onLoad = () => {
|
||||
const onLoad = () => {
|
||||
if (document.getElementById('root') === null) {
|
||||
console.warn('The guest is not assumed as mattermost-webapp');
|
||||
return;
|
||||
|
|
@ -202,18 +217,18 @@ const onLoad = () => {
|
|||
ipcRenderer.send(REACT_APP_INITIALIZED);
|
||||
ipcRenderer.invoke(REQUEST_BROWSER_HISTORY_STATUS).then(sendHistoryButtonReturn);
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
const onStorageChanged = (e: StorageEvent) => {
|
||||
const onStorageChanged = (e: StorageEvent) => {
|
||||
if (e.key === '__login__' && e.storageArea === localStorage && e.newValue) {
|
||||
ipcRenderer.send(APP_LOGGED_IN);
|
||||
}
|
||||
if (e.key === '__logout__' && e.storageArea === localStorage && e.newValue) {
|
||||
ipcRenderer.send(APP_LOGGED_OUT);
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
const isReactAppInitialized = () => {
|
||||
const isReactAppInitialized = () => {
|
||||
const initializedRoot =
|
||||
document.querySelector('#root.channel-view') || // React 16 webapp
|
||||
document.querySelector('#root .signup-team__container') || // React 16 login
|
||||
|
|
@ -222,9 +237,9 @@ const isReactAppInitialized = () => {
|
|||
return false;
|
||||
}
|
||||
return initializedRoot.children.length !== 0;
|
||||
};
|
||||
};
|
||||
|
||||
const watchReactAppUntilInitialized = (callback: () => void) => {
|
||||
const watchReactAppUntilInitialized = (callback: () => void) => {
|
||||
let count = 0;
|
||||
const interval = 500;
|
||||
const timeout = 30000;
|
||||
|
|
@ -235,9 +250,9 @@ const watchReactAppUntilInitialized = (callback: () => void) => {
|
|||
callback();
|
||||
}
|
||||
}, interval);
|
||||
};
|
||||
};
|
||||
|
||||
const checkUnread = () => {
|
||||
const checkUnread = () => {
|
||||
if (isReactAppInitialized()) {
|
||||
findUnread();
|
||||
} else {
|
||||
|
|
@ -245,19 +260,19 @@ const checkUnread = () => {
|
|||
findUnread();
|
||||
});
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
const findUnread = () => {
|
||||
const findUnread = () => {
|
||||
const classes = ['team-container unread', 'SidebarChannel unread', 'sidebar-item unread-title'];
|
||||
const isUnread = classes.some((classPair) => {
|
||||
const result = document.getElementsByClassName(classPair);
|
||||
return result && result.length > 0;
|
||||
});
|
||||
ipcRenderer.send(UNREAD_RESULT, isUnread);
|
||||
};
|
||||
};
|
||||
|
||||
let sessionExpired: boolean;
|
||||
const getUnreadCount = () => {
|
||||
let sessionExpired: boolean;
|
||||
const getUnreadCount = () => {
|
||||
// LHS not found => Log out => Count should be 0, but session may be expired.
|
||||
let isExpired;
|
||||
if (document.getElementById('sidebar-left') === null) {
|
||||
|
|
@ -270,15 +285,15 @@ const getUnreadCount = () => {
|
|||
sessionExpired = isExpired;
|
||||
ipcRenderer.send(SESSION_EXPIRED, sessionExpired);
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
/**
|
||||
/**
|
||||
* Legacy message passing code - can be running alongside the new API stuff
|
||||
*/
|
||||
|
||||
// Disabling no-explicit-any for this legacy code
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
window.addEventListener('message', ({origin, data = {}}: {origin?: string; data?: {type?: string; message?: any}} = {}) => {
|
||||
// Disabling no-explicit-any for this legacy code
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
window.addEventListener('message', ({origin, data = {}}: {origin?: string; data?: {type?: string; message?: any}} = {}) => {
|
||||
const {type, message = {}} = data;
|
||||
if (origin !== window.location.origin) {
|
||||
return;
|
||||
|
|
@ -353,11 +368,11 @@ window.addEventListener('message', ({origin, data = {}}: {origin?: string; data?
|
|||
ipcRenderer.send(type);
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
// Legacy support to hold the full channel object so that it can be used for the click event
|
||||
const channels: Map<string, {id: string}> = new Map();
|
||||
ipcRenderer.on(NOTIFICATION_CLICKED, (event, channelId, teamId, url) => {
|
||||
// Legacy support to hold the full channel object so that it can be used for the click event
|
||||
const channels: Map<string, {id: string}> = new Map();
|
||||
ipcRenderer.on(NOTIFICATION_CLICKED, (event, channelId, teamId, url) => {
|
||||
const channel = channels.get(channelId) ?? {id: channelId};
|
||||
channels.delete(channelId);
|
||||
window.postMessage(
|
||||
|
|
@ -371,9 +386,9 @@ ipcRenderer.on(NOTIFICATION_CLICKED, (event, channelId, teamId, url) => {
|
|||
},
|
||||
window.location.origin,
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
ipcRenderer.on(BROWSER_HISTORY_PUSH, (event, pathName) => {
|
||||
ipcRenderer.on(BROWSER_HISTORY_PUSH, (event, pathName) => {
|
||||
window.postMessage(
|
||||
{
|
||||
type: 'browser-history-push-return',
|
||||
|
|
@ -383,9 +398,9 @@ ipcRenderer.on(BROWSER_HISTORY_PUSH, (event, pathName) => {
|
|||
},
|
||||
window.location.origin,
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
const sendHistoryButtonReturn = (status: {canGoBack: boolean; canGoForward: boolean}) => {
|
||||
const sendHistoryButtonReturn = (status: {canGoBack: boolean; canGoForward: boolean}) => {
|
||||
window.postMessage(
|
||||
{
|
||||
type: 'history-button-return',
|
||||
|
|
@ -396,15 +411,15 @@ const sendHistoryButtonReturn = (status: {canGoBack: boolean; canGoForward: bool
|
|||
},
|
||||
window.location.origin,
|
||||
);
|
||||
};
|
||||
};
|
||||
|
||||
ipcRenderer.on(BROWSER_HISTORY_STATUS_UPDATED, (event, canGoBack, canGoForward) => sendHistoryButtonReturn({canGoBack, canGoForward}));
|
||||
ipcRenderer.on(BROWSER_HISTORY_STATUS_UPDATED, (event, canGoBack, canGoForward) => sendHistoryButtonReturn({canGoBack, canGoForward}));
|
||||
|
||||
const sendDesktopSourcesResult = (sources: Array<{
|
||||
const sendDesktopSourcesResult = (sources: Array<{
|
||||
id: string;
|
||||
name: string;
|
||||
thumbnailURL: string;
|
||||
}>) => {
|
||||
}>) => {
|
||||
window.postMessage(
|
||||
{
|
||||
type: DESKTOP_SOURCES_RESULT,
|
||||
|
|
@ -412,9 +427,9 @@ const sendDesktopSourcesResult = (sources: Array<{
|
|||
},
|
||||
window.location.origin,
|
||||
);
|
||||
};
|
||||
};
|
||||
|
||||
const sendCallsJoinedCall = (message: {callID: string; sessionID: string}) => {
|
||||
const sendCallsJoinedCall = (message: {callID: string; sessionID: string}) => {
|
||||
window.postMessage(
|
||||
{
|
||||
type: CALLS_JOINED_CALL,
|
||||
|
|
@ -422,9 +437,9 @@ const sendCallsJoinedCall = (message: {callID: string; sessionID: string}) => {
|
|||
},
|
||||
window.location.origin,
|
||||
);
|
||||
};
|
||||
};
|
||||
|
||||
ipcRenderer.on(CALLS_JOIN_REQUEST, (_, callID) => {
|
||||
ipcRenderer.on(CALLS_JOIN_REQUEST, (_, callID) => {
|
||||
window.postMessage(
|
||||
{
|
||||
type: CALLS_JOIN_REQUEST,
|
||||
|
|
@ -432,18 +447,18 @@ ipcRenderer.on(CALLS_JOIN_REQUEST, (_, callID) => {
|
|||
},
|
||||
window.location.origin,
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
ipcRenderer.on(DESKTOP_SOURCES_MODAL_REQUEST, () => {
|
||||
ipcRenderer.on(DESKTOP_SOURCES_MODAL_REQUEST, () => {
|
||||
window.postMessage(
|
||||
{
|
||||
type: DESKTOP_SOURCES_MODAL_REQUEST,
|
||||
},
|
||||
window.location.origin,
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
ipcRenderer.on(CALLS_WIDGET_SHARE_SCREEN, (_, sourceID, withAudio) => {
|
||||
ipcRenderer.on(CALLS_WIDGET_SHARE_SCREEN, (_, sourceID, withAudio) => {
|
||||
window.postMessage(
|
||||
{
|
||||
type: CALLS_WIDGET_SHARE_SCREEN,
|
||||
|
|
@ -451,9 +466,9 @@ ipcRenderer.on(CALLS_WIDGET_SHARE_SCREEN, (_, sourceID, withAudio) => {
|
|||
},
|
||||
window.location.origin,
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
ipcRenderer.on(CALLS_ERROR, (_, err, callID, errMsg) => {
|
||||
ipcRenderer.on(CALLS_ERROR, (_, err, callID, errMsg) => {
|
||||
window.postMessage(
|
||||
{
|
||||
type: CALLS_ERROR,
|
||||
|
|
@ -461,26 +476,26 @@ ipcRenderer.on(CALLS_ERROR, (_, err, callID, errMsg) => {
|
|||
},
|
||||
window.location.origin,
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
// push user activity updates to the webapp
|
||||
ipcRenderer.on(USER_ACTIVITY_UPDATE, (event, userIsActive, isSystemEvent) => {
|
||||
// push user activity updates to the webapp
|
||||
ipcRenderer.on(USER_ACTIVITY_UPDATE, (event, userIsActive, isSystemEvent) => {
|
||||
if (window.location.origin !== 'null') {
|
||||
window.postMessage({type: USER_ACTIVITY_UPDATE, message: {userIsActive, manual: isSystemEvent}}, window.location.origin);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
/**
|
||||
/**
|
||||
* Legacy functionality that needs to be disabled with the new API
|
||||
*/
|
||||
|
||||
let legacyEnabled = true;
|
||||
ipcRenderer.on(IS_UNREAD, checkUnread);
|
||||
const unreadInterval = setInterval(getUnreadCount, 1000);
|
||||
window.addEventListener('storage', onStorageChanged);
|
||||
window.addEventListener('load', onLoad);
|
||||
legacyEnabled = true;
|
||||
ipcRenderer.on(IS_UNREAD, checkUnread);
|
||||
const unreadInterval = setInterval(getUnreadCount, 1000);
|
||||
window.addEventListener('storage', onStorageChanged);
|
||||
window.addEventListener('load', onLoad);
|
||||
|
||||
function legacyOff() {
|
||||
legacyOff = () => {
|
||||
ipcRenderer.send(LEGACY_OFF);
|
||||
ipcRenderer.off(IS_UNREAD, checkUnread);
|
||||
clearInterval(unreadInterval);
|
||||
|
|
@ -489,4 +504,5 @@ function legacyOff() {
|
|||
|
||||
legacyEnabled = false;
|
||||
console.log('New API preload initialized');
|
||||
}
|
||||
};
|
||||
});
|
||||
|
|
|
|||
|
|
@ -92,6 +92,7 @@ import {
|
|||
GET_MEDIA_ACCESS_STATUS,
|
||||
VIEW_FINISHED_RESIZING,
|
||||
GET_NONCE,
|
||||
IS_DEVELOPER_MODE_ENABLED,
|
||||
} from 'common/communication';
|
||||
|
||||
console.log('Preload initialized');
|
||||
|
|
@ -126,6 +127,7 @@ contextBridge.exposeInMainWorld('desktop', {
|
|||
checkForUpdates: () => ipcRenderer.send(CHECK_FOR_UPDATES),
|
||||
updateConfiguration: (saveQueueItems) => ipcRenderer.send(UPDATE_CONFIGURATION, saveQueueItems),
|
||||
getNonce: () => ipcRenderer.invoke(GET_NONCE),
|
||||
isDeveloperModeEnabled: () => ipcRenderer.invoke(IS_DEVELOPER_MODE_ENABLED),
|
||||
|
||||
updateServerOrder: (serverOrder) => ipcRenderer.send(UPDATE_SERVER_ORDER, serverOrder),
|
||||
updateTabOrder: (serverId, viewOrder) => ipcRenderer.send(UPDATE_TAB_ORDER, serverId, viewOrder),
|
||||
|
|
|
|||
|
|
@ -88,12 +88,16 @@ export function getLocalPreload(file: string) {
|
|||
return path.join(app.getAppPath(), file);
|
||||
}
|
||||
|
||||
export function composeUserAgent() {
|
||||
export function composeUserAgent(browserMode?: boolean) {
|
||||
const baseUserAgent = app.userAgentFallback.split(' ');
|
||||
|
||||
// filter out the Mattermost tag that gets added earlier on
|
||||
const filteredUserAgent = baseUserAgent.filter((ua) => !ua.startsWith('Mattermost'));
|
||||
|
||||
if (browserMode) {
|
||||
return filteredUserAgent.join(' ');
|
||||
}
|
||||
|
||||
return `${filteredUserAgent.join(' ')} Mattermost/${app.getVersion()}`;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -58,6 +58,9 @@ jest.mock('../utils', () => ({
|
|||
composeUserAgent: () => 'Mattermost/5.0.0',
|
||||
shouldHaveBackBar: jest.fn(),
|
||||
}));
|
||||
jest.mock('main/developerMode', () => ({
|
||||
get: jest.fn(),
|
||||
}));
|
||||
|
||||
const server = new MattermostServer({name: 'server_name', url: 'http://server-1.com'});
|
||||
const view = new MessagingView(server, true);
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ import ServerManager from 'common/servers/serverManager';
|
|||
import {RELOAD_INTERVAL, MAX_SERVER_RETRIES, SECOND, MAX_LOADING_SCREEN_SECONDS} from 'common/utils/constants';
|
||||
import {isInternalURL, parseURL} from 'common/utils/url';
|
||||
import type {MattermostView} from 'common/views/View';
|
||||
import DeveloperMode from 'main/developerMode';
|
||||
import {getServerAPI} from 'main/server/serverAPI';
|
||||
import MainWindow from 'main/windows/mainWindow';
|
||||
|
||||
|
|
@ -52,7 +53,7 @@ export class MattermostBrowserView extends EventEmitter {
|
|||
private atRoot: boolean;
|
||||
private options: BrowserViewConstructorOptions;
|
||||
private removeLoading?: NodeJS.Timeout;
|
||||
private contextMenu: ContextMenu;
|
||||
private contextMenu?: ContextMenu;
|
||||
private status?: Status;
|
||||
private retryLoad?: NodeJS.Timeout;
|
||||
private maxRetries: number;
|
||||
|
|
@ -65,7 +66,7 @@ export class MattermostBrowserView extends EventEmitter {
|
|||
const preload = getLocalPreload('externalAPI.js');
|
||||
this.options = Object.assign({}, options);
|
||||
this.options.webPreferences = {
|
||||
preload,
|
||||
preload: DeveloperMode.get('browserOnly') ? undefined : preload,
|
||||
additionalArguments: [
|
||||
`version=${app.getVersion()}`,
|
||||
`appName=${app.name}`,
|
||||
|
|
@ -99,7 +100,10 @@ export class MattermostBrowserView extends EventEmitter {
|
|||
|
||||
WebContentsEventManager.addWebContentsEventListeners(this.browserView.webContents);
|
||||
|
||||
if (!DeveloperMode.get('disableContextMenu')) {
|
||||
this.contextMenu = new ContextMenu({}, this.browserView);
|
||||
}
|
||||
|
||||
this.maxRetries = MAX_SERVER_RETRIES;
|
||||
|
||||
this.altPressStatus = false;
|
||||
|
|
@ -192,7 +196,7 @@ export class MattermostBrowserView extends EventEmitter {
|
|||
loadURL = this.view.url.toString();
|
||||
}
|
||||
this.log.verbose(`Loading ${loadURL}`);
|
||||
const loading = this.browserView.webContents.loadURL(loadURL, {userAgent: composeUserAgent()});
|
||||
const loading = this.browserView.webContents.loadURL(loadURL, {userAgent: composeUserAgent(DeveloperMode.get('browserOnly'))});
|
||||
loading.then(this.loadSuccess(loadURL)).catch((err) => {
|
||||
if (err.code && err.code.startsWith('ERR_CERT')) {
|
||||
MainWindow.sendToRenderer(LOAD_FAILED, this.id, err.toString(), loadURL.toString());
|
||||
|
|
@ -427,7 +431,7 @@ export class MattermostBrowserView extends EventEmitter {
|
|||
if (!this.browserView || !this.browserView.webContents) {
|
||||
return;
|
||||
}
|
||||
const loading = this.browserView.webContents.loadURL(loadURL, {userAgent: composeUserAgent()});
|
||||
const loading = this.browserView.webContents.loadURL(loadURL, {userAgent: composeUserAgent(DeveloperMode.get('browserOnly'))});
|
||||
loading.then(this.loadSuccess(loadURL)).catch((err) => {
|
||||
if (this.maxRetries-- > 0) {
|
||||
this.loadRetry(loadURL, err);
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@ import {
|
|||
LEGACY_OFF,
|
||||
UNREADS_AND_MENTIONS,
|
||||
TAB_LOGIN_CHANGED,
|
||||
DEVELOPER_MODE_UPDATED,
|
||||
} from 'common/communication';
|
||||
import Config from 'common/config';
|
||||
import {Logger} from 'common/log';
|
||||
|
|
@ -45,10 +46,13 @@ import Utils from 'common/utils/util';
|
|||
import type {MattermostView} from 'common/views/View';
|
||||
import {TAB_MESSAGING} from 'common/views/View';
|
||||
import {flushCookiesStore} from 'main/app/utils';
|
||||
import DeveloperMode from 'main/developerMode';
|
||||
import {localizeMessage} from 'main/i18nManager';
|
||||
import PermissionsManager from 'main/permissionsManager';
|
||||
import MainWindow from 'main/windows/mainWindow';
|
||||
|
||||
import type {DeveloperSettings} from 'types/settings';
|
||||
|
||||
import LoadingScreen from './loadingScreen';
|
||||
import {MattermostBrowserView} from './MattermostBrowserView';
|
||||
import modalManager from './modalManager';
|
||||
|
|
@ -91,6 +95,7 @@ export class ViewManager {
|
|||
ipcMain.on(SWITCH_TAB, (event, viewId) => this.showById(viewId));
|
||||
|
||||
ServerManager.on(SERVERS_UPDATE, this.handleReloadConfiguration);
|
||||
DeveloperMode.on(DEVELOPER_MODE_UPDATED, this.handleDeveloperModeUpdated);
|
||||
}
|
||||
|
||||
private init = () => {
|
||||
|
|
@ -99,6 +104,17 @@ export class ViewManager {
|
|||
this.showInitial();
|
||||
};
|
||||
|
||||
private handleDeveloperModeUpdated = (json: DeveloperSettings) => {
|
||||
log.debug('handleDeveloperModeUpdated', json);
|
||||
|
||||
if (['browserOnly', 'disableContextMenu', 'forceLegacyAPI', 'forceNewAPI'].some((key) => Object.hasOwn(json, key))) {
|
||||
this.views.forEach((view) => view.destroy());
|
||||
this.views = new Map();
|
||||
this.closedViews = new Map();
|
||||
this.init();
|
||||
}
|
||||
};
|
||||
|
||||
getView = (viewId: string) => {
|
||||
return this.views.get(viewId);
|
||||
};
|
||||
|
|
|
|||
36
src/renderer/components/DeveloperModeIndicator.tsx
Normal file
36
src/renderer/components/DeveloperModeIndicator.tsx
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
|
||||
// See LICENSE.txt for license information.
|
||||
|
||||
import classNames from 'classnames';
|
||||
import React from 'react';
|
||||
// eslint-disable-next-line no-restricted-imports
|
||||
import {OverlayTrigger, Tooltip} from 'react-bootstrap';
|
||||
import {FormattedMessage} from 'react-intl';
|
||||
|
||||
import 'renderer/css/components/DeveloperModeIndicator.scss';
|
||||
|
||||
export default function DeveloperModeIndicator({developerMode, darkMode}: {developerMode: boolean; darkMode: boolean}) {
|
||||
if (!developerMode) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return (
|
||||
<OverlayTrigger
|
||||
placement='left'
|
||||
overlay={
|
||||
<Tooltip id='DeveloperModeIndicator__tooltip'>
|
||||
<FormattedMessage
|
||||
id='renderer.components.developerModeIndicator.tooltip'
|
||||
defaultMessage='Developer mode is enabled. You should only have this enabled if a Mattermost developer has instructed you to.'
|
||||
/>
|
||||
</Tooltip>
|
||||
}
|
||||
>
|
||||
<div className={classNames('DeveloperModeIndicator', {darkMode})}>
|
||||
<i className='icon-flask-outline'/>
|
||||
<span className='DeveloperModeIndicator__badge'/>
|
||||
</div>
|
||||
</OverlayTrigger>
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -12,6 +12,7 @@ import {injectIntl} from 'react-intl';
|
|||
import type {UniqueView, UniqueServer} from 'types/config';
|
||||
import type {DownloadedItems} from 'types/downloads';
|
||||
|
||||
import DeveloperModeIndicator from './DeveloperModeIndicator';
|
||||
import DownloadsDropdownButton from './DownloadsDropdown/DownloadsDropdownButton';
|
||||
import ErrorView from './ErrorView';
|
||||
import ExtraBar from './ExtraBar';
|
||||
|
|
@ -55,6 +56,7 @@ type State = {
|
|||
showDownloadsBadge: boolean;
|
||||
hasDownloads: boolean;
|
||||
threeDotsIsFocused: boolean;
|
||||
developerMode: boolean;
|
||||
};
|
||||
|
||||
type TabViewStatus = {
|
||||
|
|
@ -88,6 +90,7 @@ class MainPage extends React.PureComponent<Props, State> {
|
|||
showDownloadsBadge: false,
|
||||
hasDownloads: false,
|
||||
threeDotsIsFocused: false,
|
||||
developerMode: false,
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -263,6 +266,10 @@ class MainPage extends React.PureComponent<Props, State> {
|
|||
}
|
||||
|
||||
window.addEventListener('click', this.handleCloseDropdowns);
|
||||
|
||||
window.desktop.isDeveloperModeEnabled().then((developerMode) => {
|
||||
this.setState({developerMode});
|
||||
});
|
||||
}
|
||||
|
||||
componentWillUnmount() {
|
||||
|
|
@ -471,6 +478,10 @@ class MainPage extends React.PureComponent<Props, State> {
|
|||
/>
|
||||
)}
|
||||
{tabsRow}
|
||||
<DeveloperModeIndicator
|
||||
darkMode={this.props.darkMode}
|
||||
developerMode={this.state.developerMode}
|
||||
/>
|
||||
{downloadsDropdownButton}
|
||||
{window.process.platform !== 'darwin' && this.state.fullScreen &&
|
||||
<span className='title-bar-btns'>
|
||||
|
|
|
|||
54
src/renderer/css/components/DeveloperModeIndicator.scss
Normal file
54
src/renderer/css/components/DeveloperModeIndicator.scss
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
.DeveloperModeIndicator {
|
||||
align-items: center;
|
||||
background: transparent;
|
||||
border-radius: 4px;
|
||||
border: none;
|
||||
cursor: pointer;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
margin: 4px;
|
||||
position: relative;
|
||||
width: 32px;
|
||||
|
||||
i {
|
||||
color: rgba(63, 67, 80, 0.56);
|
||||
cursor: pointer;
|
||||
font-size: 21px;
|
||||
line-height: 21px;
|
||||
}
|
||||
|
||||
&:hover, &:focus {
|
||||
i {
|
||||
color: rgba(63, 67, 80, 0.78);
|
||||
}
|
||||
}
|
||||
|
||||
.DeveloperModeIndicator__badge {
|
||||
background: rgba(210, 75, 78, 1);
|
||||
border-radius: 10px;
|
||||
width: 10px;
|
||||
height: 10px;
|
||||
position: absolute;
|
||||
top: 5px;
|
||||
right: 5px;
|
||||
}
|
||||
|
||||
&.darkMode {
|
||||
i {
|
||||
color: rgba(221, 223, 228, 0.56);
|
||||
}
|
||||
|
||||
&:hover, &:focus {
|
||||
i {
|
||||
color: rgba(221, 223, 228, 0.78);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#DeveloperModeIndicator__tooltip {
|
||||
> .tooltip-inner {
|
||||
max-width: none;
|
||||
}
|
||||
}
|
||||
|
|
@ -8,3 +8,12 @@ export type SaveQueueItem = {
|
|||
key: keyof CombinedConfig;
|
||||
data: CombinedConfig[keyof CombinedConfig];
|
||||
};
|
||||
|
||||
export type DeveloperSettings = {
|
||||
browserOnly?: boolean;
|
||||
disableNotificationStorage?: boolean;
|
||||
disableUserActivityMonitor?: boolean;
|
||||
disableContextMenu?: boolean;
|
||||
forceLegacyAPI?: boolean;
|
||||
forceNewAPI?: boolean;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -45,6 +45,7 @@ declare global {
|
|||
checkForUpdates: () => void;
|
||||
updateConfiguration: (saveQueueItems: SaveQueueItem[]) => void;
|
||||
getNonce: () => Promise<string | undefined>;
|
||||
isDeveloperModeEnabled: () => Promise<boolean>;
|
||||
|
||||
updateServerOrder: (serverOrder: string[]) => Promise<void>;
|
||||
updateTabOrder: (serverId: string, viewOrder: string[]) => Promise<void>;
|
||||
|
|
|
|||
Loading…
Reference in a new issue