Introduce competition for tray

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
This commit is contained in:
Janne SavolainenandMikko Aspiala committed 2022-06-03 07:47:25 +03:00
1 parent f674198585
commit 8554eb5c48
8 files changed
+266 -13

No files matched your search

@@ -47,6 +47,7 @@ import historyInjectable from "../../navigation/history.injectable";
import trayMenuItemsInjectable from "../../../main/tray/tray-menu-item/tray-menu-items.injectable";
import type { TrayMenuItem } from "../../../main/tray/tray-menu-item/tray-menu-item-injection-token";
import updateIsAvailableStateInjectable from "../../../main/update-app/update-is-ready-to-be-installed-state.injectable";
import electronTrayInjectable from "../../../main/tray/electron-tray/electron-tray.injectable";
type Callback = (dis: DiContainers) => void | Promise<void>;
@@ -150,6 +151,17 @@ export const getApplicationBuilder = () => {
computed(() => []),
);
let trayMenuItemsStateFake: TrayMenuItem[];
mainDi.override(electronTrayInjectable, () => ({
start: () => {},
stop: () => {},
setMenuItems: (items) => {
trayMenuItemsStateFake = items;
},
}));
let allowedResourcesState: IObservableArray<KubeResource>;
let rendered: RenderResult;
@@ -202,26 +214,18 @@ export const getApplicationBuilder = () => {
tray: {
get: (id: string) => {
const trayMenuItems = mainDi.inject(
trayMenuItemsInjectable,
);
return trayMenuItems.get().find(matches({ id }));
return trayMenuItemsStateFake.find(matches({ id }));
},
click: async (id: string) => {
const trayMenuItems = mainDi.inject(
trayMenuItemsInjectable,
);
const menuItem = pipeline(
trayMenuItems.get(),
trayMenuItemsStateFake,
find((menuItem) => menuItem.id === id),
);
if (!menuItem) {
const availableIds = pipeline(
trayMenuItems.get(),
trayMenuItemsStateFake,
filter(item => !!item.click),
map(item => item.id),
join(", "),