Fix beta->latest->beta upgrade loop (#6189)

src/common/application-update/selected-update-channel/default-update-channel.injectable.ts

@@ -3,23 +3,12 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import appSemanticVersionInjectable from "../../vars/app-semantic-version.injectable";
-import type { UpdateChannelId } from "../update-channels";
+import releaseChannelInjectable from "../../vars/release-channel.injectable";
 import { updateChannels } from "../update-channels";
 
 const defaultUpdateChannelInjectable = getInjectable({
   id: "default-update-channel",
-
-  instantiate: (di) => {
-    const appSemanticVersion = di.inject(appSemanticVersionInjectable);
-    const currentReleaseChannel = appSemanticVersion.prerelease[0]?.toString();
-
-    if (currentReleaseChannel in updateChannels) {
-      return updateChannels[currentReleaseChannel as UpdateChannelId];
-    }
-
-    return updateChannels.latest;
-  },
+  instantiate: (di) => updateChannels[di.inject(releaseChannelInjectable)],
 });
 
 export default defaultUpdateChannelInjectable;

src/common/application-update/update-channels.ts

@@ -24,7 +24,7 @@ const alphaChannel: UpdateChannel = {
   moreStableUpdateChannel: betaChannel,
 };
 
-export const updateChannels: Record<UpdateChannelId, UpdateChannel> = {
+export const updateChannels = {
   latest: latestChannel,
   beta: betaChannel,
   alpha: alphaChannel,

src/common/vars/release-channel.injectable.ts

@@ -0,0 +1,26 @@
+/**
+ * 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 { UpdateChannelId } from "../application-update/update-channels";
+import appSemanticVersionInjectable from "./app-semantic-version.injectable";
+
+const releaseChannelInjectable = getInjectable({
+  id: "release-channel",
+  instantiate: (di): UpdateChannelId => {
+    const appSemanticVersion = di.inject(appSemanticVersionInjectable);
+    const currentReleaseChannel = appSemanticVersion.prerelease[0];
+
+    switch (currentReleaseChannel) {
+      case "latest":
+      case "beta":
+      case "alpha":
+        return currentReleaseChannel;
+      default:
+        return "latest";
+    }
+  },
+});
+
+export default releaseChannelInjectable;