[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’

test/specs/app_test.js

@@ -82,7 +82,8 @@ describe('application', function desc() {
   });
 
   it('should upgrade v0 config file', async () => {
-    const settings = require('../../src/common/settings').default;
+    const Config = require('../../src/common/config').default;
+    const config = new Config(env.configFilePath);
     fs.writeFileSync(env.configFilePath, JSON.stringify({
       url: env.mattermostURL,
     }));
@@ -92,8 +93,8 @@ describe('application', function desc() {
     url.should.match(/\/index.html$/);
 
     const str = fs.readFileSync(env.configFilePath, 'utf8');
-    const config = JSON.parse(str);
-    config.version.should.equal(settings.version);
+    const localConfigData = JSON.parse(str);
+    localConfigData.version.should.equal(config.defaultData.version);
   });
 
   it.skip('should be stopped when the app instance already exists', (done) => {

test/specs/browser/settings_test.js

@@ -216,18 +216,18 @@ describe('browser/settings.html', function desc() {
           await this.app.client.
             loadSettingsPage().
             click('#inputShowTrayIcon').
-            click('input[value="light"]').
-            pause(700); // wait auto-save
-
-          const config0 = JSON.parse(fs.readFileSync(env.configFilePath, 'utf-8'));
-          config0.trayIconTheme.should.equal('light');
-
-          await this.app.client.
             click('input[value="dark"]').
             pause(700); // wait auto-save
 
+          const config0 = JSON.parse(fs.readFileSync(env.configFilePath, 'utf-8'));
+          config0.trayIconTheme.should.equal('dark');
+
+          await this.app.client.
+            click('input[value="light"]').
+            pause(700); // wait auto-save
+
           const config1 = JSON.parse(fs.readFileSync(env.configFilePath, 'utf-8'));
-          config1.trayIconTheme.should.equal('dark');
+          config1.trayIconTheme.should.equal('light');
         });
       });
     });

test/specs/settings_test.js

@@ -1,50 +0,0 @@
-// Copyright (c) 2015-2016 Yuya Ochiai
-// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-import settings from '../../src/common/settings';
-import buildConfig from '../../src/common/config/buildConfig';
-import defaultPreferences from '../../src/common/config/defaultPreferences';
-import pastDefaultPreferences from '../../src/common/config/pastDefaultPreferences';
-
-describe('common/settings.js', () => {
-  it('should upgrade v0 config file', () => {
-    const v0Config = {
-      url: 'https://example.com/team',
-    };
-    const config = settings.upgrade(v0Config);
-    config.teams.length.should.equal(1);
-    config.teams[0].url.should.equal(v0Config.url);
-    config.version.should.equal(settings.version);
-  });
-
-  it('should merge teams with buildConfig.defaultTeams', () => {
-    const teams = [
-      {
-        name: 'test',
-        url: 'https://example.com',
-      },
-    ];
-
-    const mergedTeams = settings.mergeDefaultTeams(teams);
-    mergedTeams.should.deep.equal([
-      {
-        name: 'test',
-        url: 'https://example.com',
-      },
-      ...buildConfig.defaultTeams,
-    ]);
-  });
-});
-
-describe('common/config/', () => {
-  it('pastDefaultPreferences should have each past version of defaultPreferences', () => {
-    for (let version = 0; version <= defaultPreferences.version; version++) {
-      pastDefaultPreferences[`${version}`].should.exist;
-    }
-  });
-
-  it('defaultPreferences equal to one of pastDefaultPreferences', () => {
-    const pastPreferences = pastDefaultPreferences[`${defaultPreferences.version}`];
-    pastPreferences.should.deep.equal(defaultPreferences);
-  });
-});