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

Fix typo in interface name

Browse Source 
Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
This commit is contained in:
Janne Savolainen 2022-03-31 09:13:29 +03:00
parent 3e3fde3c67
commit a1a088c655
No known key found for this signature in database
GPG Key ID: 8C6CFB2FFFE8F68A
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/initializers/init-ipc-main-handlers/init-ipc-main-handlers.ts
View File

@ -23,12 +23,12 @@ import { getNativeColorTheme } from "../../native-theme";
import { getNativeThemeChannel } from "../../../common/ipc/native-theme"; import { getNativeThemeChannel } from "../../../common/ipc/native-theme";
import type { GetAbsolutePath } from "../../../common/path/get-absolute-path.injectable"; import type { GetAbsolutePath } from "../../../common/path/get-absolute-path.injectable";
import type { IComputedValue } from "mobx"; import type { IComputedValue } from "mobx";
import type { MenuItemsOpts } from "../../menu/application-menu-items.injectable"; import type { MenuItemOpts } from "../../menu/application-menu-items.injectable";
interface Dependencies { interface Dependencies {
directoryForLensLocalStorage: string; directoryForLensLocalStorage: string;
getAbsolutePath: GetAbsolutePath; getAbsolutePath: GetAbsolutePath;
applicationMenuItems: IComputedValue<MenuItemsOpts[]>; applicationMenuItems: IComputedValue<MenuItemOpts[]>;
} }
export const initIpcMainHandlers = ({ applicationMenuItems, directoryForLensLocalStorage, getAbsolutePath }: Dependencies) => () => { export const initIpcMainHandlers = ({ applicationMenuItems, directoryForLensLocalStorage, getAbsolutePath }: Dependencies) => () => {

14
src/main/menu/application-menu-items.injectable.ts
View File

@ -32,7 +32,7 @@ function ignoreIf(check: boolean, menuItems: MenuItemConstructorOptions[]) {
return check ? [] : menuItems; return check ? [] : menuItems;
} }
export interface MenuItemsOpts extends MenuItemConstructorOptions { export interface MenuItemOpts extends MenuItemConstructorOptions {
submenu?: MenuItemConstructorOptions[]; submenu?: MenuItemConstructorOptions[];
} }
@ -46,7 +46,7 @@ const applicationMenuItemsInjectable = getInjectable({
const isAutoUpdateEnabled = di.inject(isAutoUpdateEnabledInjectable); const isAutoUpdateEnabled = di.inject(isAutoUpdateEnabledInjectable);
const electronMenuItems = di.inject(electronMenuItemsInjectable); const electronMenuItems = di.inject(electronMenuItemsInjectable);
return computed((): MenuItemsOpts[] => { return computed((): MenuItemOpts[] => {
// TODO: These injects should happen outside of the computed. // TODO: These injects should happen outside of the computed.
// TODO: Remove temporal dependencies in WindowManager to make sure timing is correct. // TODO: Remove temporal dependencies in WindowManager to make sure timing is correct.
@ -61,7 +61,7 @@ const applicationMenuItemsInjectable = getInjectable({
logger.info(`[MENU]: autoUpdateDisabled=${autoUpdateDisabled}`); logger.info(`[MENU]: autoUpdateDisabled=${autoUpdateDisabled}`);
const macAppMenu: MenuItemsOpts = { const macAppMenu: MenuItemOpts = {
label: appName, label: appName,
id: "root", id: "root",
submenu: [ submenu: [
@ -114,7 +114,7 @@ const applicationMenuItemsInjectable = getInjectable({
}, },
], ],
}; };
const fileMenu: MenuItemsOpts = { const fileMenu: MenuItemOpts = {
label: "File", label: "File",
id: "file", id: "file",
submenu: [ submenu: [
@ -169,7 +169,7 @@ const applicationMenuItemsInjectable = getInjectable({
]), ]),
], ],
}; };
const editMenu: MenuItemsOpts = { const editMenu: MenuItemOpts = {
label: "Edit", label: "Edit",
id: "edit", id: "edit",
submenu: [ submenu: [
@ -184,7 +184,7 @@ const applicationMenuItemsInjectable = getInjectable({
{ role: "selectAll" }, { role: "selectAll" },
], ],
}; };
const viewMenu: MenuItemsOpts = { const viewMenu: MenuItemOpts = {
label: "View", label: "View",
id: "view", id: "view",
submenu: [ submenu: [
@ -252,7 +252,7 @@ const applicationMenuItemsInjectable = getInjectable({
{ role: "togglefullscreen" }, { role: "togglefullscreen" },
], ],
}; };
const helpMenu: MenuItemsOpts = { const helpMenu: MenuItemOpts = {
role: "help", role: "help",
id: "help", id: "help",
submenu: [ submenu: [

6
src/main/menu/menu.ts
View File

@ -6,12 +6,12 @@ import { app, BrowserWindow, dialog, Menu } from "electron";
import { autorun, IComputedValue } from "mobx"; import { autorun, IComputedValue } from "mobx";
import { appName, isWindows, productName } from "../../common/vars"; import { appName, isWindows, productName } from "../../common/vars";
import packageJson from "../../../package.json"; import packageJson from "../../../package.json";
import type { MenuItemsOpts } from "./application-menu-items.injectable"; import type { MenuItemOpts } from "./application-menu-items.injectable";
export type MenuTopId = "mac" | "file" | "edit" | "view" | "help"; export type MenuTopId = "mac" | "file" | "edit" | "view" | "help";
export function initMenu( export function initMenu(
applicationMenuItems: IComputedValue<MenuItemsOpts[]>, applicationMenuItems: IComputedValue<MenuItemOpts[]>,
) { ) {
return autorun(() => buildMenu(applicationMenuItems.get()), { return autorun(() => buildMenu(applicationMenuItems.get()), {
delay: 100, delay: 100,
@ -37,7 +37,7 @@ export function showAbout(browserWindow: BrowserWindow) {
} }
export function buildMenu( export function buildMenu(
applicationMenuItems: MenuItemsOpts[], applicationMenuItems: MenuItemOpts[],
) { ) {
Menu.setApplicationMenu( Menu.setApplicationMenu(
Menu.buildFromTemplate(applicationMenuItems), Menu.buildFromTemplate(applicationMenuItems),

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

@ -29,7 +29,7 @@ import { pipeline } from "@ogre-tools/fp";
import { flatMap, compact, join, get, filter } from "lodash/fp"; import { flatMap, compact, join, get, filter } from "lodash/fp";
import preferenceNavigationItemsInjectable from "../+preferences/preferences-navigation/preference-navigation-items.injectable"; import preferenceNavigationItemsInjectable from "../+preferences/preferences-navigation/preference-navigation-items.injectable";
import navigateToPreferencesInjectable from "../../../common/front-end-routing/routes/preferences/navigate-to-preferences.injectable"; import navigateToPreferencesInjectable from "../../../common/front-end-routing/routes/preferences/navigate-to-preferences.injectable";
import applicationMenuItemsInjectable, { MenuItemsOpts } from "../../../main/menu/application-menu-items.injectable"; import applicationMenuItemsInjectable, { MenuItemOpts } from "../../../main/menu/application-menu-items.injectable";
type Callback = (dis: DiContainers) => void | Promise<void>; type Callback = (dis: DiContainers) => void | Promise<void>;
@ -304,7 +304,7 @@ const toFlatChildren =
({ ({
submenu = [], submenu = [],
...menuItem ...menuItem
}: MenuItemsOpts): (MenuItemsOpts & { path: string })[] => }: MenuItemOpts): (MenuItemOpts & { path: string })[] =>
[ [
{ {
...menuItem, ...menuItem,