Merge pull request #597 from hashicorp/fix-desktop-about

fix: about dialog should display properly

ui/desktop/electron-app/src/cli/path.js

@@ -6,5 +6,5 @@ module.exports = {
   path: () => {
     const name = isWindows() ? 'boundary.exe' : 'boundary';
     return path.resolve(__dirname, '..', '..', 'cli', name);
-  }
+  },
 };

ui/desktop/electron-app/src/config/menu.js

@@ -11,17 +11,18 @@ const generateMenuTemplate = () => {
     const cliVersion = version().formatted;
     const copyright = config.copyright;
 
-    const dialogOpts = {
+    dialog.showMessageBox({
       type: 'none',
       message: config.productName,
       detail: `${appVersion}\n${appCommit}\n\n${cliVersion}\n\n${copyright}`,
+    });
   };
-    dialog.showMessageBox(dialogOpts);
-  }
 
   return [
     // { role: 'appMenu' }
-    ...(isMac() ? [{
+    ...(isMac()
+      ? [
+          {
             label: 'Boundary',
             submenu: [
               // { role: 'about' },
@@ -43,7 +44,9 @@ const generateMenuTemplate = () => {
               { type: 'separator' },
               { role: 'quit' },
             ],
-    }] : []),
+          },
+        ]
+      : []),
     // { role: 'fileMenu' }
     {
       label: 'File',
@@ -59,23 +62,18 @@ const generateMenuTemplate = () => {
         { role: 'cut' },
         { role: 'copy' },
         { role: 'paste' },
-        ...(isMac() ? [
+        ...(isMac()
+          ? [
               { role: 'pasteAndMatchStyle' },
               { role: 'delete' },
               { role: 'selectAll' },
               { type: 'separator' },
               {
                 label: 'Speech',
-            submenu: [
-              { role: 'startspeaking' },
-              { role: 'stopspeaking' }
+                submenu: [{ role: 'startspeaking' }, { role: 'stopspeaking' }],
+              },
             ]
-          }
-        ] : [
-          { role: 'delete' },
-          { type: 'separator' },
-          { role: 'selectAll' }
-        ]),
+          : [{ role: 'delete' }, { type: 'separator' }, { role: 'selectAll' }]),
       ],
     },
     // { role: 'viewMenu' }
@@ -98,14 +96,14 @@ const generateMenuTemplate = () => {
       submenu: [
         { role: 'minimize' },
         { role: 'zoom' },
-        ...(isMac() ? [
+        ...(isMac()
+          ? [
               { type: 'separator' },
               { role: 'front' },
               { type: 'separator' },
-          { role: 'window' }
-        ] : [
-          { role: 'close' }
-        ])
+              { role: 'window' },
+            ]
+          : [{ role: 'close' }]),
       ],
     },
     {
@@ -115,13 +113,15 @@ const generateMenuTemplate = () => {
           label: 'Documentation',
           click: () => shell.openExternal('https://www.boundaryproject.io'),
         },
-        ...(isWindows() ? [
+        ...(isWindows()
+          ? [
               // { role: 'about' },
               {
                 label: `About ${config.productName}`,
                 click: aboutDialog,
               },
-        ] : [])
+            ]
+          : []),
       ],
     },
   ];

ui/desktop/electron-app/src/helpers/spawn-promise.js

@@ -67,7 +67,7 @@ module.exports = {
    * @return {string}
    */
   spawnSync(command) {
-    const childProcess = spawnSync(path(), command, { shell: isWindows() });
+    const childProcess = spawnSync(path(), command);
     const rawOutput = childProcess.output.toString();
     return rawOutput;
   },