fix: tray profile runs menu always uses fixed default profile

Author: starpit

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

@@ -14,44 +14,49 @@
  * limitations under the License.
  */
 
-import { Choices, Profiles } from "madwizard"
+import { Profiles } from "madwizard"
 import { MenuItemConstructorOptions } from "electron"
 import { CreateWindowFunction } from "@kui-shell/core"
 
 import boot from "./boot"
 import shutdown from "./shutdown"
-import submenuForRuns from "./runs"
+import runs from "./runs"
 
 import UpdateFunction from "../../update"
 import { profileIcon } from "../../icons"
-
 import ProfileStatusWatcher from "../../watchers/profile/status"
 
+/** Memo of `ProfileStatusWatcher`, keyed by profile name */
 const watchers: Record<string, ProfileStatusWatcher> = {}
 
-/** @return a menu for the given profile */
-async function submenuForOneProfile(
-  state: Choices.ChoiceState,
+/** @return menu items for the status of the given `profile` */
+function status(profile: string, updateFunction: UpdateFunction) {
+  if (!watchers[profile]) {
+    watchers[profile] = new ProfileStatusWatcher(profile, updateFunction)
+  }
+  const watcher = watchers[profile]
+
+  return [{ label: "Status", enabled: false }, watcher.head, watcher.workers]
+}
+
+/** @return a menu for the given `profile` */
+async function profileMenu(
+  profile: string,
   createWindow: CreateWindowFunction,
   updateFunction: UpdateFunction
 ): Promise<MenuItemConstructorOptions> {
-  if (!watchers[state.profile.name]) {
-    watchers[state.profile.name] = new ProfileStatusWatcher(state.profile.name, updateFunction)
-  }
-  const watcher = watchers[state.profile.name]
-
   return {
-    label: state.profile.name,
+    label: profile,
     icon: profileIcon,
     submenu: [
-      boot(state.profile.name, createWindow),
-      shutdown(state.profile.name, createWindow),
+      boot(profile, createWindow),
+      shutdown(profile, createWindow),
+
       { type: "separator" },
-      { label: "Status", enabled: false },
-      watcher.head,
-      watcher.workers,
+      ...status(profile, updateFunction),
+
       { type: "separator" },
-      ...(await submenuForRuns(createWindow)),
+      ...(await runs(profile, createWindow)),
     ],
   }
 }
@@ -68,6 +73,6 @@ export default async function profilesMenu(
       label: "Profiles",
       enabled: false,
     },
-    ...(await Promise.all(profiles.map((_) => submenuForOneProfile(_, createWindow, updateFn)))),
+    ...(await Promise.all(profiles.map((_) => profileMenu(_.profile.name, createWindow, updateFn)))),
   ]
 }

plugins/plugin-codeflare/src/tray/menus/profiles/runs.ts

@@ -25,36 +25,44 @@ import windowOptions from "../../window"
 export const RUNS_ERROR = "No runs found"
 
 /** @return a new Window with a dashboard of the selected job run */
-function openRun(runId: string, createWindow: CreateWindowFunction) {
-  const runsDir = Profiles.guidebookJobDataPath({})
+function openRun(profile: string, runId: string, createWindow: CreateWindowFunction) {
+  const runsDir = Profiles.guidebookJobDataPath({ profile })
   createWindow(
     ["codeflare", "dashboard", join(runsDir, runId)],
     windowOptions({ title: "CodeFlare Dashboard: " + runId })
   )
 }
 
 /** @return files of the directory of job runs for a given profile */
-async function readRunsDir(): Promise<string[]> {
+async function readRunsDir(profile: string): Promise<string[]> {
   try {
-    const runsDir = Profiles.guidebookJobDataPath({})
-    return await readdir(runsDir)
+    // TODO do a "full" read with Dirents, so that we have filesystem
+    // timestamps, and sort, so that the `.slice(0, 10)` below pulls
+    // out the most recent runs
+    return await readdir(Profiles.guidebookJobDataPath({ profile }))
   } catch (err) {
     return [RUNS_ERROR]
   }
 }
 
 /** @return a menu for all runs of a profile */
-export function runMenuItems(createWindow: CreateWindowFunction, runs: string[]): MenuItemConstructorOptions[] {
-  return runs.map((run) => ({ label: run, click: () => openRun(run, createWindow) }))
+export function runMenuItems(
+  profile: string,
+  createWindow: CreateWindowFunction,
+  runs: string[]
+): MenuItemConstructorOptions[] {
+  return runs.slice(0, 10).map((run) => ({ label: run, click: () => openRun(profile, run, createWindow) }))
 }
 
+/** @return menu items for the runs of the given profile */
 export default async function submenuForRuns(
+  profile: string,
   createWindow: CreateWindowFunction
 ): Promise<MenuItemConstructorOptions[]> {
-  const runs = await readRunsDir()
+  const runs = await readRunsDir(profile)
 
   return [
     { label: "Recent Runs", enabled: false },
-    ...(runs.length && runs[0] !== RUNS_ERROR ? runMenuItems(createWindow, runs) : [{ label: RUNS_ERROR }]),
+    ...(runs.length && runs[0] !== RUNS_ERROR ? runMenuItems(profile, createWindow, runs) : [{ label: RUNS_ERROR }]),
   ]
 }