[MM-14740] Consolidate configuration to support integration of MSI/GPO (#959)
* config logic consolidation * filter out duplicate servers * build default teams and GPO teams are not editable * tweaks * tweak config architecture to support tests - config needs to load in each process (main and renderer) and then synchronize with each other - finished saving ui functionality * add esdoc comments to new config module * remove old config-related files * revert eslint comment * don’t filter teams, duplicates are allowed * some code review tweaks * Remove unecessary deepCopy * tweak for tests * Skip test for now Can’t seem to get this test to work, even though what is being tested works fine in the actual app. * fix for failing test click of ‘light’ option wasn’t triggering an update as it is selected by default, so flipped the order to first select ‘dark’ and then ‘light’
This commit is contained in:

committed by
William Gathoye

parent
b7b88c4fbb
commit
4137d0ea23
@@ -5,9 +5,6 @@
|
||||
|
||||
import {app, dialog, ipcMain, Menu, shell} from 'electron';
|
||||
|
||||
import settings from '../../common/settings';
|
||||
import buildConfig from '../../common/config/buildConfig';
|
||||
|
||||
function createTemplate(mainWindow, config, isDev) {
|
||||
const settingsURL = isDev ? 'http://localhost:8080/browser/settings.html' : `file://${app.getAppPath()}/browser/settings.html`;
|
||||
|
||||
@@ -42,7 +39,7 @@ function createTemplate(mainWindow, config, isDev) {
|
||||
},
|
||||
}];
|
||||
|
||||
if (buildConfig.enableServerManagement === true) {
|
||||
if (config.enableServerManagement === true) {
|
||||
platformAppMenu.push({
|
||||
label: 'Sign in to Another Server',
|
||||
click() {
|
||||
@@ -189,7 +186,7 @@ function createTemplate(mainWindow, config, isDev) {
|
||||
}],
|
||||
});
|
||||
|
||||
const teams = settings.mergeDefaultTeams(config.teams);
|
||||
const teams = config.teams;
|
||||
const windowMenu = {
|
||||
label: '&Window',
|
||||
submenu: [{
|
||||
@@ -223,11 +220,11 @@ function createTemplate(mainWindow, config, isDev) {
|
||||
};
|
||||
template.push(windowMenu);
|
||||
const submenu = [];
|
||||
if (buildConfig.helpLink) {
|
||||
if (config.helpLink) {
|
||||
submenu.push({
|
||||
label: 'Learn More...',
|
||||
click() {
|
||||
shell.openExternal(buildConfig.helpLink);
|
||||
shell.openExternal(config.helpLink);
|
||||
},
|
||||
});
|
||||
submenu.push(separatorItem);
|
||||
@@ -236,7 +233,7 @@ function createTemplate(mainWindow, config, isDev) {
|
||||
label: `Version ${app.getVersion()}`,
|
||||
enabled: false,
|
||||
});
|
||||
if (buildConfig.enableAutoUpdater) {
|
||||
if (config.enableAutoUpdater) {
|
||||
submenu.push({
|
||||
label: 'Check for Updates...',
|
||||
click() {
|
||||
|
Reference in New Issue
Block a user