Extract some operation system actions from application menu as injectables

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

Signed-off-by: Iku-turso <mikko.aspiala@gmail.com>

src/features/application-menu/main/application-menu-items.injectable.ts

@@ -25,8 +25,6 @@ import processCheckingForUpdatesInjectable from "../../application-update/main/p
 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[]) {
@@ -78,12 +76,6 @@ const applicationMenuItemsInjectable = getInjectable({
         label: appName,
         id: "root",
         submenu: [
-          { role: "services" },
-          { type: "separator" },
-          { role: "hide" },
-          { role: "hideOthers" },
-          { role: "unhide" },
-          { type: "separator" },
           {
             label: "Quit",
             accelerator: "Cmd+Q",

src/features/application-menu/main/menu-items/application-menu-item-injection-token.ts

@@ -21,7 +21,13 @@ export interface Separator extends Shared {
   type: "separator";
 }
 
-const applicationMenuItemInjectionToken = getInjectionToken<ApplicationMenuItem | Separator>({
+export interface OperationSystemAction extends Shared {
+  role: "services" | "hide" | "hideOthers" | "unhide";
+}
+
+const applicationMenuItemInjectionToken = getInjectionToken<
+  ApplicationMenuItem | Separator | OperationSystemAction
+>({
   id: "application-menu-item-injection-token",
 });
 

src/features/application-menu/main/menu-items/get-application-menu-operation-system-action-injectable.ts

@@ -0,0 +1,25 @@
+/**
+ * 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 type { OperationSystemAction } from "./application-menu-item-injection-token";
+import applicationMenuItemInjectionToken from "./application-menu-item-injection-token";
+
+const getApplicationMenuOperationSystemActionInjectable = ({
+  id,
+  role,
+  ...rest
+}: { id: string } & OperationSystemAction) =>
+  getInjectable({
+    id: `application-menu-operation-system-action/${id}`,
+
+    instantiate: () => ({
+      ...rest,
+      role,
+    }),
+
+    injectionToken: applicationMenuItemInjectionToken,
+  });
+
+export { getApplicationMenuOperationSystemActionInjectable };

src/features/application-menu/main/menu-items/primary-for-mac/operation-system-actions/operation-system-actions.injectable.ts

@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import {
+  getApplicationMenuOperationSystemActionInjectable,
+} from "../../get-application-menu-operation-system-action-injectable";
+
+export const actionForServices = getApplicationMenuOperationSystemActionInjectable({
+  id: "services",
+  parentId: "primary-for-mac",
+  orderNumber: 80,
+  role: "services",
+});
+
+export const actionForHide = getApplicationMenuOperationSystemActionInjectable({
+  id: "hide",
+  parentId: "primary-for-mac",
+  orderNumber: 100,
+  role: "hide",
+});
+
+export const actionForHideOthers = getApplicationMenuOperationSystemActionInjectable({
+  id: "hide-others",
+  parentId: "primary-for-mac",
+  orderNumber: 110,
+  role: "hideOthers",
+});
+
+export const actionForUnhide = getApplicationMenuOperationSystemActionInjectable({
+  id: "unhide",
+  parentId: "primary-for-mac",
+  orderNumber: 120,
+  role: "unhide",
+});

src/features/application-menu/main/menu-items/primary-for-mac/separators/separators.injectable.ts

@@ -18,3 +18,15 @@ export const separator2 = getApplicationMenuSeparatorInjectable({
   parentId: "primary-for-mac",
   orderNumber: 70,
 });
+
+export const separator3 = getApplicationMenuSeparatorInjectable({
+  id: "separator-3",
+  parentId: "primary-for-mac",
+  orderNumber: 90,
+});
+
+export const separator4 = getApplicationMenuSeparatorInjectable({
+  id: "separator-4",
+  parentId: "primary-for-mac",
+  orderNumber: 130,
+});