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

Consolidate separators of application menu in single file

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-04 09:30:35 +03:00 committed by Janne Savolainen
parent 88ea157352
commit 31de88dae4
No known key found for this signature in database
GPG Key ID: 8C6CFB2FFFE8F68A
3 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,24 +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 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;

15
src/features/application-menu/main/menu-items/primary-for-mac/separator-after-check-for-updates/separator-after-check-for-updates.injectable.ts → src/features/application-menu/main/menu-items/primary-for-mac/separators/separators.injectable.ts
View File

@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable";
import applicationMenuItemInjectionToken from "../../application-menu-item-injection-token";
const separatorAfterCheckForUpdatesInjectable = getInjectable({
export const separatorAfterCheckForUpdatesInjectable = getInjectable({
id: "separator-after-check-for-updates",
instantiate: () => ({
@ -19,4 +19,15 @@ const separatorAfterCheckForUpdatesInjectable = getInjectable({
injectionToken: applicationMenuItemInjectionToken,
});
export default separatorAfterCheckForUpdatesInjectable;
export const separatorAfterExtensionsInjectable = getInjectable({
id: "separator-after-extensions",
instantiate: () => ({
id: "separator-after-extensions",
parentId: "primary-for-mac",
type: "separator" as const,
orderNumber: 70,
}),
injectionToken: applicationMenuItemInjectionToken,
});

11
src/main/getDiForUnitTesting.ts
View File

@ -5,7 +5,8 @@
import { kebabCase, noop, chunk } from "lodash/fp";
import type { DiContainer, Injectable } from "@ogre-tools/injectable";
import { createContainer } from "@ogre-tools/injectable";
// @ts-ignore
import { createContainer, injectableSymbol } from "@ogre-tools/injectable";
import { Environments, setLegacyGlobalDiForExtensionApi } from "../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
import writeJsonFileInjectable from "../common/fs/write-json-file.injectable";
import readJsonFileInjectable from "../common/fs/read-json-file.injectable";
@ -95,8 +96,12 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {})
di.preventSideEffects();
const injectables: Injectable<any, any, any>[] = (global as any).mainInjectablePaths.map(
(filePath: string) => require(filePath).default,
const injectables: Injectable<any, any, any>[] = (
global as any
).mainInjectablePaths.flatMap((filePath: string) =>
Object.values(require(filePath)).filter(
(maybeInjectable: any) => maybeInjectable.aliasType === injectableSymbol,
),
);
runInAction(() => {