From 27a94f4132b438b2c207ce6dca97410fe8b16683 Mon Sep 17 00:00:00 2001 From: Iku-turso Date: Wed, 12 Oct 2022 14:55:29 +0300 Subject: [PATCH] Rename id of menu item to keep it discoverable by existing extensions Co-authored-by: Janne Savolainen Signed-off-by: Iku-turso --- .../application-menu.test.ts.snap | 26 +++++++++---------- .../check-for-updates-menu-item.injectable.ts | 2 +- ...gate-to-extensions-menu-item.injectable.ts | 2 +- ...ate-to-preferences-menu-item.injectable.ts | 2 +- .../operation-system-actions.injectable.ts | 8 +++--- .../primary-menu-item.injectable.ts | 2 +- .../quit-application-menu-item.injectable.ts | 2 +- .../separators/separators.injectable.ts | 8 +++--- .../about-menu-item.injectable.ts | 2 +- .../show-about.injectable.ts | 0 .../analytics-for-installing-update.test.ts | 2 +- .../navigation-using-application-menu.test.ts | 2 +- .../navigation-using-application-menu.test.ts | 2 +- ...ing-the-app-using-application-menu.test.ts | 2 +- .../navigation-using-application-menu.test.ts | 2 +- .../about-app-tray-item.injectable.ts | 2 +- 16 files changed, 33 insertions(+), 33 deletions(-) rename src/features/application-menu/main/menu-items/{primary-for-mac => special-menu-for-mac-application}/check-for-updates/check-for-updates-menu-item.injectable.ts (97%) rename src/features/application-menu/main/menu-items/{primary-for-mac => special-menu-for-mac-application}/navigate-to-extensions/navigate-to-extensions-menu-item.injectable.ts (95%) rename src/features/application-menu/main/menu-items/{primary-for-mac => special-menu-for-mac-application}/navigate-to-preferences/navigate-to-preferences-menu-item.injectable.ts (95%) rename src/features/application-menu/main/menu-items/{primary-for-mac => special-menu-for-mac-application}/operation-system-actions/operation-system-actions.injectable.ts (87%) rename src/features/application-menu/main/menu-items/{primary-for-mac => special-menu-for-mac-application}/primary-menu-item.injectable.ts (96%) rename src/features/application-menu/main/menu-items/{primary-for-mac => special-menu-for-mac-application}/quit-application/quit-application-menu-item.injectable.ts (95%) rename src/features/application-menu/main/menu-items/{primary-for-mac => special-menu-for-mac-application}/separators/separators.injectable.ts (84%) rename src/features/application-menu/main/menu-items/{primary-for-mac => special-menu-for-mac-application}/show-about-application/about-menu-item.injectable.ts (95%) rename src/features/application-menu/main/menu-items/{primary-for-mac => special-menu-for-mac-application}/show-about-application/show-about.injectable.ts (100%) diff --git a/src/features/application-menu/__snapshots__/application-menu.test.ts.snap b/src/features/application-menu/__snapshots__/application-menu.test.ts.snap index 7a525bf7c7..36ef1e3c2c 100644 --- a/src/features/application-menu/__snapshots__/application-menu.test.ts.snap +++ b/src/features/application-menu/__snapshots__/application-menu.test.ts.snap @@ -3,19 +3,19 @@ exports[`application-menu given enough time passes populates application menu 1`] = ` Array [ "root", - "root.primary-for-mac", - "root.primary-for-mac.about", - "root.primary-for-mac.separator-1", - "root.primary-for-mac.navigate-to-preferences", - "root.primary-for-mac.navigate-to-extensions", - "root.primary-for-mac.separator-2", - "root.primary-for-mac.services", - "root.primary-for-mac.separator-3", - "root.primary-for-mac.hide", - "root.primary-for-mac.hide-others", - "root.primary-for-mac.unhide", - "root.primary-for-mac.separator-4", - "root.primary-for-mac.quit", + "root.mac", + "root.mac.about", + "root.mac.separator-1", + "root.mac.navigate-to-preferences", + "root.mac.navigate-to-extensions", + "root.mac.separator-2", + "root.mac.services", + "root.mac.separator-3", + "root.mac.hide", + "root.mac.hide-others", + "root.mac.unhide", + "root.mac.separator-4", + "root.mac.quit", "root.file", "root.file.add-cluster", "root.file.separator-1-for-file", diff --git a/src/features/application-menu/main/menu-items/primary-for-mac/check-for-updates/check-for-updates-menu-item.injectable.ts b/src/features/application-menu/main/menu-items/special-menu-for-mac-application/check-for-updates/check-for-updates-menu-item.injectable.ts similarity index 97% rename from src/features/application-menu/main/menu-items/primary-for-mac/check-for-updates/check-for-updates-menu-item.injectable.ts rename to src/features/application-menu/main/menu-items/special-menu-for-mac-application/check-for-updates/check-for-updates-menu-item.injectable.ts index cb4a0262fa..c2ab81bf01 100644 --- a/src/features/application-menu/main/menu-items/primary-for-mac/check-for-updates/check-for-updates-menu-item.injectable.ts +++ b/src/features/application-menu/main/menu-items/special-menu-for-mac-application/check-for-updates/check-for-updates-menu-item.injectable.ts @@ -26,7 +26,7 @@ const checkForUpdatesMenuItemInjectable = getInjectable({ return { kind: "clickable-menu-item" as const, id: "check-for-updates", - parentId: isMac ? "primary-for-mac" : "help", + parentId: isMac ? "mac" : "help", orderNumber: isMac ? 20 : 50, label: "Check for updates", isShown: updatingIsEnabled, diff --git a/src/features/application-menu/main/menu-items/primary-for-mac/navigate-to-extensions/navigate-to-extensions-menu-item.injectable.ts b/src/features/application-menu/main/menu-items/special-menu-for-mac-application/navigate-to-extensions/navigate-to-extensions-menu-item.injectable.ts similarity index 95% rename from src/features/application-menu/main/menu-items/primary-for-mac/navigate-to-extensions/navigate-to-extensions-menu-item.injectable.ts rename to src/features/application-menu/main/menu-items/special-menu-for-mac-application/navigate-to-extensions/navigate-to-extensions-menu-item.injectable.ts index 55aa115591..40aa366280 100644 --- a/src/features/application-menu/main/menu-items/primary-for-mac/navigate-to-extensions/navigate-to-extensions-menu-item.injectable.ts +++ b/src/features/application-menu/main/menu-items/special-menu-for-mac-application/navigate-to-extensions/navigate-to-extensions-menu-item.injectable.ts @@ -16,7 +16,7 @@ const navigateToExtensionsMenuItem = getInjectable({ return { kind: "clickable-menu-item" as const, - parentId: isMac ? "primary-for-mac" : "file", + parentId: isMac ? "mac" : "file", id: "navigate-to-extensions", orderNumber: isMac ? 50 : 40, label: "Extensions", diff --git a/src/features/application-menu/main/menu-items/primary-for-mac/navigate-to-preferences/navigate-to-preferences-menu-item.injectable.ts b/src/features/application-menu/main/menu-items/special-menu-for-mac-application/navigate-to-preferences/navigate-to-preferences-menu-item.injectable.ts similarity index 95% rename from src/features/application-menu/main/menu-items/primary-for-mac/navigate-to-preferences/navigate-to-preferences-menu-item.injectable.ts rename to src/features/application-menu/main/menu-items/special-menu-for-mac-application/navigate-to-preferences/navigate-to-preferences-menu-item.injectable.ts index 14d25c4b45..a0c96b5063 100644 --- a/src/features/application-menu/main/menu-items/primary-for-mac/navigate-to-preferences/navigate-to-preferences-menu-item.injectable.ts +++ b/src/features/application-menu/main/menu-items/special-menu-for-mac-application/navigate-to-preferences/navigate-to-preferences-menu-item.injectable.ts @@ -16,7 +16,7 @@ const navigateToPreferencesMenuItemInjectable = getInjectable({ return { kind: "clickable-menu-item" as const, - parentId: isMac ? "primary-for-mac" : "file", + parentId: isMac ? "mac" : "file", id: "navigate-to-preferences", orderNumber: isMac ? 40 : 30, label: "Preferences", diff --git a/src/features/application-menu/main/menu-items/primary-for-mac/operation-system-actions/operation-system-actions.injectable.ts b/src/features/application-menu/main/menu-items/special-menu-for-mac-application/operation-system-actions/operation-system-actions.injectable.ts similarity index 87% rename from src/features/application-menu/main/menu-items/primary-for-mac/operation-system-actions/operation-system-actions.injectable.ts rename to src/features/application-menu/main/menu-items/special-menu-for-mac-application/operation-system-actions/operation-system-actions.injectable.ts index dabb493e2c..1c78d81031 100644 --- a/src/features/application-menu/main/menu-items/primary-for-mac/operation-system-actions/operation-system-actions.injectable.ts +++ b/src/features/application-menu/main/menu-items/special-menu-for-mac-application/operation-system-actions/operation-system-actions.injectable.ts @@ -9,28 +9,28 @@ import { export const actionForServices = getApplicationMenuOperationSystemActionInjectable({ id: "services", - parentId: "primary-for-mac", + parentId: "mac", orderNumber: 80, actionName: "services", }); export const actionForHide = getApplicationMenuOperationSystemActionInjectable({ id: "hide", - parentId: "primary-for-mac", + parentId: "mac", orderNumber: 100, actionName: "hide", }); export const actionForHideOthers = getApplicationMenuOperationSystemActionInjectable({ id: "hide-others", - parentId: "primary-for-mac", + parentId: "mac", orderNumber: 110, actionName: "hideOthers", }); export const actionForUnhide = getApplicationMenuOperationSystemActionInjectable({ id: "unhide", - parentId: "primary-for-mac", + parentId: "mac", orderNumber: 120, actionName: "unhide", }); diff --git a/src/features/application-menu/main/menu-items/primary-for-mac/primary-menu-item.injectable.ts b/src/features/application-menu/main/menu-items/special-menu-for-mac-application/primary-menu-item.injectable.ts similarity index 96% rename from src/features/application-menu/main/menu-items/primary-for-mac/primary-menu-item.injectable.ts rename to src/features/application-menu/main/menu-items/special-menu-for-mac-application/primary-menu-item.injectable.ts index e8e3985e34..b85df1d511 100644 --- a/src/features/application-menu/main/menu-items/primary-for-mac/primary-menu-item.injectable.ts +++ b/src/features/application-menu/main/menu-items/special-menu-for-mac-application/primary-menu-item.injectable.ts @@ -17,7 +17,7 @@ const primaryMenuItemInjectable = getInjectable({ return { kind: "top-level-menu" as const, parentId: "root" as const, - id: "primary-for-mac", + id: "mac", orderNumber: 10, label: appName, isShown: isMac, diff --git a/src/features/application-menu/main/menu-items/primary-for-mac/quit-application/quit-application-menu-item.injectable.ts b/src/features/application-menu/main/menu-items/special-menu-for-mac-application/quit-application/quit-application-menu-item.injectable.ts similarity index 95% rename from src/features/application-menu/main/menu-items/primary-for-mac/quit-application/quit-application-menu-item.injectable.ts rename to src/features/application-menu/main/menu-items/special-menu-for-mac-application/quit-application/quit-application-menu-item.injectable.ts index d0ad3cdc95..71f7cde125 100644 --- a/src/features/application-menu/main/menu-items/primary-for-mac/quit-application/quit-application-menu-item.injectable.ts +++ b/src/features/application-menu/main/menu-items/special-menu-for-mac-application/quit-application/quit-application-menu-item.injectable.ts @@ -19,7 +19,7 @@ const quitApplicationMenuItemInjectable = getInjectable({ id: "quit", label: "Quit", - parentId: isMac ? "primary-for-mac" : "file", + parentId: isMac ? "mac" : "file", orderNumber: isMac ? 140 : 70, keyboardShortcut: isMac ? "Cmd+Q" : "Alt+F4", diff --git a/src/features/application-menu/main/menu-items/primary-for-mac/separators/separators.injectable.ts b/src/features/application-menu/main/menu-items/special-menu-for-mac-application/separators/separators.injectable.ts similarity index 84% rename from src/features/application-menu/main/menu-items/primary-for-mac/separators/separators.injectable.ts rename to src/features/application-menu/main/menu-items/special-menu-for-mac-application/separators/separators.injectable.ts index 963d830ac4..e878df9210 100644 --- a/src/features/application-menu/main/menu-items/primary-for-mac/separators/separators.injectable.ts +++ b/src/features/application-menu/main/menu-items/special-menu-for-mac-application/separators/separators.injectable.ts @@ -9,24 +9,24 @@ import { export const separator1 = getApplicationMenuSeparatorInjectable({ id: "separator-1", - parentId: "primary-for-mac", + parentId: "mac", orderNumber: 30, }); export const separator2 = getApplicationMenuSeparatorInjectable({ id: "separator-2", - parentId: "primary-for-mac", + parentId: "mac", orderNumber: 70, }); export const separator3 = getApplicationMenuSeparatorInjectable({ id: "separator-3", - parentId: "primary-for-mac", + parentId: "mac", orderNumber: 90, }); export const separator4 = getApplicationMenuSeparatorInjectable({ id: "separator-4", - parentId: "primary-for-mac", + parentId: "mac", orderNumber: 130, }); diff --git a/src/features/application-menu/main/menu-items/primary-for-mac/show-about-application/about-menu-item.injectable.ts b/src/features/application-menu/main/menu-items/special-menu-for-mac-application/show-about-application/about-menu-item.injectable.ts similarity index 95% rename from src/features/application-menu/main/menu-items/primary-for-mac/show-about-application/about-menu-item.injectable.ts rename to src/features/application-menu/main/menu-items/special-menu-for-mac-application/show-about-application/about-menu-item.injectable.ts index 85221a0ca3..6e269a9e3a 100644 --- a/src/features/application-menu/main/menu-items/primary-for-mac/show-about-application/about-menu-item.injectable.ts +++ b/src/features/application-menu/main/menu-items/special-menu-for-mac-application/show-about-application/about-menu-item.injectable.ts @@ -19,7 +19,7 @@ const aboutMenuItemInjectable = getInjectable({ return { kind: "clickable-menu-item" as const, id: "about", - parentId: isMac ? "primary-for-mac" : "help", + parentId: isMac ? "mac" : "help", orderNumber: isMac ? 10 : 40, label: `About ${productName}`, diff --git a/src/features/application-menu/main/menu-items/primary-for-mac/show-about-application/show-about.injectable.ts b/src/features/application-menu/main/menu-items/special-menu-for-mac-application/show-about-application/show-about.injectable.ts similarity index 100% rename from src/features/application-menu/main/menu-items/primary-for-mac/show-about-application/show-about.injectable.ts rename to src/features/application-menu/main/menu-items/special-menu-for-mac-application/show-about-application/show-about.injectable.ts diff --git a/src/features/application-update/analytics-for-installing-update.test.ts b/src/features/application-update/analytics-for-installing-update.test.ts index 0c0517ad49..3a38b0d842 100644 --- a/src/features/application-update/analytics-for-installing-update.test.ts +++ b/src/features/application-update/analytics-for-installing-update.test.ts @@ -142,7 +142,7 @@ describe("analytics for installing update", () => { it("when checking for updates using application menu, sends event to analytics for being checked from application menu", async () => { analyticsListenerMock.mockClear(); - builder.applicationMenu.click("root.primary-for-mac.check-for-updates"); + builder.applicationMenu.click("root.mac.check-for-updates"); expect(analyticsListenerMock.mock.calls).toEqual([ [ diff --git a/src/features/extensions/navigation-using-application-menu.test.ts b/src/features/extensions/navigation-using-application-menu.test.ts index f419ed288a..36d33adb6c 100644 --- a/src/features/extensions/navigation-using-application-menu.test.ts +++ b/src/features/extensions/navigation-using-application-menu.test.ts @@ -48,7 +48,7 @@ describe("extensions - navigation using application menu", () => { describe("when navigating to extensions using application menu", () => { beforeEach(() => { - builder.applicationMenu.click("root.primary-for-mac.navigate-to-extensions"); + builder.applicationMenu.click("root.mac.navigate-to-extensions"); }); it("focuses the window", () => { diff --git a/src/features/preferences/navigation-using-application-menu.test.ts b/src/features/preferences/navigation-using-application-menu.test.ts index cf663894e6..2576667e2b 100644 --- a/src/features/preferences/navigation-using-application-menu.test.ts +++ b/src/features/preferences/navigation-using-application-menu.test.ts @@ -29,7 +29,7 @@ describe("preferences - navigation using application menu", () => { describe("when navigating to preferences using application menu", () => { beforeEach(() => { - applicationBuilder.applicationMenu.click("root.primary-for-mac.navigate-to-preferences"); + applicationBuilder.applicationMenu.click("root.mac.navigate-to-preferences"); }); it("renders", () => { diff --git a/src/features/quitting-and-restarting-the-app/quitting-the-app-using-application-menu.test.ts b/src/features/quitting-and-restarting-the-app/quitting-the-app-using-application-menu.test.ts index 0eb53a89e8..065bed8923 100644 --- a/src/features/quitting-and-restarting-the-app/quitting-the-app-using-application-menu.test.ts +++ b/src/features/quitting-and-restarting-the-app/quitting-the-app-using-application-menu.test.ts @@ -45,7 +45,7 @@ describe("quitting the app using application menu", () => { describe("when application is quit", () => { beforeEach(() => { - builder.applicationMenu.click("root.primary-for-mac.quit"); + builder.applicationMenu.click("root.mac.quit"); }); it("closes all windows", () => { diff --git a/src/features/welcome/navigation-using-application-menu.test.ts b/src/features/welcome/navigation-using-application-menu.test.ts index bd5c34478c..6e1512680b 100644 --- a/src/features/welcome/navigation-using-application-menu.test.ts +++ b/src/features/welcome/navigation-using-application-menu.test.ts @@ -29,7 +29,7 @@ describe("welcome - navigation using application menu", () => { describe("when navigated somewhere else", () => { beforeEach(() => { - applicationBuilder.applicationMenu.click("root.primary-for-mac.navigate-to-preferences"); + applicationBuilder.applicationMenu.click("root.mac.navigate-to-preferences"); }); it("renders", () => { diff --git a/src/main/tray/tray-menu-item/implementations/about-app-tray-item.injectable.ts b/src/main/tray/tray-menu-item/implementations/about-app-tray-item.injectable.ts index 2f47a08620..c6da2c3f14 100644 --- a/src/main/tray/tray-menu-item/implementations/about-app-tray-item.injectable.ts +++ b/src/main/tray/tray-menu-item/implementations/about-app-tray-item.injectable.ts @@ -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 "../../../../features/application-menu/main/menu-items/primary-for-mac/show-about-application/show-about.injectable"; +import showAboutInjectable from "../../../../features/application-menu/main/menu-items/special-menu-for-mac-application/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";