chore: code cleanup for tray menu, plus wording and placement updates

Author: starpit

plugins/plugin-codeflare/src/tray/main.ts

@@ -14,16 +14,11 @@
  * limitations under the License.
  */
 
-import open from "open"
 import { join } from "path"
-import { Menu } from "electron"
 import { CreateWindowFunction } from "@kui-shell/core"
 
-import profilesMenu from "./profiles"
-import { bugIcon, powerOffIcon } from "./icons"
-
+import buildContextMenu from "./menus"
 import { productName } from "@kui-shell/client/config.d/name.json"
-import { bugs, version } from "@kui-shell/client/package.json"
 
 // these our are tray menu icons; the electron api specifies that if
 // the files are named fooTemplate, then it will take care of
@@ -35,32 +30,6 @@ import icon2x from "@kui-shell/client/icons/png/codeflareTemplate@2x.png"
 // somewhere
 let tray: null | InstanceType<typeof import("electron").Tray> = null
 
-/** @return an Electron `Menu` model for our tray menu */
-async function buildContextMenu(createWindow: CreateWindowFunction): Promise<Menu> {
-  const { Menu } = await import("electron")
-
-  const contextMenu = Menu.buildFromTemplate([
-    { label: `CodeFlare v${version}`, click: () => createWindow([]) },
-    { type: "separator" },
-    await profilesMenu(createWindow),
-    { type: "separator" },
-    /* {
-      label: `Test new window`,
-      click: async () => {
-        try {
-          createWindow(["echo", "hello"])
-        } catch (err) {
-          console.error(err)
-        }
-      },
-    }, */
-    { label: `Report a Bug`, icon: bugIcon, click: () => open(bugs.url) },
-    { label: `Quit ${productName}`, icon: powerOffIcon, role: "quit" },
-  ])
-
-  return contextMenu
-}
-
 /**
  * This is the logic that will be executed in the *electron-main*
  * process for tray menu registration. This will be invoked by our

plugins/plugin-codeflare/src/tray/menus/index.ts

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2022 The Kubernetes Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { CreateWindowFunction } from "@kui-shell/core"
+
+import { productName } from "@kui-shell/client/config.d/name.json"
+import { bugs, homepage, version } from "@kui-shell/client/package.json"
+
+import profilesMenu from "./profiles"
+import { bugIcon, powerOffIcon } from "../icons"
+
+/** @return an Electron `Menu` model for our tray menu */
+export default async function buildContextMenu(createWindow: CreateWindowFunction): Promise<import("electron").Menu> {
+  const { Menu } = await import("electron")
+
+  const contextMenu = Menu.buildFromTemplate([
+    { label: `Open CodeFlare`, click: () => createWindow([]) },
+    { type: "separator" },
+    await profilesMenu(createWindow),
+    { type: "separator" },
+    { label: `Version ${version}`, enabled: false },
+    { label: `Report a Bug`, icon: bugIcon, click: () => import("open").then((_) => _.default(bugs.url)) },
+    { label: `About CodeFlare`, click: () => import("open").then((_) => _.default(homepage)) },
+    { type: "separator" },
+    { label: `Quit ${productName}`, icon: powerOffIcon, role: "quit" },
+  ])
+
+  return contextMenu
+}

plugins/plugin-codeflare/src/tray/profiles.ts renamed to plugins/plugin-codeflare/src/tray/menus/profiles.ts

@@ -18,8 +18,8 @@ import { Choices, Profiles } from "madwizard"
 import { MenuItemConstructorOptions } from "electron"
 import { CreateWindowFunction } from "@kui-shell/core"
 
-import windowOptions from "./window"
-import { profileIcon, bootIcon, shutDownIcon } from "./icons"
+import windowOptions from "../window"
+import { profileIcon, bootIcon, shutDownIcon } from "../icons"
 
 /** Handler for booting up a profile */
 async function boot(profile: string, createWindow: CreateWindowFunction) {