Maintain navigation collapsed / expanded status in user settings

Author: rakillen

electron/app/js/ipcRendererPreload.js

@@ -33,6 +33,7 @@ contextBridge.exposeInMainWorld(
           'window-is-ready',
           'set-has-open-dialog',
           'set-divider-location',
+          'set-navigation-collapsed',
           'set-target-type',
           'skip-quickstart-at-startup',
           'log-remote-message'
@@ -87,6 +88,7 @@ contextBridge.exposeInMainWorld(
           'get-https-proxy-url',
           'get-bypass-proxy-hosts',
           'get-divider-locations',
+          'get-navigation-collapsed',
           'get-additional-image-build-commands-file',
           'get-additional-image-build-files',
           'get-java-home',

electron/app/js/userSettings.js

@@ -169,31 +169,30 @@ function setSkipQuickstartAtStartup(value) {
 }
 
 function setDividerLocation(name, percent) {
-  const settings = _getUserSettings();
-
-  let window = settings['window'];
-  if (!window) {
-    window = settings['window'] = {};
-  }
-
+  const window = getOrCreateWindowSettings();
   let dividers = window['dividers'];
   if (!dividers) {
-    dividers = {};
+    dividers = window['dividers'] = {};
   }
   dividers[name] = parseFloat(percent.toFixed(2));
 }
 
 function getDividerLocations() {
-  const settings = _getUserSettings();
-
-  let dividers;
-  let window = settings['window'];
-  if (window) {
-    dividers = window['dividers'];
-  }
+  const window = getWindowSettings();
+  let dividers = window['dividers'];
   return dividers ? dividers : {};
 }
 
+function setNavigationCollapsed(collapsed) {
+  const window = getOrCreateWindowSettings();
+  window['navCollapsed'] = collapsed;
+}
+
+function getNavigationCollapsed() {
+  const window = getWindowSettings();
+  return Boolean(window['navCollapsed']);
+}
+
 function getWindowSize() {
   const settings = _getUserSettings();
 
@@ -217,6 +216,21 @@ function setWindowSize(windowSize) {
   _userSettingsObject = settings;
 }
 
+function getWindowSettings() {
+  const settings = _getUserSettings();
+  const window = settings['window'];
+  return window ? window : {};
+}
+
+function getOrCreateWindowSettings() {
+  const settings = _getUserSettings();
+  let window = settings['window'];
+  if (!window) {
+    window = settings['window'] = {};
+  }
+  return window;
+}
+
 function getUserSettingsDirectory() {
   const i18n = require('./i18next.config');
 
@@ -353,8 +367,10 @@ module.exports = {
   applyUserSettingsFromRemote,
   getDividerLocations,
   getHttpsProxyUrl,
+  getNavigationCollapsed,
   setDividerLocation,
   setHttpsProxyUrl,
+  setNavigationCollapsed,
   getSkipQuickstartAtStartup,
   setSkipQuickstartAtStartup,
   getBypassProxyHosts,

electron/app/main.js

@@ -263,6 +263,10 @@ class Main {
       return userSettings.setDividerLocation(name, percent);
     });
 
+    ipcMain.on('set-navigation-collapsed', (event, collapsed) => {
+      return userSettings.setNavigationCollapsed(collapsed);
+    });
+
     ipcMain.on('set-target-type', (event, targetType) => {
       const window = event.sender.getOwnerBrowserWindow();
       return setTargetType(window, targetType);
@@ -289,6 +293,10 @@ class Main {
       return userSettings.getDividerLocations();
     });
 
+    ipcMain.handle('get-navigation-collapsed', () => {
+      return userSettings.getNavigationCollapsed();
+    });
+
     ipcMain.handle('open-external-link', async (event, link) => {
       this.openExternalLink(link);
     });

webui/src/js/viewModels/app-main.js

@@ -202,8 +202,16 @@ function(accUtils, ko, i18n, project, wktConsole, dialogHelper, viewHelper, Arra
 
     this.collapseNav = () => {
       this.navCollapsed(!this.navCollapsed());
+
+      // update user setting only when nav collapsed is explicitly set.
+      window.api.ipc.send('set-navigation-collapsed', this.navCollapsed());
     };
 
+    // load this once, when app is initialized
+    window.api.ipc.invoke('get-navigation-collapsed').then(collapsed => {
+      this.navCollapsed(collapsed);
+    });
+
     // console section
 
     // view uses 'wktConsole.show' directly