From b82b2fe6d2de0f0580e8016e13199dd7fe70bd32 Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Mon, 9 May 2022 10:39:09 +0300 Subject: [PATCH] Remove redundant indirection Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen --- ...application-update-tray-item.injectable.ts | 6 +++--- .../trigger-application-update.injectable.ts | 20 ------------------- 2 files changed, 3 insertions(+), 23 deletions(-) delete mode 100644 src/main/update-app/trigger-application-update.injectable.ts diff --git a/src/main/update-app/trigger-application-update-tray-item.injectable.ts b/src/main/update-app/trigger-application-update-tray-item.injectable.ts index 2b8f33d853..d6eee575bb 100644 --- a/src/main/update-app/trigger-application-update-tray-item.injectable.ts +++ b/src/main/update-app/trigger-application-update-tray-item.injectable.ts @@ -6,14 +6,14 @@ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; import { trayMenuItemInjectionToken } from "../tray/tray-menu-item/tray-menu-item-injection-token"; import updateIsReadyToBeInstalledInjectable from "./update-is-ready-to-be-installed.injectable"; -import triggerApplicationUpdateInjectable from "./trigger-application-update.injectable"; +import quitAndInstallUpdateInjectable from "../electron-app/features/quit-and-install-update.injectable"; const triggerApplicationUpdateTrayItemInjectable = getInjectable({ id: "trigger-application-update-tray-item", instantiate: (di) => { const updateIsReadyToBeInstalled = di.inject(updateIsReadyToBeInstalledInjectable); - const triggerApplicationUpdate = di.inject(triggerApplicationUpdateInjectable); + const quitAndInstallUpdate = di.inject(quitAndInstallUpdateInjectable); return { id: "trigger-application-update", @@ -24,7 +24,7 @@ const triggerApplicationUpdateTrayItemInjectable = getInjectable({ visible: computed(() => updateIsReadyToBeInstalled.get()), click: () => { - triggerApplicationUpdate(); + quitAndInstallUpdate(); }, }; }, diff --git a/src/main/update-app/trigger-application-update.injectable.ts b/src/main/update-app/trigger-application-update.injectable.ts deleted file mode 100644 index 1867814b41..0000000000 --- a/src/main/update-app/trigger-application-update.injectable.ts +++ /dev/null @@ -1,20 +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 quitAndInstallUpdateInjectable from "../electron-app/features/quit-and-install-update.injectable"; - -const triggerApplicationUpdateInjectable = getInjectable({ - id: "trigger-application-update", - - instantiate: (di) => { - const quitAndInstallUpdate = di.inject(quitAndInstallUpdateInjectable); - - return () => { - quitAndInstallUpdate(); - }; - }, -}); - -export default triggerApplicationUpdateInjectable;