hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Migrate some application menu items to injectables

Browse Source 
Co-authored-by: Janne Savolainen <janne.savolainen@live.fi>

Signed-off-by: Iku-turso <mikko.aspiala@gmail.com>
This commit is contained in:
Iku-turso 2022-10-03 14:06:15 +03:00 committed by Janne Savolainen
parent 18c2cdf851
commit 88ea157352
No known key found for this signature in database
GPG Key ID: 8C6CFB2FFFE8F68A
28 changed files with 805 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/extensions/lens-main-extension.ts
View File

@ -6,7 +6,7 @@
import { LensExtension, lensExtensionDependencies } from "./lens-extension";
import type { CatalogEntity } from "../common/catalog";
import type { IObservableArray } from "mobx";
import type { MenuRegistration } from "../main/menu/menu-registration";
import type { MenuRegistration } from "../features/application-menu/main/menu-registration";
import type { TrayMenuRegistration } from "../main/tray/tray-menu-registration";
import type { ShellEnvModifier } from "../main/shell-session/shell-env-modifier/shell-env-modifier-registration";
import type { LensMainExtensionDependencies } from "./lens-extension-set-dependencies";

399
src/features/application-menu/__snapshots__/application-menu.test.ts.snap Normal file
View File

@ -0,0 +1,399 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`application-menu given enough time passes populates application menu janne 1`] = `
Array [
Array [
Array [
Object {
"id": "root",
"label": "some-product-name",
"submenu": Array [
Object {
"id": "primary",
"label": "some-product-name",
"parentId": null,
},
Object {
"click": [Function],
"id": "about",
"label": "About some-product-name",
"parentId": "primary",
},
Object {
"type": "separator",
},
Object {
"accelerator": "CmdOrCtrl+,",
"click": [Function],
"id": "preferences",
"label": "Preferences",
},
Object {
"accelerator": "CmdOrCtrl+Shift+E",
"click": [Function],
"id": "extensions",
"label": "Extensions",
},
Object {
"type": "separator",
},
Object {
"role": "services",
},
Object {
"type": "separator",
},
Object {
"role": "hide",
},
Object {
"role": "hideOthers",
},
Object {
"role": "unhide",
},
Object {
"type": "separator",
},
Object {
"accelerator": "Cmd+Q",
"click": [Function],
"id": "quit",
"label": "Quit",
},
],
},
Object {
"id": "file",
"label": "File",
"submenu": Array [
Object {
"accelerator": "CmdOrCtrl+Shift+A",
"click": [Function],
"id": "add-cluster",
"label": "Add Cluster",
},
Object {
"type": "separator",
},
Object {
"accelerator": "Shift+Cmd+W",
"label": "Close Window",
"role": "close",
},
],
},
Object {
"id": "edit",
"label": "Edit",
"submenu": Array [
Object {
"role": "undo",
},
Object {
"role": "redo",
},
Object {
"type": "separator",
},
Object {
"role": "cut",
},
Object {
"role": "copy",
},
Object {
"role": "paste",
},
Object {
"role": "delete",
},
Object {
"type": "separator",
},
Object {
"role": "selectAll",
},
],
},
Object {
"id": "view",
"label": "View",
"submenu": Array [
Object {
"accelerator": "Shift+CmdOrCtrl+C",
"click": [Function],
"id": "catalog",
"label": "Catalog",
},
Object {
"accelerator": "Shift+CmdOrCtrl+P",
"click": [Function],
"id": "command-palette",
"label": "Command Palette...",
},
Object {
"type": "separator",
},
Object {
"accelerator": "CmdOrCtrl+[",
"click": [Function],
"id": "go-back",
"label": "Back",
},
Object {
"accelerator": "CmdOrCtrl+]",
"click": [Function],
"id": "go-forward",
"label": "Forward",
},
Object {
"accelerator": "CmdOrCtrl+R",
"click": [Function],
"id": "reload",
"label": "Reload",
},
Object {
"role": "toggleDevTools",
},
Object {
"type": "separator",
},
Object {
"role": "resetZoom",
},
Object {
"role": "zoomIn",
},
Object {
"role": "zoomOut",
},
Object {
"type": "separator",
},
Object {
"role": "togglefullscreen",
},
],
},
Object {
"id": "help",
"role": "help",
"submenu": Array [
Object {
"click": [Function],
"id": "welcome",
"label": "Welcome",
},
Object {
"click": [Function],
"id": "documentation",
"label": "Documentation",
},
Object {
"click": [Function],
"id": "support",
"label": "Support",
},
],
},
],
],
]
`;
exports[`application-menu given enough time passes populates application menu lol 1`] = `
Array [
Array [
Array [
Object {
"id": "root",
"label": "some-product-name",
"submenu": Array [
Object {
"click": [Function],
"id": "about",
"label": "About some-product-name",
},
Object {
"type": "separator",
},
Object {
"accelerator": "CmdOrCtrl+,",
"click": [Function],
"id": "preferences",
"label": "Preferences",
},
Object {
"accelerator": "CmdOrCtrl+Shift+E",
"click": [Function],
"id": "extensions",
"label": "Extensions",
},
Object {
"type": "separator",
},
Object {
"role": "services",
},
Object {
"type": "separator",
},
Object {
"role": "hide",
},
Object {
"role": "hideOthers",
},
Object {
"role": "unhide",
},
Object {
"type": "separator",
},
Object {
"accelerator": "Cmd+Q",
"click": [Function],
"id": "quit",
"label": "Quit",
},
],
},
Object {
"id": "file",
"label": "File",
"submenu": Array [
Object {
"accelerator": "CmdOrCtrl+Shift+A",
"click": [Function],
"id": "add-cluster",
"label": "Add Cluster",
},
Object {
"type": "separator",
},
Object {
"accelerator": "Shift+Cmd+W",
"label": "Close Window",
"role": "close",
},
],
},
Object {
"id": "edit",
"label": "Edit",
"submenu": Array [
Object {
"role": "undo",
},
Object {
"role": "redo",
},
Object {
"type": "separator",
},
Object {
"role": "cut",
},
Object {
"role": "copy",
},
Object {
"role": "paste",
},
Object {
"role": "delete",
},
Object {
"type": "separator",
},
Object {
"role": "selectAll",
},
],
},
Object {
"id": "view",
"label": "View",
"submenu": Array [
Object {
"accelerator": "Shift+CmdOrCtrl+C",
"click": [Function],
"id": "catalog",
"label": "Catalog",
},
Object {
"accelerator": "Shift+CmdOrCtrl+P",
"click": [Function],
"id": "command-palette",
"label": "Command Palette...",
},
Object {
"type": "separator",
},
Object {
"accelerator": "CmdOrCtrl+[",
"click": [Function],
"id": "go-back",
"label": "Back",
},
Object {
"accelerator": "CmdOrCtrl+]",
"click": [Function],
"id": "go-forward",
"label": "Forward",
},
Object {
"accelerator": "CmdOrCtrl+R",
"click": [Function],
"id": "reload",
"label": "Reload",
},
Object {
"role": "toggleDevTools",
},
Object {
"type": "separator",
},
Object {
"role": "resetZoom",
},
Object {
"role": "zoomIn",
},
Object {
"role": "zoomOut",
},
Object {
"type": "separator",
},
Object {
"role": "togglefullscreen",
},
],
},
Object {
"id": "help",
"role": "help",
"submenu": Array [
Object {
"click": [Function],
"id": "welcome",
"label": "Welcome",
},
Object {
"click": [Function],
"id": "documentation",
"label": "Documentation",
},
Object {
"click": [Function],
"id": "support",
"label": "Support",
},
],
},
],
],
]
`;

52
src/features/application-menu/application-menu.test.ts Normal file
View File

@ -0,0 +1,52 @@
/**
* Copyright (c) OpenLens Authors. All rights reserved.
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
import type { DiContainer } from "@ogre-tools/injectable";
import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
import populateApplicationMenuInjectable from "./main/populate-application-menu.injectable";
import { advanceFakeTime, useFakeTime } from "../../common/test-utils/use-fake-time";
describe("application-menu", () => {
let builder: ApplicationBuilder;
let mainDi: DiContainer;
let populateApplicationMenuMock: jest.Mock;
beforeEach(async () => {
useFakeTime();
populateApplicationMenuMock = jest.fn();
builder = getApplicationBuilder();
builder.beforeApplicationStart((mainDi) => {
mainDi.override(populateApplicationMenuInjectable, () => populateApplicationMenuMock);
});
// await builder.render();
await builder.startHidden();
mainDi = builder.mainDi;
});
it("when insufficient time passes, does not populate menu items yet", () => {
advanceFakeTime(99);
expect(populateApplicationMenuMock).not.toHaveBeenCalled();
});
describe("given enough time passes", () => {
beforeEach(() => {
advanceFakeTime(100);
});
it("populates application menu", () => {
expect(populateApplicationMenuMock).toHaveBeenCalledWith(expect.any(Array));
});
it("populates application menu lol", () => {
expect(populateApplicationMenuMock.mock.calls).toMatchSnapshot();
});
});
});

93
src/main/menu/application-menu-items.injectable.ts → src/features/application-menu/main/application-menu-items.injectable.ts
View File

@ -3,28 +3,31 @@
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
import { getInjectable } from "@ogre-tools/injectable";
import { docsUrl, supportUrl } from "../../common/vars";
import { broadcastMessage } from "../../common/ipc";
import { docsUrl, supportUrl } from "../../../common/vars";
import { broadcastMessage } from "../../../common/ipc";
import type { MenuItemConstructorOptions } from "electron";
import { webContents } from "electron";
import loggerInjectable from "../../common/logger.injectable";
import loggerInjectable from "../../../common/logger.injectable";
import electronMenuItemsInjectable from "./electron-menu-items.injectable";
import updatingIsEnabledInjectable from "../../features/application-update/main/updating-is-enabled/updating-is-enabled.injectable";
import navigateToPreferencesInjectable from "../../common/front-end-routing/routes/preferences/navigate-to-preferences.injectable";
import navigateToExtensionsInjectable from "../../common/front-end-routing/routes/extensions/navigate-to-extensions.injectable";
import navigateToCatalogInjectable from "../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable";
import navigateToWelcomeInjectable from "../../common/front-end-routing/routes/welcome/navigate-to-welcome.injectable";
import navigateToAddClusterInjectable from "../../common/front-end-routing/routes/add-cluster/navigate-to-add-cluster.injectable";
import stopServicesAndExitAppInjectable from "../stop-services-and-exit-app.injectable";
import isMacInjectable from "../../common/vars/is-mac.injectable";
import updatingIsEnabledInjectable from "../../application-update/main/updating-is-enabled/updating-is-enabled.injectable";
import navigateToPreferencesInjectable from "../../../common/front-end-routing/routes/preferences/navigate-to-preferences.injectable";
import navigateToExtensionsInjectable from "../../../common/front-end-routing/routes/extensions/navigate-to-extensions.injectable";
import navigateToCatalogInjectable from "../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable";
import navigateToWelcomeInjectable from "../../../common/front-end-routing/routes/welcome/navigate-to-welcome.injectable";
import navigateToAddClusterInjectable from "../../../common/front-end-routing/routes/add-cluster/navigate-to-add-cluster.injectable";
import stopServicesAndExitAppInjectable from "../../../main/stop-services-and-exit-app.injectable";
import isMacInjectable from "../../../common/vars/is-mac.injectable";
import { computed } from "mobx";
import showAboutInjectable from "./show-about.injectable";
import reloadCurrentApplicationWindowInjectable from "../start-main-application/lens-window/reload-current-application-window.injectable";
import showApplicationWindowInjectable from "../start-main-application/lens-window/show-application-window.injectable";
import processCheckingForUpdatesInjectable from "../../features/application-update/main/process-checking-for-updates.injectable";
import openLinkInBrowserInjectable from "../../common/utils/open-link-in-browser.injectable";
import appNameInjectable from "../../common/vars/app-name.injectable";
import productNameInjectable from "../../common/vars/product-name.injectable";
import showAboutInjectable from "./menu-items/primary-for-mac/show-about-application/show-about.injectable";
import reloadCurrentApplicationWindowInjectable from "../../../main/start-main-application/lens-window/reload-current-application-window.injectable";
import showApplicationWindowInjectable from "../../../main/start-main-application/lens-window/show-application-window.injectable";
import processCheckingForUpdatesInjectable from "../../application-update/main/process-checking-for-updates.injectable";
import openLinkInBrowserInjectable from "../../../common/utils/open-link-in-browser.injectable";
import appNameInjectable from "../../../common/vars/app-name.injectable";
import productNameInjectable from "../../../common/vars/product-name.injectable";
import applicationMenuItemInjectionToken from "./menu-items/application-menu-item-injection-token";
function ignoreIf(check: boolean, menuItems: MenuItemOpts[]) {
return check ? [] : menuItems;
@ -46,57 +49,35 @@ const applicationMenuItemsInjectable = getInjectable({
const electronMenuItems = di.inject(electronMenuItemsInjectable);
const showAbout = di.inject(showAboutInjectable);
const showApplicationWindow = di.inject(showApplicationWindowInjectable);
const reloadApplicationWindow = di.inject(reloadCurrentApplicationWindowInjectable);
const reloadApplicationWindow = di.inject(
reloadCurrentApplicationWindowInjectable,
);
const navigateToPreferences = di.inject(navigateToPreferencesInjectable);
const navigateToExtensions = di.inject(navigateToExtensionsInjectable);
const navigateToCatalog = di.inject(navigateToCatalogInjectable);
const navigateToWelcome = di.inject(navigateToWelcomeInjectable);
const navigateToAddCluster = di.inject(navigateToAddClusterInjectable);
const stopServicesAndExitApp = di.inject(stopServicesAndExitAppInjectable);
const processCheckingForUpdates = di.inject(processCheckingForUpdatesInjectable);
const processCheckingForUpdates = di.inject(
processCheckingForUpdatesInjectable,
);
const openLinkInBrowser = di.inject(openLinkInBrowserInjectable);
logger.info(`[MENU]: autoUpdateEnabled=${updatingIsEnabled}`);
const menuItems = di
.injectMany(applicationMenuItemInjectionToken)
.filter(x => x.isShown !== false);
return computed((): MenuItemOpts[] => {
const macAppMenu: MenuItemOpts = {
label: appName,
id: "root",
submenu: [
{
label: `About ${productName}`,
id: "about",
click() {
showAbout();
},
},
...ignoreIf(!updatingIsEnabled, [
{
id: "check-for-updates",
label: "Check for updates",
click() {
processCheckingForUpdates("application-menu").then(() => showApplicationWindow());
},
},
]),
{ type: "separator" },
{
label: "Preferences",
accelerator: "CmdOrCtrl+,",
id: "preferences",
click() {
navigateToPreferences();
},
},
{
label: "Extensions",
accelerator: "CmdOrCtrl+Shift+E",
id: "extensions",
click() {
navigateToExtensions();
},
},
{ type: "separator" },
{ role: "services" },
{ type: "separator" },
{ role: "hide" },
@ -113,6 +94,7 @@ const applicationMenuItemsInjectable = getInjectable({
},
],
};
const fileMenu: MenuItemOpts = {
label: "File",
id: "file",
@ -325,9 +307,10 @@ const applicationMenuItemsInjectable = getInjectable({
appMenu.delete("mac");
}
return [...appMenu.values()];
return [...menuItems, ...appMenu.values()];
});
},
});
export default applicationMenuItemsInjectable;

26
src/features/application-menu/main/application-menu-reactivity.injectable.ts Normal file
View File

@ -0,0 +1,26 @@
/**
* Copyright (c) OpenLens Authors. All rights reserved.
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
import { getInjectable } from "@ogre-tools/injectable";
import { autorun } from "mobx";
import applicationMenuItemsInjectable from "./application-menu-items.injectable";
import { getStartableStoppable } from "../../../common/utils/get-startable-stoppable";
import populateApplicationMenuInjectable from "./populate-application-menu.injectable";
const applicationMenuReactivityInjectable = getInjectable({
id: "application-menu-reactivity",
instantiate: (di) => {
const applicationMenuItems = di.inject(applicationMenuItemsInjectable);
const populateApplicationMenu = di.inject(populateApplicationMenuInjectable);
return getStartableStoppable("application-menu-reactivity", () =>
autorun(() => populateApplicationMenu(applicationMenuItems.get()), {
delay: 100,
}),
);
},
});
export default applicationMenuReactivityInjectable;

2
src/main/menu/electron-menu-items.injectable.ts → src/features/application-menu/main/electron-menu-items.injectable.ts
View File

@ -4,7 +4,7 @@
*/
import { getInjectable } from "@ogre-tools/injectable";
import { computed } from "mobx";
import mainExtensionsInjectable from "../../extensions/main-extensions.injectable";
import mainExtensionsInjectable from "../../../extensions/main-extensions.injectable";
const electronMenuItemsInjectable = getInjectable({
id: "electron-menu-items",

6
src/main/menu/electron-menu-items.test.ts → src/features/application-menu/main/electron-menu-items.test.ts
View File

@ -3,13 +3,13 @@
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
import type { DiContainer } from "@ogre-tools/injectable";
import { LensMainExtension } from "../../extensions/lens-main-extension";
import { LensMainExtension } from "../../../extensions/lens-main-extension";
import electronMenuItemsInjectable from "./electron-menu-items.injectable";
import type { IComputedValue } from "mobx";
import { computed, ObservableMap, runInAction } from "mobx";
import type { MenuRegistration } from "./menu-registration";
import { getDiForUnitTesting } from "../getDiForUnitTesting";
import mainExtensionsInjectable from "../../extensions/main-extensions.injectable";
import { getDiForUnitTesting } from "../../../main/getDiForUnitTesting";
import mainExtensionsInjectable from "../../../extensions/main-extensions.injectable";
describe("electron-menu-items", () => {
let di: DiContainer;

28
src/features/application-menu/main/menu-items/application-menu-item-injection-token.ts Normal file
View File

@ -0,0 +1,28 @@
/**
* Copyright (c) OpenLens Authors. All rights reserved.
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
import { getInjectionToken } from "@ogre-tools/injectable";
interface Shared {
parentId: string | null;
orderNumber: number;
isShown?: boolean;
}
export interface ApplicationMenuItem extends Shared {
id: string;
label: string;
click?: () => void;
accelerator?: string;
}
export interface Separator extends Shared {
type: "separator";
}
const applicationMenuItemInjectionToken = getInjectionToken<ApplicationMenuItem | Separator>({
id: "application-menu-item-injection-token",
});
export default applicationMenuItemInjectionToken;

43
src/features/application-menu/main/menu-items/primary-for-mac/check-for-updates/check-for-updates-menu-item.injectable.ts Normal file
View File

@ -0,0 +1,43 @@
/**
* Copyright (c) OpenLens Authors. All rights reserved.
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
import { getInjectable } from "@ogre-tools/injectable";
import applicationMenuItemInjectionToken from "../../application-menu-item-injection-token";
import processCheckingForUpdatesInjectable from "../../../../../application-update/main/process-checking-for-updates.injectable";
import showApplicationWindowInjectable from "../../../../../../main/start-main-application/lens-window/show-application-window.injectable";
import updatingIsEnabledInjectable from "../../../../../application-update/main/updating-is-enabled/updating-is-enabled.injectable";
const checkForUpdatesMenuItemInjectable = getInjectable({
id: "check-for-updates-menu-item",
instantiate: (di) => {
const processCheckingForUpdates = di.inject(
processCheckingForUpdatesInjectable,
);
const showApplicationWindow = di.inject(showApplicationWindowInjectable);
const updatingIsEnabled = di.inject(updatingIsEnabledInjectable);
return {
parentId: "primary-for-mac",
id: "check-for-updates",
orderNumber: 20,
label: "Check for updates",
isShown: updatingIsEnabled,
click: () => {
// Todo: implement using async/await
processCheckingForUpdates("application-menu").then(() =>
showApplicationWindow(),
);
},
};
},
injectionToken: applicationMenuItemInjectionToken,
});
export default checkForUpdatesMenuItemInjectable;

31
src/features/application-menu/main/menu-items/primary-for-mac/navigate-to-extensions/navigate-to-extensions-menu-item.injectable.ts Normal file
View File

@ -0,0 +1,31 @@
/**
* Copyright (c) OpenLens Authors. All rights reserved.
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
import { getInjectable } from "@ogre-tools/injectable";
import applicationMenuItemInjectionToken from "../../application-menu-item-injection-token";
import navigateToExtensionsInjectable from "../../../../../../common/front-end-routing/routes/extensions/navigate-to-extensions.injectable";
const navigateToExtensionsMenuItem = getInjectable({
id: "navigate-to-extensions-menu-item",
instantiate: (di) => {
const navigateToExtensions = di.inject(navigateToExtensionsInjectable);
return {
parentId: "primary-for-mac",
id: "navigate-to-extensions",
orderNumber: 50,
label: "Extensions",
accelerator: "CmdOrCtrl+Shift+E",
click: () => {
navigateToExtensions();
},
};
},
injectionToken: applicationMenuItemInjectionToken,
});
export default navigateToExtensionsMenuItem;

31
src/features/application-menu/main/menu-items/primary-for-mac/navigate-to-preferences/navigate-to-preferences-menu-item.injectable.ts Normal file
View File

@ -0,0 +1,31 @@
/**
* Copyright (c) OpenLens Authors. All rights reserved.
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
import { getInjectable } from "@ogre-tools/injectable";
import applicationMenuItemInjectionToken from "../../application-menu-item-injection-token";
import navigateToPreferencesInjectable from "../../../../../../common/front-end-routing/routes/preferences/navigate-to-preferences.injectable";
const navigateToPreferencesMenuItem = getInjectable({
id: "navigate-to-preferences-menu-item",
instantiate: (di) => {
const navigateToPreferences = di.inject(navigateToPreferencesInjectable);
return {
parentId: "primary-for-mac",
id: "navigate-to-preferences",
orderNumber: 40,
label: "Preferences",
accelerator: "CmdOrCtrl+,",
click: () => {
navigateToPreferences();
},
};
},
injectionToken: applicationMenuItemInjectionToken,
});
export default navigateToPreferencesMenuItem;

29
src/features/application-menu/main/menu-items/primary-for-mac/primary-menu-item.injectable.ts Normal file
View File

@ -0,0 +1,29 @@
/**
* Copyright (c) OpenLens Authors. All rights reserved.
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
import { getInjectable } from "@ogre-tools/injectable";
import applicationMenuItemInjectionToken from "../application-menu-item-injection-token";
import appNameInjectable from "../../../../../common/vars/app-name.injectable";
import isMacInjectable from "../../../../../common/vars/is-mac.injectable";
const primaryMenuItemInjectable = getInjectable({
id: "primary-application-menu-item",
instantiate: (di) => {
const appName = di.inject(appNameInjectable);
const isMac = di.inject(isMacInjectable);
return {
parentId: null,
id: "primary-for-mac",
orderNumber: 10,
label: appName,
isShown: isMac,
};
},
injectionToken: applicationMenuItemInjectionToken,
});
export default primaryMenuItemInjectable;

22
src/features/application-menu/main/menu-items/primary-for-mac/separator-after-check-for-updates/separator-after-check-for-updates.injectable.ts Normal file
View File

@ -0,0 +1,22 @@
/**
* Copyright (c) OpenLens Authors. All rights reserved.
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
import { getInjectable } from "@ogre-tools/injectable";
import applicationMenuItemInjectionToken from "../../application-menu-item-injection-token";
const separatorAfterCheckForUpdatesInjectable = getInjectable({
id: "separator-after-check-for-updates",
instantiate: () => ({
id: "separator-after-check-for-updates",
parentId: "primary-for-mac",
type: "separator" as const,
orderNumber: 30,
}),
injectionToken: applicationMenuItemInjectionToken,
});
export default separatorAfterCheckForUpdatesInjectable;

24
src/features/application-menu/main/menu-items/primary-for-mac/separator-after-extensions/separator-after-extensions.injectable.ts Normal file
View File

@ -0,0 +1,24 @@
/**
* Copyright (c) OpenLens Authors. All rights reserved.
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
import { getInjectable } from "@ogre-tools/injectable";
import applicationMenuItemInjectionToken from "../../application-menu-item-injection-token";
const id = "separator-after-extensions";
const separatorAfterExtensionsInjectable = getInjectable({
id,
instantiate: () => ({
id,
parentId: "primary-for-mac",
type: "separator" as const,
orderNumber: 70,
}),
injectionToken: applicationMenuItemInjectionToken,
});
export default separatorAfterExtensionsInjectable;

32
src/features/application-menu/main/menu-items/primary-for-mac/show-about-application/about-menu-item.injectable.ts Normal file
View File

@ -0,0 +1,32 @@
/**
* Copyright (c) OpenLens Authors. All rights reserved.
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
import { getInjectable } from "@ogre-tools/injectable";
import productNameInjectable from "../../../../../../common/vars/product-name.injectable";
import showAboutInjectable from "./show-about.injectable";
import applicationMenuItemInjectionToken from "../../application-menu-item-injection-token";
const aboutMenuItemInjectable = getInjectable({
id: "about-menu-item",
instantiate: (di) => {
const productName = di.inject(productNameInjectable);
const showAbout = di.inject(showAboutInjectable);
return {
parentId: "primary-for-mac",
id: "about",
orderNumber: 10,
label: `About ${productName}`,
click() {
showAbout();
},
};
},
injectionToken: applicationMenuItemInjectionToken,
});
export default aboutMenuItemInjectable;

14
src/main/menu/show-about.injectable.ts → src/features/application-menu/main/menu-items/primary-for-mac/show-about-application/show-about.injectable.ts
View File

@ -3,13 +3,13 @@
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
import { getInjectable } from "@ogre-tools/injectable";
import showMessagePopupInjectable from "../electron-app/features/show-message-popup.injectable";
import isWindowsInjectable from "../../common/vars/is-windows.injectable";
import appNameInjectable from "../../common/vars/app-name.injectable";
import productNameInjectable from "../../common/vars/product-name.injectable";
import buildVersionInjectable from "../vars/build-version/build-version.injectable";
import extensionApiVersionInjectable from "../../common/vars/extension-api-version.injectable";
import applicationCopyrightInjectable from "../../common/vars/application-copyright.injectable";
import showMessagePopupInjectable from "../../../../../../main/electron-app/features/show-message-popup.injectable";
import isWindowsInjectable from "../../../../../../common/vars/is-windows.injectable";
import appNameInjectable from "../../../../../../common/vars/app-name.injectable";
import productNameInjectable from "../../../../../../common/vars/product-name.injectable";
import buildVersionInjectable from "../../../../../../main/vars/build-version/build-version.injectable";
import extensionApiVersionInjectable from "../../../../../../common/vars/extension-api-version.injectable";
import applicationCopyrightInjectable from "../../../../../../common/vars/application-copyright.injectable";
const showAboutInjectable = getInjectable({
id: "show-about",

0
src/main/menu/menu-registration.ts → src/features/application-menu/main/menu-registration.ts
View File

0
src/main/menu/menu.ts → src/features/application-menu/main/menu.ts
View File

8
src/features/application-menu/main/populate-application-menu.global-override-for-injectable.ts Normal file
View File

@ -0,0 +1,8 @@
/**
* Copyright (c) OpenLens Authors. All rights reserved.
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
import { getGlobalOverrideForFunction } from "../../../common/test-utils/get-global-override-for-function";
import populateApplicationMenuInjectable from "./populate-application-menu.injectable";
export default getGlobalOverrideForFunction(populateApplicationMenuInjectable);

19
src/features/application-menu/main/populate-application-menu.injectable.ts Normal file
View File

@ -0,0 +1,19 @@
/**
* Copyright (c) OpenLens Authors. All rights reserved.
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
import { getInjectable } from "@ogre-tools/injectable";
import { Menu } from "electron";
import type { MenuItemOpts } from "./application-menu-items.injectable";
const populateApplicationMenuInjectable = getInjectable({
id: "populate-application-menu",
instantiate: () => (applicationMenuItems: MenuItemOpts[]) => {
Menu.setApplicationMenu(Menu.buildFromTemplate(applicationMenuItems));
},
causesSideEffects: true,
});
export default populateApplicationMenuInjectable;

6
src/main/menu/start-application-menu.injectable.ts → src/features/application-menu/main/start-application-menu.injectable.ts
View File

@ -3,15 +3,15 @@
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
import { getInjectable } from "@ogre-tools/injectable";
import applicationMenuInjectable from "./application-menu.injectable";
import { onLoadOfApplicationInjectionToken } from "../start-main-application/runnable-tokens/on-load-of-application-injection-token";
import applicationMenuReactivityInjectable from "./application-menu-reactivity.injectable";
import { onLoadOfApplicationInjectionToken } from "../../../main/start-main-application/runnable-tokens/on-load-of-application-injection-token";
const startApplicationMenuInjectable = getInjectable({
id: "start-application-menu",
instantiate: (di) => {
const applicationMenu = di.inject(
applicationMenuInjectable,
applicationMenuReactivityInjectable,
);
return {

6
src/main/menu/stop-application-menu.injectable.ts → src/features/application-menu/main/stop-application-menu.injectable.ts
View File

@ -3,15 +3,15 @@
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
import { getInjectable } from "@ogre-tools/injectable";
import applicationMenuInjectable from "./application-menu.injectable";
import { beforeQuitOfBackEndInjectionToken } from "../start-main-application/runnable-tokens/before-quit-of-back-end-injection-token";
import applicationMenuReactivityInjectable from "./application-menu-reactivity.injectable";
import { beforeQuitOfBackEndInjectionToken } from "../../../main/start-main-application/runnable-tokens/before-quit-of-back-end-injection-token";
const stopApplicationMenuInjectable = getInjectable({
id: "stop-application-menu",
instantiate: (di) => {
const applicationMenu = di.inject(
applicationMenuInjectable,
applicationMenuReactivityInjectable,
);
return {

2
src/main/electron-app/runnables/setup-ipc-main-handlers/setup-ipc-main-handlers.injectable.ts
View File

@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable";
import { setupIpcMainHandlers } from "./setup-ipc-main-handlers";
import loggerInjectable from "../../../../common/logger.injectable";
import clusterManagerInjectable from "../../../cluster/manager.injectable";
import applicationMenuItemsInjectable from "../../../menu/application-menu-items.injectable";
import applicationMenuItemsInjectable from "../../../../features/application-menu/main/application-menu-items.injectable";
import clusterStoreInjectable from "../../../../common/cluster-store/cluster-store.injectable";
import { onLoadOfApplicationInjectionToken } from "../../../start-main-application/runnable-tokens/on-load-of-application-injection-token";
import operatingSystemThemeInjectable from "../../../theme/operating-system-theme.injectable";

2
src/main/electron-app/runnables/setup-ipc-main-handlers/setup-ipc-main-handlers.ts
View File

@ -15,7 +15,7 @@ import { pushCatalogToRenderer } from "../../../catalog-pusher";
import type { ClusterManager } from "../../../cluster/manager";
import { ResourceApplier } from "../../../resource-applier";
import type { IComputedValue } from "mobx";
import type { MenuItemOpts } from "../../../menu/application-menu-items.injectable";
import type { MenuItemOpts } from "../../../../features/application-menu/main/application-menu-items.injectable";
import { windowActionHandleChannel, windowLocationChangedChannel, windowOpenAppMenuAsContextMenuChannel } from "../../../../common/ipc/window";
import { handleWindowAction, onLocationChange } from "../../../ipc/window";
import { openFilePickingDialogChannel } from "../../../../common/ipc/dialog";

3
src/main/getDiForUnitTesting.ts
View File

@ -31,7 +31,6 @@ import setupLensProxyInjectable from "./start-main-application/runnables/setup-l
import setupShellInjectable from "./start-main-application/runnables/setup-shell.injectable";
import setupSyncingOfWeblinksInjectable from "./start-main-application/runnables/setup-syncing-of-weblinks.injectable";
import stopServicesAndExitAppInjectable from "./stop-services-and-exit-app.injectable";
import applicationMenuInjectable from "./menu/application-menu.injectable";
import isDevelopmentInjectable from "../common/vars/is-development.injectable";
import setupSystemCaInjectable from "./start-main-application/runnables/setup-system-ca.injectable";
import setupDeepLinkingInjectable from "./electron-app/runnables/setup-deep-linking.injectable";
@ -148,8 +147,6 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {})
di.override(stopServicesAndExitAppInjectable, () => () => {});
di.override(lensResourcesDirInjectable, () => "/irrelevant");
di.override(applicationMenuInjectable, () => ({ start: () => {}, stop: () => {} }));
overrideFunctionalInjectables(di, [
getHelmChartVersionsInjectable,
getHelmChartValuesInjectable,

25
src/main/menu/application-menu.injectable.ts
View File

@ -1,25 +0,0 @@
/**
* Copyright (c) OpenLens Authors. All rights reserved.
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
import { getInjectable } from "@ogre-tools/injectable";
import { autorun } from "mobx";
import { buildMenu } from "./menu";
import applicationMenuItemsInjectable from "./application-menu-items.injectable";
import { getStartableStoppable } from "../../common/utils/get-startable-stoppable";
const applicationMenuInjectable = getInjectable({
id: "application-menu",
instantiate: (di) => {
const applicationMenuItems = di.inject(applicationMenuItemsInjectable);
return getStartableStoppable("build-of-application-menu", () =>
autorun(() => buildMenu(applicationMenuItems.get()), {
delay: 100,
}),
);
},
});
export default applicationMenuInjectable;

2
src/main/tray/tray-menu-item/implementations/about-app-tray-item.injectable.ts
View File

@ -4,7 +4,7 @@
*/
import { getInjectable } from "@ogre-tools/injectable";
import showApplicationWindowInjectable from "../../../start-main-application/lens-window/show-application-window.injectable";
import showAboutInjectable from "../../../menu/show-about.injectable";
import showAboutInjectable from "../../../../features/application-menu/main/menu-items/primary-for-mac/show-about-application/show-about.injectable";
import { trayMenuItemInjectionToken } from "../tray-menu-item-injection-token";
import { computed } from "mobx";
import withErrorLoggingInjectable from "../../../../common/utils/with-error-logging/with-error-logging.injectable";

4
src/renderer/components/test-utils/get-application-builder.tsx
View File

@ -20,8 +20,8 @@ import { pipeline } from "@ogre-tools/fp";
import { compact, filter, first, flatMap, get, join, last, map, matches } from "lodash/fp";
import preferenceNavigationItemsInjectable from "../+preferences/preferences-navigation/preference-navigation-items.injectable";
import navigateToPreferencesInjectable from "../../../common/front-end-routing/routes/preferences/navigate-to-preferences.injectable";
import type { MenuItemOpts } from "../../../main/menu/application-menu-items.injectable";
import applicationMenuItemsInjectable from "../../../main/menu/application-menu-items.injectable";
import type { MenuItemOpts } from "../../../features/application-menu/main/application-menu-items.injectable";
import applicationMenuItemsInjectable from "../../../features/application-menu/main/application-menu-items.injectable";
import type { MenuItem, MenuItemConstructorOptions } from "electron";
import type { NavigateToHelmCharts } from "../../../common/front-end-routing/routes/cluster/helm/charts/navigate-to-helm-charts.injectable";
import navigateToHelmChartsInjectable from "../../../common/front-end-routing/routes/cluster/helm/charts/navigate-to-helm-charts.injectable";