fix: Only show Update Channel preferences when applicable

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

packages/core/src/features/application-update/analytics-for-installing-update.test.ts

@@ -5,7 +5,7 @@
 import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import electronUpdaterIsActiveInjectable from "../../main/electron-app/features/electron-updater-is-active.injectable";
-import publishIsConfiguredInjectable from "./main/updating-is-enabled/publish-is-configured/publish-is-configured.injectable";
+import publishIsConfiguredInjectable from "./child-features/updating-is-enabled/main/publish-is-configured.injectable";
 import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
 import type { CheckForPlatformUpdates } from "./main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable";

packages/core/src/features/application-update/child-features/application-update-using-application-menu/application-update-using-application-menu.test.ts

@@ -15,7 +15,7 @@ import type { ShowMessagePopup } from "../../../../main/electron-app/features/sh
 import electronUpdaterIsActiveInjectable
   from "../../../../main/electron-app/features/electron-updater-is-active.injectable";
 import publishIsConfiguredInjectable
-  from "../../main/updating-is-enabled/publish-is-configured/publish-is-configured.injectable";
+  from "../../child-features/updating-is-enabled/main/publish-is-configured.injectable";
 
 describe("installing update using application menu", () => {
   let applicationBuilder: ApplicationBuilder;

packages/core/src/features/application-update/child-features/application-update-using-application-menu/main/check-for-updates-menu-item.injectable.ts

@@ -7,7 +7,7 @@ import { getInjectable } from "@ogre-tools/injectable";
 import applicationMenuItemInjectionToken from "../../../../application-menu/main/menu-items/application-menu-item-injection-token";
 import processCheckingForUpdatesInjectable from "../../../main/process-checking-for-updates.injectable";
 import showApplicationWindowInjectable from "../../../../../main/start-main-application/lens-window/show-application-window.injectable";
-import updatingIsEnabledInjectable from "../../../main/updating-is-enabled/updating-is-enabled.injectable";
+import updatingIsEnabledInjectable from "../../updating-is-enabled/main/updating-is-enabled.injectable";
 import isMacInjectable from "../../../../../common/vars/is-mac.injectable";
 import showMessagePopupInjectable from "../../../../../main/electron-app/features/show-message-popup.injectable";
 

packages/core/src/features/application-update/child-features/application-update-using-top-bar/installing-update-using-topbar-button.test.tsx

@@ -10,7 +10,7 @@ import type { CheckForPlatformUpdates } from "../../main/check-for-updates/check
 import checkForPlatformUpdatesInjectable from "../../main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable";
 import type { DownloadPlatformUpdate } from "../../main/download-update/download-platform-update/download-platform-update.injectable";
 import downloadPlatformUpdateInjectable from "../../main/download-update/download-platform-update/download-platform-update.injectable";
-import publishIsConfiguredInjectable from "../../main/updating-is-enabled/publish-is-configured/publish-is-configured.injectable";
+import publishIsConfiguredInjectable from "../../child-features/updating-is-enabled/main/publish-is-configured.injectable";
 import electronUpdaterIsActiveInjectable from "../../../../main/electron-app/features/electron-updater-is-active.injectable";
 import type { ApplicationBuilder } from "../../../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../../../renderer/components/test-utils/get-application-builder";

packages/core/src/features/application-update/child-features/application-update-using-tray/installing-update-using-tray.test.ts

@@ -6,7 +6,7 @@ import { getApplicationBuilder } from "../../../../renderer/components/test-util
 import type { ApplicationBuilder } from "../../../../renderer/components/test-utils/get-application-builder";
 import type { RenderResult } from "@testing-library/react";
 import electronUpdaterIsActiveInjectable from "../../../../main/electron-app/features/electron-updater-is-active.injectable";
-import publishIsConfiguredInjectable from "../../main/updating-is-enabled/publish-is-configured/publish-is-configured.injectable";
+import publishIsConfiguredInjectable from "../../child-features/updating-is-enabled/main/publish-is-configured.injectable";
 import type { CheckForPlatformUpdates } from "../../main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable";
 import checkForPlatformUpdatesInjectable from "../../main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable";
 import type { AsyncFnMock } from "@async-fn/jest";

packages/core/src/features/application-update/child-features/application-update-using-tray/main/tray-items/check-for-updates-tray-item.injectable.ts

@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
-import updatingIsEnabledInjectable from "../../../../main/updating-is-enabled/updating-is-enabled.injectable";
+import updatingIsEnabledInjectable from "../../../updating-is-enabled/main/updating-is-enabled.injectable";
 import { trayMenuItemInjectionToken } from "../../../../../../main/tray/tray-menu-item/tray-menu-item-injection-token";
 import showApplicationWindowInjectable from "../../../../../../main/start-main-application/lens-window/show-application-window.injectable";
 import discoveredUpdateVersionInjectable from "../../../../common/discovered-update-version.injectable";

packages/core/src/features/application-update/child-features/periodical-checking-of-updates/main/start-checking-for-updates.injectable.ts

@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import periodicalCheckForUpdatesInjectable from "./periodical-check-for-updates.injectable";
-import updatingIsEnabledInjectable from "../../../main/updating-is-enabled/updating-is-enabled.injectable";
+import updatingIsEnabledInjectable from "../../updating-is-enabled/main/updating-is-enabled.injectable";
 import { afterApplicationIsLoadedInjectionToken } from "@k8slens/application";
 
 const startCheckingForUpdatesInjectable = getInjectable({

packages/core/src/features/application-update/child-features/periodical-checking-of-updates/periodical-checking-of-updates.test.ts

@@ -6,7 +6,7 @@ import type { ApplicationBuilder } from "../../../../renderer/components/test-ut
 import { getApplicationBuilder } from "../../../../renderer/components/test-utils/get-application-builder";
 import type { RenderResult } from "@testing-library/react";
 import electronUpdaterIsActiveInjectable from "../../../../main/electron-app/features/electron-updater-is-active.injectable";
-import publishIsConfiguredInjectable from "../../main/updating-is-enabled/publish-is-configured/publish-is-configured.injectable";
+import publishIsConfiguredInjectable from "../../child-features/updating-is-enabled/main/publish-is-configured.injectable";
 import processCheckingForUpdatesInjectable from "../../main/process-checking-for-updates.injectable";
 import periodicalCheckForUpdatesInjectable from "./main/periodical-check-for-updates.injectable";
 import { testUsingFakeTime, advanceFakeTime } from "../../../../test-utils/use-fake-time";

packages/core/src/features/application-update/child-features/preferences/renderer/update-channel/update-channel-preference-block.injectable.ts

@@ -4,6 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { preferenceItemInjectionToken } from "../../../../../preferences/renderer/preference-items/preference-item-injection-token";
+import { updatingIsEnabledInitializable } from "../../../updating-is-enabled/common/token";
 import { UpdateChannel } from "./update-channel";
 
 const updateChannelPreferenceBlockInjectable = getInjectable({
@@ -15,6 +16,7 @@ const updateChannelPreferenceBlockInjectable = getInjectable({
     parentId: "application-page",
     orderNumber: 50,
     Component: UpdateChannel,
+    isShown: di.inject(updatingIsEnabledInitializable.stateToken),
   }),
 
   injectionToken: preferenceItemInjectionToken,

packages/core/src/features/application-update/child-features/selection-of-update-stability/selection-of-update-stability.test.ts

@@ -7,7 +7,7 @@ import { getApplicationBuilder } from "../../../../renderer/components/test-util
 import quitAndInstallUpdateInjectable from "../../main/quit-and-install-update.injectable";
 import type { RenderResult } from "@testing-library/react";
 import electronUpdaterIsActiveInjectable from "../../../../main/electron-app/features/electron-updater-is-active.injectable";
-import publishIsConfiguredInjectable from "../../main/updating-is-enabled/publish-is-configured/publish-is-configured.injectable";
+import publishIsConfiguredInjectable from "../../child-features/updating-is-enabled/main/publish-is-configured.injectable";
 import type { CheckForPlatformUpdates } from "../../main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable";
 import checkForPlatformUpdatesInjectable from "../../main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable";
 import type { AsyncFnMock } from "@async-fn/jest";

packages/core/src/features/application-update/child-features/updating-is-enabled/common/token.ts

@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import type { RequestChannel } from "@k8slens/messaging";
+import { getInitializable } from "../../../../../common/initializable-state/create";
+
+export const updatingIsEnabledChannel: RequestChannel<void, boolean> = {
+  id: "updating-is-enabled",
+};
+
+export const updatingIsEnabledInitializable = getInitializable<boolean>("updating-is-enabled");

packages/core/src/features/application-update/child-features/updating-is-enabled/main/channel-listener.injectable.ts

@@ -0,0 +1,18 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getRequestChannelListenerInjectable } from "@k8slens/messaging";
+import { updatingIsEnabledChannel, updatingIsEnabledInitializable } from "../common/token";
+
+const updatingIsEnabledChannelListenerInjectable = getRequestChannelListenerInjectable({
+  channel: updatingIsEnabledChannel,
+  id: "foobar",
+  getHandler: (di) => {
+    const updatingIsEnabled = di.inject(updatingIsEnabledInitializable.stateToken);
+
+    return () => updatingIsEnabled;
+  },
+});
+
+export default updatingIsEnabledChannelListenerInjectable;

packages/core/src/features/application-update/child-features/updating-is-enabled/main/updating-is-enabled.injectable.ts

@@ -3,7 +3,8 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import electronUpdaterIsActiveInjectable from "../../../../main/electron-app/features/electron-updater-is-active.injectable";
+import electronUpdaterIsActiveInjectable from "../../../../../main/electron-app/features/electron-updater-is-active.injectable";
+import { updatingIsEnabledInitializable } from "../common/token";
 import publishIsConfiguredInjectable from "./publish-is-configured.injectable";
 
 const updatingIsEnabledInjectable = getInjectable({
@@ -15,6 +16,7 @@ const updatingIsEnabledInjectable = getInjectable({
 
     return electronUpdaterIsActive && publishIsConfigured;
   },
+  injectionToken: updatingIsEnabledInitializable.stateToken,
 });
 
 export default updatingIsEnabledInjectable;

packages/core/src/features/application-update/child-features/updating-is-enabled/renderer/updating-is-enabled.injectable.ts

@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import { onLoadOfApplicationInjectionToken } from "@k8slens/application";
+import { requestFromChannelInjectionToken } from "@k8slens/messaging";
+import { getInjectablesForInitializable } from "../../../../../common/initializable-state/create";
+import { updatingIsEnabledChannel, updatingIsEnabledInitializable } from "../common/token";
+
+export const {
+  stateInjectable,
+  initializationInjectable,
+} = getInjectablesForInitializable({
+  token: updatingIsEnabledInitializable,
+  init: async (di) => {
+    const requestFromChannel = di.inject(requestFromChannelInjectionToken);
+
+    return requestFromChannel(updatingIsEnabledChannel);
+  },
+  phase: onLoadOfApplicationInjectionToken,
+});

packages/core/src/features/application-update/downgrading-version-update.test.ts

@@ -5,7 +5,7 @@
 import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import electronUpdaterIsActiveInjectable from "../../main/electron-app/features/electron-updater-is-active.injectable";
-import publishIsConfiguredInjectable from "./main/updating-is-enabled/publish-is-configured/publish-is-configured.injectable";
+import publishIsConfiguredInjectable from "./child-features/updating-is-enabled/main/publish-is-configured.injectable";
 import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
 import type { CheckForPlatformUpdates } from "./main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable";

packages/core/src/features/application-update/hiding-preference-when-disabled.test.ts

@@ -0,0 +1,70 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import type { GetSingleElement } from "@k8slens/react-testing-library-discovery";
+import { getSingleElement } from "@k8slens/react-testing-library-discovery";
+import type { RenderResult } from "@testing-library/react";
+import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
+import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
+import navigateToPreferencesInjectable from "../preferences/common/navigate-to-preferences.injectable";
+import updatingIsEnabledInjectable from "./child-features/updating-is-enabled/main/updating-is-enabled.injectable";
+
+describe("hiding Update Channel preference with updating is not enabled", () => {
+  let builder: ApplicationBuilder;
+  let result: RenderResult;
+  let getElement: GetSingleElement;
+
+  beforeEach(async () => {
+    builder = getApplicationBuilder();
+
+    builder.mainDi.override(updatingIsEnabledInjectable, () => false);
+
+    result = await builder.render();
+
+    getElement = getSingleElement(() => result);
+    builder.navigateWith(navigateToPreferencesInjectable);
+  });
+
+  it("renders", () => {
+    expect(result.baseElement).toMatchSnapshot();
+  });
+
+  it("shows the application settings", () => {
+    expect(getElement("preference-page", "application-page").discovered).toBeInTheDocument();
+  });
+
+  it("does not show the update channel preference", () => {
+    expect(() => getElement("preference-item", "update-channel")).toThrowError(`Couldn't find HTML-element with attribute "data-preference-item-test" with value "update-channel".`);
+  });
+});
+
+describe("showing Update Channel preference with updating is enabled", () => {
+  let builder: ApplicationBuilder;
+  let result: RenderResult;
+  let getElement: GetSingleElement;
+
+  beforeEach(async () => {
+    builder = getApplicationBuilder();
+
+    builder.mainDi.override(updatingIsEnabledInjectable, () => true);
+
+    result = await builder.render();
+
+    getElement = getSingleElement(() => result);
+    builder.navigateWith(navigateToPreferencesInjectable);
+  });
+
+  it("renders", () => {
+    expect(result.baseElement).toMatchSnapshot();
+  });
+
+  it("shows the application settings", () => {
+    expect(getElement("preference-page", "application-page").discovered).toBeInTheDocument();
+  });
+
+  it("does show the update channel preference", () => {
+    expect(getElement("preference-item", "update-channel").discovered).toBeInTheDocument();
+  });
+});

packages/core/src/features/application-update/installing-update.test.ts

@@ -7,7 +7,7 @@ import { getApplicationBuilder } from "../../renderer/components/test-utils/get-
 import quitAndInstallUpdateInjectable from "./main/quit-and-install-update.injectable";
 import type { RenderResult } from "@testing-library/react";
 import electronUpdaterIsActiveInjectable from "../../main/electron-app/features/electron-updater-is-active.injectable";
-import publishIsConfiguredInjectable from "./main/updating-is-enabled/publish-is-configured/publish-is-configured.injectable";
+import publishIsConfiguredInjectable from "./child-features/updating-is-enabled/main/publish-is-configured.injectable";
 import type { CheckForPlatformUpdates } from "./main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable";
 import checkForPlatformUpdatesInjectable from "./main/check-for-updates/check-for-platform-updates/check-for-platform-updates.injectable";
 import type { AsyncFnMock } from "@async-fn/jest";