Replace status bar item application update with different tray icon based on status of the update (#5769)

* Remove the auto-update status bar item for not being needed anymore

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

* Make adding of new tray icons easier by complying to Open Closed Principle

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

* Start showing different tray icon when checking for updates

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

* Include placeholder icon for checking for updates

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

* Simplify code

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

* Add first keyframe for downloading spinner

Signed-off-by: Sebastian Malton <sebastian@malton.name>

Co-authored-by: Sebastian Malton <sebastian@malton.name>

src/main/application-update/install-application-update-tray-item.injectable.ts

@@ -6,11 +6,11 @@ import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
 import { trayMenuItemInjectionToken } from "../tray/tray-menu-item/tray-menu-item-injection-token";
 import discoveredUpdateVersionInjectable from "../../common/application-update/discovered-update-version/discovered-update-version.injectable";
-import updateIsBeingDownloadedInjectable from "../../common/application-update/update-is-being-downloaded/update-is-being-downloaded.injectable";
 import { withErrorSuppression } from "../../common/utils/with-error-suppression/with-error-suppression";
 import { pipeline } from "@ogre-tools/fp";
 import withErrorLoggingInjectable from "../../common/utils/with-error-logging/with-error-logging.injectable";
 import quitAndInstallUpdateInjectable from "./quit-and-install-update.injectable";
+import updateIsReadyToBeInstalledInjectable from "./update-is-ready-to-be-installed.injectable";
 
 const installApplicationUpdateTrayItemInjectable = getInjectable({
   id: "install-update-tray-item",
@@ -18,8 +18,8 @@ const installApplicationUpdateTrayItemInjectable = getInjectable({
   instantiate: (di) => {
     const quitAndInstallUpdate = di.inject(quitAndInstallUpdateInjectable);
     const discoveredVersionState = di.inject(discoveredUpdateVersionInjectable);
-    const downloadingUpdateState = di.inject(updateIsBeingDownloadedInjectable);
     const withErrorLoggingFor = di.inject(withErrorLoggingInjectable);
+    const updateIsReadyToBeInstalled = di.inject(updateIsReadyToBeInstalledInjectable);
 
     return {
       id: "install-update",
@@ -34,9 +34,7 @@ const installApplicationUpdateTrayItemInjectable = getInjectable({
 
       enabled: computed(() => true),
 
-      visible: computed(
-        () => !!discoveredVersionState.value.get() && !downloadingUpdateState.value.get(),
-      ),
+      visible: updateIsReadyToBeInstalled,
 
       click: pipeline(
         quitAndInstallUpdate,

src/main/application-update/tray-icons/checking-for-updates-tray-icon.injectable.ts

@@ -0,0 +1,34 @@
+/**
+ * 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 { computed } from "mobx";
+import getTrayIconPathInjectable from "../../tray/menu-icon/get-tray-icon-path.injectable";
+import { trayIconInjectionToken } from "../../tray/menu-icon/tray-icon-injection-token";
+import updatesAreBeingDiscoveredInjectable from "../../../common/application-update/updates-are-being-discovered/updates-are-being-discovered.injectable";
+import updateIsBeingDownloadedInjectable from "../../../common/application-update/update-is-being-downloaded/update-is-being-downloaded.injectable";
+
+const checkingForUpdatesTrayIconInjectable = getInjectable({
+  id: "checking-for-updates-tray-icon",
+
+  instantiate: (di) => {
+    const getTrayIconPath = di.inject(getTrayIconPathInjectable);
+    const updatesAreBeingDiscovered = di.inject(updatesAreBeingDiscoveredInjectable);
+    const updateIsBeingDownloaded = di.inject(updateIsBeingDownloadedInjectable);
+
+    return {
+      iconPath: getTrayIconPath("checking-for-updates"),
+      priority: 1,
+      shouldBeShown: computed(
+        () =>
+          updatesAreBeingDiscovered.value.get() ||
+          updateIsBeingDownloaded.value.get(),
+      ),
+    };
+  },
+
+  injectionToken: trayIconInjectionToken,
+});
+
+export default checkingForUpdatesTrayIconInjectable;

src/main/application-update/tray-icons/update-is-ready-to-be-installed-tray-icon.injectable.ts

@@ -0,0 +1,27 @@
+/**
+ * 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 getTrayIconPathInjectable from "../../tray/menu-icon/get-tray-icon-path.injectable";
+import { trayIconInjectionToken } from "../../tray/menu-icon/tray-icon-injection-token";
+import updateIsReadyToBeInstalledInjectable from "../update-is-ready-to-be-installed.injectable";
+
+const updateIsReadyToBeInstalledTrayIconInjectable = getInjectable({
+  id: "update-is-ready-to-be-installed-tray-icon",
+
+  instantiate: (di) => {
+    const getTrayIconPath = di.inject(getTrayIconPathInjectable);
+    const updateIsReadyToBeInstalled = di.inject(updateIsReadyToBeInstalledInjectable);
+
+    return {
+      iconPath: getTrayIconPath("update-available"),
+      priority: 1,
+      shouldBeShown: updateIsReadyToBeInstalled,
+    };
+  },
+
+  injectionToken: trayIconInjectionToken,
+});
+
+export default updateIsReadyToBeInstalledTrayIconInjectable;

src/main/application-update/update-is-ready-to-be-installed.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 { computed } from "mobx";
+import discoveredUpdateVersionInjectable from "../../common/application-update/discovered-update-version/discovered-update-version.injectable";
+import updateIsBeingDownloadedInjectable from "../../common/application-update/update-is-being-downloaded/update-is-being-downloaded.injectable";
+
+const updateIsReadyToBeInstalledInjectable = getInjectable({
+  id: "update-is-ready-to-be-installed",
+
+  instantiate: (di) => {
+    const discoveredUpdateVersion = di.inject(discoveredUpdateVersionInjectable);
+    const updateIsBeingDownloaded = di.inject(updateIsBeingDownloadedInjectable);
+
+    return computed(
+      () =>
+        !!discoveredUpdateVersion.value.get() &&
+        !updateIsBeingDownloaded.value.get(),
+    );
+  },
+});
+
+export default updateIsReadyToBeInstalledInjectable;