[MM-10586] Desktop App Window/Tabs Update (#1056)

* [MM-19054] Added new server tab look and feel, still missing proper hover states and session expired icon

* [MM-19055] Added window controls and removed border for macOS

* [MM-19055] Add dark mode for macOS

* [MM-19054] Added session expired icon

* Test windows titlebar

* Fixed the menu issue and added non-macOS dark mode

* Blank commit

* Fixed a lint issue

* Fixed more lint issues

* Fixed more issues

* New tray icons

* [MM-19603] Drag and drop tabs

* Fixed some assets and fixed build output to include missing assets

* Fixed a couple small issues

* Only show tabs for only 1 server on Mac

* Fixed some more tests

* Fixed another test

* Revert "Fixed another test"

This reverts commit 36040294a71a68663d06996d71eecc5ed23d7014.

* Fixed another test

* Trial and error!

* A bunch of additional fixes

* Fixed a lint issue

* Fixed restore focus on add server tab causing bad UX

* Trial and error on flaky test again

* Fixed some bugs based on PR feedback.

* blank commit to push tests

* Revert "Test windows titlebar"

This reverts commit 9cd46b71b1427b75942434ac49185870d2437b85.

* Remove the rest of the old new titlebar and fixes

* Added three-dot link

* New menu

* Rest of new windows menu and other fixes

* Fixed lint errors

* Added windows 10 style title bar buttons for non mac OS

* Lint fixes and enabled the tab bar regardless of number of servers

* Missed one

* Fixed unicode characters

* Commenting out test that should no longer be applicable

* Removed Windows 10 style titlebar icons and used material design instead

* Fixed a lint issue

* Some small UX fixes

* blank commit

* Fixed an issue where dropping the first tab moves it too far over before snapping into place

* Additional style fixes

* Another small issue fix

* Back to Windows 10 style

* Lint fixes

* Accessible three dot menu

* Lint fixes

* Shrinking tabs when window is too small

* Gradient between tabs and title bar buttons when window is too small

* Add drag to gradient

* Replaced icons, drag and drop cursor sticking fix, slight tab change

* Lint and some mac fixes

* Light theme fix to three dot menu

* Hack for tab sticking to cursor on macOS

* Fixes for the find utility

* Fix for Catalina dark mode

* Revert "Fix for Catalina dark mode"

This reverts commit 45da05dd0f17f46efd1c53fafb92e9c1fd9dd8d9.

* Fixed a couple issues Dean found

* More fixes

* Three dot hover effect to circle

* PR feedback

* Test fixes

* Test and config fixes

* Disable dragging when there are GPO servers

* [MM-20757] Fixed dark mode on debug when running macOS Catalina

* Allow future config versions to use v2 config if launching this version of the app

* Oops

* New titlebar icons, blur for titlebar on inactive

* Lint fix

* Set unfocused opacity to 0.4

* Final FINAL icons

* Fixed closing menu not returning focus to the app

* Lint fix

* Update src/browser/components/TabBar.jsx

Co-Authored-By: Guillermo Vayá <guivaya@gmail.com>

* Update src/main/Validator.js

Co-Authored-By: Guillermo Vayá <guivaya@gmail.com>

* Lint fixes

* Moved react-smooth-dnd fork to MM org and fixed another merge issue

Co-authored-by: mattermod <mattermod@users.noreply.github.com>
Co-authored-by: Guillermo Vayá <guivaya@gmail.com>

src/common/config/RegistryConfig.js

@@ -72,6 +72,7 @@ export default class RegistryConfig extends EventEmitter {
         teams.push({
           name: team.name,
           url: team.value,
+          order: team.order,
         });
       }
       return teams;

src/common/config/defaultPreferences.js

@@ -7,7 +7,7 @@
  * @param {number} version - Scheme version. (Not application version)
  */
 const defaultPreferences = {
-  version: 1,
+  version: 2,
   teams: [],
   showTrayIcon: false,
   trayIconTheme: 'light',
@@ -22,6 +22,7 @@ const defaultPreferences = {
   enableHardwareAcceleration: true,
   autostart: true,
   spellCheckerLocale: 'en-US',
+  darkMode: false,
 };
 
 export default defaultPreferences;

src/common/config/index.js

@@ -144,6 +144,9 @@ export default class Config extends EventEmitter {
   get teams() {
     return this.combinedData.teams;
   }
+  get darkMode() {
+    return this.combinedData.darkMode;
+  }
   get localTeams() {
     return this.localConfigData.teams;
   }
@@ -209,10 +212,16 @@ export default class Config extends EventEmitter {
       configData = this.readFileSync(this.configFilePath);
 
       // validate based on config file version
-      if (configData.version > 0) {
-        configData = Validator.validateV1ConfigData(configData);
+      if (configData.version > 1) {
+        configData = Validator.validateV2ConfigData(configData);
       } else {
-        configData = Validator.validateV0ConfigData(configData);
+        switch (configData.version) {
+        case 1:
+          configData = Validator.validateV1ConfigData(configData);
+          break;
+        default:
+          configData = Validator.validateV0ConfigData(configData);
+        }
       }
       if (!configData) {
         throw new Error('Provided configuration file does not validate, using defaults instead.');

src/common/config/pastDefaultPreferences.js

@@ -7,6 +7,23 @@ const pastDefaultPreferences = {
   0: {
     url: '',
   },
+  1: {
+    version: 1,
+    teams: [],
+    showTrayIcon: false,
+    trayIconTheme: 'light',
+    minimizeToTray: false,
+    notifications: {
+      flashWindow: 0,
+      bounceIcon: false,
+      bounceIconType: 'informational',
+    },
+    showUnreadBadge: true,
+    useSpellChecker: true,
+    enableHardwareAcceleration: true,
+    autostart: true,
+    spellCheckerLocale: 'en-US',
+  },
 };
 
 pastDefaultPreferences[`${defaultPreferences.version}`] = defaultPreferences;

src/common/config/upgradePreferences.js

@@ -19,9 +19,21 @@ function upgradeV0toV1(configV0) {
   return config;
 }
 
+function upgradeV1toV2(configV1) {
+  const config = deepCopy(configV1);
+  config.version = 2;
+  config.teams.forEach((value, index) => {
+    value.order = index;
+  });
+  config.darkMode = false;
+  return config;
+}
+
 export default function upgradeToLatest(config) {
   const configVersion = config.version ? config.version : 0;
   switch (configVersion) {
+  case 1:
+    return upgradeToLatest(upgradeV1toV2(config));
   case 0:
     return upgradeToLatest(upgradeV0toV1(config));
   default: