diff --git a/.swcrc b/.swcrc new file mode 100644 index 0000000000..742642b7eb --- /dev/null +++ b/.swcrc @@ -0,0 +1,18 @@ +{ + "module": { + "type": "commonjs" + }, + "jsc": { + "parser": { + "syntax": "typescript", + "tsx": true, + "decorators": true, + "dynamicImport": false + }, + "transform": { + "legacyDecorator": true, + "decoratorMetadata": true + }, + "target": "es2019" + } +} diff --git a/LICENSE b/LICENSE index 208e7c2e9c..42319c9dae 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2021 OpenLens Authors. +Copyright (c) 2022 OpenLens Authors. Portions of this software are licensed as follows: diff --git a/package.json b/package.json index 1b1414d2a5..7c038a4f13 100644 --- a/package.json +++ b/package.json @@ -3,9 +3,9 @@ "productName": "OpenLens", "description": "OpenLens - Open Source IDE for Kubernetes", "homepage": "https://github.com/lensapp/lens", - "version": "5.6.0-alpha.0", + "version": "5.6.0-alpha.2", "main": "static/build/main.js", - "copyright": "© 2021 OpenLens Authors", + "copyright": "© 2022 OpenLens Authors", "license": "MIT", "author": { "name": "OpenLens Authors", @@ -50,7 +50,7 @@ "bundledKubectlVersion": "1.23.3", "bundledHelmVersion": "3.7.2", "sentryDsn": "", - "contentSecurityPolicy": "script-src 'unsafe-eval' 'self'; frame-src http://*.localhost:*/; img-src *" + "contentSecurityPolicy": "script-src 'unsafe-eval' 'self'; frame-src http://*.localhost:*/; img-src * data:" }, "engines": { "node": ">=16 <17" @@ -59,8 +59,12 @@ "collectCoverage": false, "verbose": true, "transform": { - "^.+\\.tsx?$": "ts-jest" + "^.+\\.(t|j)sx?$": [ + "@swc/jest" + ] }, + "testEnvironment": "jsdom", + "resolver": "/src/jest-28-resolver.js", "moduleNameMapper": { "\\.(css|scss)$": "identity-obj-proxy", "\\.(svg|png|jpg|eot|woff2?|ttf)$": "/__mocks__/assetMock.ts" @@ -76,11 +80,7 @@ "setupFilesAfterEnv": [ "/src/jest-after-env.setup.ts" ], - "globals": { - "ts-jest": { - "isolatedModules": true - } - } + "runtime": "@side/jest-runtime" }, "build": { "generateUpdatesFilesForAllChannels": true, @@ -204,16 +204,17 @@ }, "dependencies": { "@astronautlabs/jsonpath": "^1.1.0", - "@hapi/call": "^8.0.1", + "@hapi/call": "^9.0.0", "@hapi/subtext": "^7.0.3", "@kubernetes/client-node": "^0.16.3", "@material-ui/styles": "^4.11.5", - "@ogre-tools/injectable": "7.1.0", - "@ogre-tools/injectable-react": "7.1.0", "@ogre-tools/fp": "7.1.0", + "@ogre-tools/injectable": "7.1.0", "@ogre-tools/injectable-extension-for-auto-registration": "7.1.0", + "@ogre-tools/injectable-react": "7.1.0", "@sentry/electron": "^3.0.7", "@sentry/integrations": "^6.19.3", + "@side/jest-runtime": "^1.0.0", "@types/circular-dependency-plugin": "5.0.5", "abort-controller": "^3.0.0", "auto-bind": "^4.0.0", @@ -233,15 +234,15 @@ "handlebars": "^4.7.7", "history": "^4.10.1", "http-proxy": "^1.18.1", - "immer": "^9.0.14", + "immer": "^9.0.15", "joi": "^17.6.0", "js-yaml": "^4.1.0", "jsdom": "^16.7.0", "lodash": "^4.17.15", "mac-ca": "^1.0.6", - "marked": "^4.0.16", + "marked": "^4.0.17", "md5-file": "^5.0.0", - "mobx": "^6.5.0", + "mobx": "^6.6.0", "mobx-observable-history": "^2.0.3", "mobx-react": "^7.5.0", "mobx-utils": "^6.0.4", @@ -279,7 +280,7 @@ "winston": "^3.7.2", "winston-console-format": "^1.0.8", "winston-transport-browserconsole": "^1.0.5", - "ws": "^8.7.0" + "ws": "^8.8.0" }, "devDependencies": { "@async-fn/jest": "1.6.1", @@ -288,6 +289,8 @@ "@material-ui/lab": "^4.0.0-alpha.60", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.7", "@sentry/types": "^6.19.7", + "@swc/core": "^1.2.197", + "@swc/jest": "^0.2.21", "@testing-library/dom": "^7.31.2", "@testing-library/jest-dom": "^5.16.4", "@testing-library/react": "^12.1.5", @@ -304,9 +307,11 @@ "@types/fs-extra": "^9.0.13", "@types/glob-to-regexp": "^0.4.1", "@types/gunzip-maybe": "^1.4.0", + "@types/hapi__call": "^9.0.0", + "@types/hapi__subtext": "^7.0.0", "@types/html-webpack-plugin": "^3.2.6", "@types/http-proxy": "^1.17.9", - "@types/jest": "^26.0.24", + "@types/jest": "^28.1.1", "@types/js-yaml": "^4.0.5", "@types/jsdom": "^16.2.14", "@types/lodash": "^4.14.181", @@ -314,7 +319,7 @@ "@types/md5-file": "^4.0.2", "@types/mini-css-extract-plugin": "^2.4.0", "@types/mock-fs": "^4.13.1", - "@types/node": "^16.11.39", + "@types/node": "^16.11.40", "@types/node-fetch": "^2.6.1", "@types/npm": "^2.0.32", "@types/proper-lockfile": "^4.1.2", @@ -331,7 +336,7 @@ "@types/request": "^2.48.7", "@types/request-promise-native": "^1.0.18", "@types/semver": "^7.3.9", - "@types/sharp": "^0.30.2", + "@types/sharp": "^0.30.4", "@types/spdy": "^3.4.5", "@types/tar": "^4.0.5", "@types/tar-stream": "^2.2.2", @@ -344,7 +349,7 @@ "@types/webpack-dev-server": "^4.7.2", "@types/webpack-env": "^1.17.0", "@types/webpack-node-externals": "^2.5.3", - "@typescript-eslint/eslint-plugin": "^5.27.1", + "@typescript-eslint/eslint-plugin": "^5.28.0", "@typescript-eslint/parser": "^5.27.0", "ansi_up": "^5.1.0", "chart.js": "^2.9.4", @@ -352,20 +357,20 @@ "cli-progress": "^3.11.1", "color": "^3.2.1", "command-line-args": "^5.2.1", - "concurrently": "^7.2.1", + "concurrently": "^7.2.2", "css-loader": "^6.7.1", "deepdash": "^5.3.9", "dompurify": "^2.3.8", "electron": "^15.5.7", "electron-builder": "^23.0.3", "electron-notarize": "^0.3.0", - "esbuild": "^0.14.38", + "esbuild": "^0.14.43", "esbuild-loader": "^2.19.0", - "eslint": "^8.16.0", + "eslint": "^8.17.0", "eslint-plugin-header": "^3.1.1", "eslint-plugin-import": "^2.26.0", "eslint-plugin-react": "^7.30.0", - "eslint-plugin-react-hooks": "^4.5.0", + "eslint-plugin-react-hooks": "^4.6.0", "eslint-plugin-unused-imports": "^2.0.0", "flex.box": "^3.4.4", "fork-ts-checker-webpack-plugin": "^6.5.2", @@ -374,10 +379,11 @@ "identity-obj-proxy": "^3.0.0", "ignore-loader": "^0.1.2", "include-media": "^1.4.9", - "jest": "26.6.3", + "jest": "^28.1.1", "jest-canvas-mock": "^2.3.1", + "jest-environment-jsdom": "^28.1.1", "jest-fetch-mock": "^3.0.3", - "jest-mock-extended": "^1.0.18", + "jest-mock-extended": "^2.0.6", "make-plural": "^6.2.2", "mini-css-extract-plugin": "^2.6.0", "mock-http": "^1.1.0", @@ -396,24 +402,23 @@ "react-select-event": "^5.5.0", "react-table": "^7.8.0", "react-window": "^1.8.7", - "sass": "^1.52.2", + "sass": "^1.52.3", "sass-loader": "^12.6.0", "sharp": "^0.30.6", "style-loader": "^3.3.1", "tailwindcss": "^3.0.23", "tar-stream": "^2.2.0", - "ts-jest": "26.5.6", "ts-loader": "^9.2.8", - "ts-node": "^10.7.0", - "type-fest": "^2.13.0", + "ts-node": "^10.8.1", + "type-fest": "^2.13.1", "typed-emitter": "^1.4.0", "typedoc": "0.22.17", "typedoc-plugin-markdown": "^3.11.12", - "typescript": "^4.5.5", + "typescript": "^4.7.3", "typescript-plugin-css-modules": "^3.4.0", "webpack": "^5.73.0", "webpack-cli": "^4.9.2", - "webpack-dev-server": "^4.9.1", + "webpack-dev-server": "^4.9.2", "webpack-node-externals": "^3.0.0", "xterm": "^4.18.0", "xterm-addon-fit": "^0.5.0" diff --git a/scripts/clear-release-pr.mjs b/scripts/create-release-pr.mjs similarity index 93% rename from scripts/clear-release-pr.mjs rename to scripts/create-release-pr.mjs index 4b55384e61..54b6ed17c5 100755 --- a/scripts/clear-release-pr.mjs +++ b/scripts/create-release-pr.mjs @@ -133,7 +133,8 @@ const relaventPrsQuery = await Promise.all( ); const relaventPrs = relaventPrsQuery .filter(query => query.stdout) - .map(query => query.pr); + .map(query => query.pr) + .filter(pr => pr.labels.every(label => label.name !== "skip-changelog")); const enhancementPrLabelName = "enhancement"; const bugfixPrLabelName = "bug"; @@ -152,11 +153,15 @@ const prBodyLines = [ "", ]; +function getPrEntry(pr) { + return `- ${pr.title} (**[#${pr.number}](https://github.com/lensapp/lens/pull/${pr.number})**) https://github.com/${pr.author.login}`; +} + if (enhancementPrs.length > 0) { prBodyLines.push( "## 🚀 Features", "", - ...enhancementPrs.map(pr => `- ${pr.title} (**#${pr.number}**) https://github.com/${pr.author.login}`), + ...enhancementPrs.map(getPrEntry), "", ); } @@ -165,7 +170,7 @@ if (bugfixPrs.length > 0) { prBodyLines.push( "## 🐛 Bug Fixes", "", - ...bugfixPrs.map(pr => `- ${pr.title} (**#${pr.number}**) https://github.com/${pr.author.login}`), + ...bugfixPrs.map(getPrEntry), "", ); } @@ -174,7 +179,7 @@ if (maintenencePrs.length > 0) { prBodyLines.push( "## 🧰 Maintenance", "", - ...maintenencePrs.map(pr => `- ${pr.title} (**#${pr.number}**) https://github.com/${pr.author.login}`), + ...maintenencePrs.map(getPrEntry), "", ); } diff --git a/src/behaviours/__snapshots__/extension-special-characters-in-page-registrations.test.tsx.snap b/src/behaviours/__snapshots__/extension-special-characters-in-page-registrations.test.tsx.snap index 80b0028469..5a952f701b 100644 --- a/src/behaviours/__snapshots__/extension-special-characters-in-page-registrations.test.tsx.snap +++ b/src/behaviours/__snapshots__/extension-special-characters-in-page-registrations.test.tsx.snap @@ -2,6 +2,16 @@ exports[`extension special characters in page registrations renders 1`] = `
+
+
+
+
@@ -10,6 +20,16 @@ exports[`extension special characters in page registrations renders 1`] = ` exports[`extension special characters in page registrations when navigating to route with ID having special characters renders 1`] = `
+
+
+
+
Some page
diff --git a/src/behaviours/__snapshots__/navigate-to-extension-page.test.tsx.snap b/src/behaviours/__snapshots__/navigate-to-extension-page.test.tsx.snap index c96763fe6e..f73444ff0e 100644 --- a/src/behaviours/__snapshots__/navigate-to-extension-page.test.tsx.snap +++ b/src/behaviours/__snapshots__/navigate-to-extension-page.test.tsx.snap @@ -2,6 +2,16 @@ exports[`navigate to extension page renders 1`] = `
+
+
+
+
@@ -10,6 +20,16 @@ exports[`navigate to extension page renders 1`] = ` exports[`navigate to extension page when extension navigates to child route renders 1`] = `
+
+
+
+
Child page
@@ -21,6 +41,16 @@ exports[`navigate to extension page when extension navigates to child route rend exports[`navigate to extension page when extension navigates to route with parameters renders 1`] = `
+
+
+
+
  • @@ -48,6 +78,16 @@ exports[`navigate to extension page when extension navigates to route with param exports[`navigate to extension page when extension navigates to route without parameters renders 1`] = `
    +
    +
    +
    +
    • @@ -75,6 +115,16 @@ exports[`navigate to extension page when extension navigates to route without pa exports[`navigate to extension page when extension navigates to route without parameters when changing page parameters renders 1`] = `
      +
      +
      +
      +
      • diff --git a/src/behaviours/__snapshots__/navigating-between-routes.test.tsx.snap b/src/behaviours/__snapshots__/navigating-between-routes.test.tsx.snap index 10e9eb2d39..bd3c3f51e7 100644 --- a/src/behaviours/__snapshots__/navigating-between-routes.test.tsx.snap +++ b/src/behaviours/__snapshots__/navigating-between-routes.test.tsx.snap @@ -2,6 +2,16 @@ exports[`navigating between routes given route with optional path parameters when navigating to route with path parameters renders 1`] = `
        +
        +
        +
        + 
             {
   "someParameter": "some-value",
@@ -16,6 +26,16 @@ exports[`navigating between routes given route with optional path parameters whe
 
 exports[`navigating between routes given route without path parameters when navigating to route renders 1`] = `
 
        
+  
        
+    
        
+    
        
+  
        
   
        
     Some component
   
        
diff --git a/src/behaviours/add-cluster/__snapshots__/navigation-using-application-menu.test.tsx.snap b/src/behaviours/add-cluster/__snapshots__/navigation-using-application-menu.test.tsx.snap
index 0fd00133aa..f6067dec05 100644
--- a/src/behaviours/add-cluster/__snapshots__/navigation-using-application-menu.test.tsx.snap
+++ b/src/behaviours/add-cluster/__snapshots__/navigation-using-application-menu.test.tsx.snap
@@ -2,6 +2,16 @@
 
 exports[`add-cluster - navigation using application menu renders 1`] = `
 
        
+  
        
+    
        
+    
        
+  
        
   
        
@@ -10,6 +20,16 @@ exports[`add-cluster - navigation using application menu renders 1`] = `
 
 exports[`add-cluster - navigation using application menu when navigating to add cluster using application menu renders 1`] = `
 
        
+  
        
+    
        
+    
        
+  
        
   
        
   
        
+    
        
+      
        
+      
        
+    
        
     
        
@@ -13,6 +23,16 @@ exports[`installing update using tray when started renders 1`] = `
 exports[`installing update using tray when started when user checks for updates using tray renders 1`] = `
 
   
        
+    
        
+      
        
+      
        
+    
        
     
        
@@ -64,6 +84,16 @@ exports[`installing update using tray when started when user checks for updates
 exports[`installing update using tray when started when user checks for updates using tray when new update is discovered renders 1`] = `
 
   
        
+    
        
+      
        
+      
        
+    
        
     
        
@@ -155,6 +185,16 @@ exports[`installing update using tray when started when user checks for updates
 exports[`installing update using tray when started when user checks for updates using tray when new update is discovered when download fails renders 1`] = `
 
   
        
+    
        
+      
        
+      
        
+    
        
     
        
@@ -286,6 +326,16 @@ exports[`installing update using tray when started when user checks for updates
 exports[`installing update using tray when started when user checks for updates using tray when new update is discovered when download succeeds renders 1`] = `
 
   
        
+    
        
+      
        
+      
        
+    
        
     
        
@@ -447,6 +497,16 @@ Lens should restart automatically, if it doesn't please restart manually. Instal
 exports[`installing update using tray when started when user checks for updates using tray when no new update is discovered renders 1`] = `
 
   
        
+    
        
+      
        
+      
        
+    
        
     
        
diff --git a/src/behaviours/application-update/__snapshots__/installing-update.test.ts.snap b/src/behaviours/application-update/__snapshots__/installing-update.test.ts.snap
index 7025289254..0e271ef2d3 100644
--- a/src/behaviours/application-update/__snapshots__/installing-update.test.ts.snap
+++ b/src/behaviours/application-update/__snapshots__/installing-update.test.ts.snap
@@ -3,6 +3,16 @@
 exports[`installing update when started renders 1`] = `
 
   
        
+    
        
+      
        
+      
        
+    
        
     
        
@@ -13,6 +23,16 @@ exports[`installing update when started renders 1`] = `
 exports[`installing update when started when user checks for updates renders 1`] = `
 
   
        
+    
        
+      
        
+      
        
+    
        
     
        
@@ -23,6 +43,16 @@ exports[`installing update when started when user checks for updates renders 1`]
 exports[`installing update when started when user checks for updates when new update is discovered renders 1`] = `
 
   
        
+    
        
+      
        
+      
        
+    
        
     
        
@@ -33,6 +63,16 @@ exports[`installing update when started when user checks for updates when new up
 exports[`installing update when started when user checks for updates when new update is discovered when download fails renders 1`] = `
 
   
        
+    
        
+      
        
+      
        
+    
        
     
        
@@ -43,6 +83,16 @@ exports[`installing update when started when user checks for updates when new up
 exports[`installing update when started when user checks for updates when new update is discovered when download succeeds renders 1`] = `
 
   
        
+    
        
+      
        
+      
        
+    
        
     
        
@@ -53,6 +103,16 @@ exports[`installing update when started when user checks for updates when new up
 exports[`installing update when started when user checks for updates when new update is discovered when download succeeds when user answers not to install the update renders 1`] = `
 
   
        
+    
        
+      
        
+      
        
+    
        
     
        
@@ -63,6 +123,16 @@ exports[`installing update when started when user checks for updates when new up
 exports[`installing update when started when user checks for updates when new update is discovered when download succeeds when user answers to install the update renders 1`] = `
 
   
        
+    
        
+      
        
+      
        
+    
        
     
        
@@ -73,6 +143,16 @@ exports[`installing update when started when user checks for updates when new up
 exports[`installing update when started when user checks for updates when no new update is discovered renders 1`] = `
 
   
        
+    
        
+      
        
+      
        
+    
        
     
        
diff --git a/src/behaviours/application-update/__snapshots__/periodical-checking-of-updates.test.ts.snap b/src/behaviours/application-update/__snapshots__/periodical-checking-of-updates.test.ts.snap
index 84fa35ae04..744a9dfb7e 100644
--- a/src/behaviours/application-update/__snapshots__/periodical-checking-of-updates.test.ts.snap
+++ b/src/behaviours/application-update/__snapshots__/periodical-checking-of-updates.test.ts.snap
@@ -3,6 +3,16 @@
 exports[`periodical checking of updates given updater is enabled and configuration exists, when started renders 1`] = `
 
   
        
+    
        
+      
        
+      
        
+    
        
     
        
diff --git a/src/behaviours/application-update/__snapshots__/selection-of-update-stability.test.ts.snap b/src/behaviours/application-update/__snapshots__/selection-of-update-stability.test.ts.snap
index dc96c447b0..ea700234da 100644
--- a/src/behaviours/application-update/__snapshots__/selection-of-update-stability.test.ts.snap
+++ b/src/behaviours/application-update/__snapshots__/selection-of-update-stability.test.ts.snap
@@ -3,6 +3,16 @@
 exports[`selection of update stability when started renders 1`] = `
 
   
        
+    
        
+      
        
+      
        
+    
        
     
        
diff --git a/src/behaviours/application-update/analytics-for-installing-update.test.ts b/src/behaviours/application-update/analytics-for-installing-update.test.ts
new file mode 100644
index 0000000000..c33a3f92af
--- /dev/null
+++ b/src/behaviours/application-update/analytics-for-installing-update.test.ts
@@ -0,0 +1,225 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+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/application-update/publish-is-configured.injectable";
+import type { AsyncFnMock } from "@async-fn/jest";
+import asyncFn from "@async-fn/jest";
+import type { CheckForPlatformUpdates } from "../../main/application-update/check-for-platform-updates/check-for-platform-updates.injectable";
+import checkForPlatformUpdatesInjectable from "../../main/application-update/check-for-platform-updates/check-for-platform-updates.injectable";
+import appEventBusInjectable from "../../common/app-event-bus/app-event-bus.injectable";
+import type { DiContainer } from "@ogre-tools/injectable";
+import processCheckingForUpdatesInjectable from "../../main/application-update/check-for-updates/process-checking-for-updates.injectable";
+import type { DownloadPlatformUpdate } from "../../main/application-update/download-platform-update/download-platform-update.injectable";
+import downloadPlatformUpdateInjectable from "../../main/application-update/download-platform-update/download-platform-update.injectable";
+import quitAndInstallUpdateInjectable from "../../main/application-update/quit-and-install-update.injectable";
+import appVersionInjectable from "../../common/get-configuration-file-model/app-version/app-version.injectable";
+import periodicalCheckForUpdatesInjectable from "../../main/application-update/periodical-check-for-updates/periodical-check-for-updates.injectable";
+
+describe("analytics for installing update", () => {
+  let applicationBuilder: ApplicationBuilder;
+  let checkForPlatformUpdatesMock: AsyncFnMock;
+  let downloadPlatformUpdateMock: AsyncFnMock;
+  let analyticsListenerMock: jest.Mock;
+  let mainDi: DiContainer;
+
+  beforeEach(async () => {
+    jest.useFakeTimers();
+
+    global.Date.now = () => new Date("2015-10-21T07:28:00Z").getTime();
+
+    applicationBuilder = getApplicationBuilder();
+
+    analyticsListenerMock = jest.fn();
+
+    applicationBuilder.beforeApplicationStart(({ mainDi }) => {
+      mainDi.override(appVersionInjectable, () => "42.0.0");
+
+      checkForPlatformUpdatesMock = asyncFn();
+
+      mainDi.override(
+        checkForPlatformUpdatesInjectable,
+        () => checkForPlatformUpdatesMock,
+      );
+
+      downloadPlatformUpdateMock = asyncFn();
+
+      mainDi.override(downloadPlatformUpdateInjectable, () => downloadPlatformUpdateMock);
+      mainDi.override(electronUpdaterIsActiveInjectable, () => true);
+
+      mainDi.override(publishIsConfiguredInjectable, () => true);
+
+      const eventBus = mainDi.inject(appEventBusInjectable);
+
+      eventBus.addListener(analyticsListenerMock);
+    });
+
+    mainDi = applicationBuilder.dis.mainDi;
+  });
+
+  describe("given application is started and checking updates periodically", () => {
+    beforeEach(async () => {
+      mainDi.unoverride(periodicalCheckForUpdatesInjectable);
+      mainDi.permitSideEffects(periodicalCheckForUpdatesInjectable);
+
+      await applicationBuilder.render();
+
+    });
+
+    it("sends event to analytics for being checked periodically", () => {
+      expect(analyticsListenerMock).toHaveBeenCalledWith({
+        name: "app",
+        action: "checking-for-updates",
+
+        params: {
+          currentDateTime: "2015-10-21T07:28:00Z",
+          source: "periodic",
+        },
+      });
+    });
+
+    it("when enough time passes to check for updates again, sends event to analytics for being checked periodically", () => {
+      analyticsListenerMock.mockClear();
+
+      jest.advanceTimersByTime(1000 * 60 * 60 * 2);
+
+      expect(analyticsListenerMock).toHaveBeenCalledWith({
+        name: "app",
+        action: "checking-for-updates",
+
+        params: {
+          currentDateTime: "2015-10-21T07:28:00Z",
+          source: "periodic",
+        },
+      });
+    });
+  });
+
+  describe("when application is started", () => {
+    beforeEach(async () => {
+      analyticsListenerMock.mockClear();
+
+      await applicationBuilder.render();
+    });
+
+    it("sends event to analytics about the current version", () => {
+      expect(analyticsListenerMock).toHaveBeenCalledWith({
+        name: "app",
+        action: "current-version",
+
+        params: {
+          version: "42.0.0",
+          currentDateTime: "2015-10-21T07:28:00Z",
+        },
+      });
+    });
+
+    it("when checking for updates using tray, sends event to analytics for being checked from tray", async () => {
+      analyticsListenerMock.mockClear();
+
+      applicationBuilder.tray.click("check-for-updates");
+
+      expect(analyticsListenerMock.mock.calls).toEqual([
+        [
+          {
+            name: "app",
+            action: "checking-for-updates",
+
+            params: {
+              currentDateTime: "2015-10-21T07:28:00Z",
+              source: "tray",
+            },
+          },
+        ],
+      ]);
+
+    });
+
+    it("when checking for updates using application menu, sends event to analytics for being checked from application menu", async () => {
+      analyticsListenerMock.mockClear();
+
+      applicationBuilder.applicationMenu.click("root.check-for-updates");
+
+      expect(analyticsListenerMock.mock.calls).toEqual([
+        [
+          {
+            name: "app",
+            action: "checking-for-updates",
+
+            params: {
+              currentDateTime: "2015-10-21T07:28:00Z",
+              source: "application-menu",
+            },
+          },
+        ],
+      ]);
+    });
+
+    describe("given checking for updates, when check for updates resolves with new update being available", () => {
+      beforeEach(async () => {
+        const processCheckingForUpdates = mainDi.inject(processCheckingForUpdatesInjectable);
+
+        processCheckingForUpdates("irrelevant");
+
+        analyticsListenerMock.mockClear();
+
+        await checkForPlatformUpdatesMock.resolve({
+          updateWasDiscovered: true,
+          version: "43.0.0",
+        });
+      });
+
+      it("sends event to analytics about new update being available", () => {
+        expect(analyticsListenerMock.mock.calls).toEqual([
+          [
+            {
+              name: "app",
+              action: "update-was-discovered",
+
+              params: {
+                version: "43.0.0",
+                currentDateTime: "2015-10-21T07:28:00Z",
+              },
+            },
+          ],
+        ]);
+      });
+
+      describe("given update is downloaded", () => {
+        beforeEach(async () => {
+          analyticsListenerMock.mockClear();
+
+          await downloadPlatformUpdateMock.resolve({ downloadWasSuccessful: true });
+        });
+
+        it("does not send event to analytics about update downloaded being successful", () => {
+          expect(analyticsListenerMock).not.toHaveBeenCalled();
+        });
+
+        it("when installing the update, sends event to analytics about installing the update", () => {
+          const quitAndInstallUpdate = mainDi.inject(quitAndInstallUpdateInjectable);
+
+          quitAndInstallUpdate();
+
+          expect(analyticsListenerMock.mock.calls).toEqual([
+            [
+              {
+                name: "app",
+                action: "start-installing-update",
+
+                params: {
+                  version: "43.0.0",
+                  currentDateTime: "2015-10-21T07:28:00Z",
+                  updateChannel: "latest",
+                },
+              },
+            ],
+          ]);
+        });
+      });
+    });
+  });
+});
diff --git a/src/behaviours/application-update/downgrading-version-update.test.ts b/src/behaviours/application-update/downgrading-version-update.test.ts
index e8e5635fb3..2abefa1ac8 100644
--- a/src/behaviours/application-update/downgrading-version-update.test.ts
+++ b/src/behaviours/application-update/downgrading-version-update.test.ts
@@ -22,8 +22,6 @@ describe("downgrading version update", () => {
   let mainDi: DiContainer;
 
   beforeEach(() => {
-    jest.useFakeTimers();
-
     applicationBuilder = getApplicationBuilder();
 
     applicationBuilder.beforeApplicationStart(({ mainDi }) => {
@@ -79,7 +77,7 @@ describe("downgrading version update", () => {
 
       const processCheckingForUpdates = mainDi.inject(processCheckingForUpdatesInjectable);
 
-      processCheckingForUpdates();
+      processCheckingForUpdates("irrelevant");
 
       expect(checkForPlatformUpdatesMock).toHaveBeenCalledWith(expect.any(Object), { allowDowngrade: downgradeIsAllowed });
     });
diff --git a/src/behaviours/application-update/installing-update.test.ts b/src/behaviours/application-update/installing-update.test.ts
index 3fec5f6d27..14cd107598 100644
--- a/src/behaviours/application-update/installing-update.test.ts
+++ b/src/behaviours/application-update/installing-update.test.ts
@@ -4,7 +4,7 @@
  */
 import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
-import quitAndInstallUpdateInjectable from "../../main/electron-app/features/quit-and-install-update.injectable";
+import quitAndInstallUpdateInjectable from "../../main/application-update/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/application-update/publish-is-configured.injectable";
@@ -67,7 +67,7 @@ describe("installing update", () => {
 
   describe("when started", () => {
     let rendered: RenderResult;
-    let processCheckingForUpdates: () => Promise;
+    let processCheckingForUpdates: (source: string) => Promise;
 
     beforeEach(async () => {
       rendered = await applicationBuilder.render();
@@ -83,7 +83,7 @@ describe("installing update", () => {
       let processCheckingForUpdatesPromise: Promise;
 
       beforeEach(async () => {
-        processCheckingForUpdatesPromise = processCheckingForUpdates();
+        processCheckingForUpdatesPromise = processCheckingForUpdates("irrelevant");
       });
 
       it("checks for updates", () => {
diff --git a/src/behaviours/application-update/selection-of-update-stability.test.ts b/src/behaviours/application-update/selection-of-update-stability.test.ts
index 1792fcd484..1fd6e22dbd 100644
--- a/src/behaviours/application-update/selection-of-update-stability.test.ts
+++ b/src/behaviours/application-update/selection-of-update-stability.test.ts
@@ -4,7 +4,7 @@
  */
 import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
-import quitAndInstallUpdateInjectable from "../../main/electron-app/features/quit-and-install-update.injectable";
+import quitAndInstallUpdateInjectable from "../../main/application-update/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/application-update/publish-is-configured.injectable";
@@ -72,7 +72,7 @@ describe("selection of update stability", () => {
 
   describe("when started", () => {
     let rendered: RenderResult;
-    let processCheckingForUpdates: () => Promise;
+    let processCheckingForUpdates: (source: string) => Promise;
 
     beforeEach(async () => {
       rendered = await applicationBuilder.render();
@@ -97,7 +97,7 @@ describe("selection of update stability", () => {
 
         selectedUpdateChannel.setValue(updateChannels.alpha.id);
 
-        processCheckingForUpdates();
+        processCheckingForUpdates("irrelevant");
       });
 
       it('checks updates from update channel "alpha"', () => {
@@ -191,7 +191,7 @@ describe("selection of update stability", () => {
 
       describe("when checking for updates", () => {
         beforeEach(() => {
-          processCheckingForUpdates();
+          processCheckingForUpdates("irrelevant");
         });
 
         describe('when update from "beta" channel is discovered', () => {
@@ -241,7 +241,7 @@ describe("selection of update stability", () => {
 
     const processCheckingForUpdates = applicationBuilder.dis.mainDi.inject(processCheckingForUpdatesInjectable);
 
-    processCheckingForUpdates();
+    processCheckingForUpdates("irrelevant");
 
     expect(checkForPlatformUpdatesMock).toHaveBeenCalledWith(updateChannels.beta, expect.any(Object));
   });
@@ -259,7 +259,7 @@ describe("selection of update stability", () => {
 
     const processCheckingForUpdates = applicationBuilder.dis.mainDi.inject(processCheckingForUpdatesInjectable);
 
-    processCheckingForUpdates();
+    processCheckingForUpdates("irrelevant");
 
     expect(checkForPlatformUpdatesMock).toHaveBeenCalledWith(updateChannels.latest, expect.any(Object));
   });
@@ -273,7 +273,7 @@ describe("selection of update stability", () => {
 
     const processCheckingForUpdates = applicationBuilder.dis.mainDi.inject(processCheckingForUpdatesInjectable);
 
-    processCheckingForUpdates();
+    processCheckingForUpdates("irrelevant");
 
     expect(checkForPlatformUpdatesMock).toHaveBeenCalledWith(
       updateChannels.latest,
@@ -290,7 +290,7 @@ describe("selection of update stability", () => {
 
     const processCheckingForUpdates = applicationBuilder.dis.mainDi.inject(processCheckingForUpdatesInjectable);
 
-    processCheckingForUpdates();
+    processCheckingForUpdates("irrelevant");
 
     expect(checkForPlatformUpdatesMock).toHaveBeenCalledWith(updateChannels.alpha, expect.any(Object));
   });
@@ -304,7 +304,7 @@ describe("selection of update stability", () => {
 
     const processCheckingForUpdates = applicationBuilder.dis.mainDi.inject(processCheckingForUpdatesInjectable);
 
-    processCheckingForUpdates();
+    processCheckingForUpdates("irrelevant");
 
     expect(checkForPlatformUpdatesMock).toHaveBeenCalledWith(updateChannels.beta, expect.any(Object));
   });
@@ -324,7 +324,7 @@ describe("selection of update stability", () => {
 
     const processCheckingForUpdates = applicationBuilder.dis.mainDi.inject(processCheckingForUpdatesInjectable);
 
-    processCheckingForUpdates();
+    processCheckingForUpdates("irrelevant");
 
     expect(checkForPlatformUpdatesMock).toHaveBeenCalledWith(updateChannels.beta, expect.any(Object));
   });
diff --git a/src/behaviours/cluster/sidebar-and-tab-navigation-for-core.test.tsx b/src/behaviours/cluster/sidebar-and-tab-navigation-for-core.test.tsx
index f270b7d13e..a8c26acc2a 100644
--- a/src/behaviours/cluster/sidebar-and-tab-navigation-for-core.test.tsx
+++ b/src/behaviours/cluster/sidebar-and-tab-navigation-for-core.test.tsx
@@ -14,7 +14,7 @@ import { sidebarItemsInjectionToken } from "../../renderer/components/layout/sid
 import { computed } from "mobx";
 import { noop } from "lodash/fp";
 import routeIsActiveInjectable from "../../renderer/routes/route-is-active.injectable";
-import { routeInjectionToken } from "../../common/front-end-routing/route-injection-token";
+import { frontEndRouteInjectionToken } from "../../common/front-end-routing/front-end-route-injection-token";
 import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import writeJsonFileInjectable from "../../common/fs/write-json-file.injectable";
@@ -337,7 +337,7 @@ const testRouteInjectable = getInjectable({
     isEnabled: computed(() => true),
   }),
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 const testRouteComponentInjectable = getInjectable({
diff --git a/src/behaviours/cluster/visibility-of-sidebar-items.test.tsx b/src/behaviours/cluster/visibility-of-sidebar-items.test.tsx
index aa73936470..c0e0cc88f3 100644
--- a/src/behaviours/cluster/visibility-of-sidebar-items.test.tsx
+++ b/src/behaviours/cluster/visibility-of-sidebar-items.test.tsx
@@ -10,7 +10,7 @@ import { computed } from "mobx";
 import { routeSpecificComponentInjectionToken } from "../../renderer/routes/route-specific-component-injection-token";
 import React from "react";
 import isAllowedResourceInjectable from "../../common/utils/is-allowed-resource.injectable";
-import { routeInjectionToken } from "../../common/front-end-routing/route-injection-token";
+import { frontEndRouteInjectionToken } from "../../common/front-end-routing/front-end-route-injection-token";
 import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import { navigateToRouteInjectionToken } from "../../common/front-end-routing/navigate-to-route-injection-token";
@@ -83,7 +83,7 @@ const testRouteInjectable = getInjectable({
     };
   },
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 const testRouteComponentInjectable = getInjectable({
diff --git a/src/behaviours/extensions/__snapshots__/navigation-using-application-menu.test.ts.snap b/src/behaviours/extensions/__snapshots__/navigation-using-application-menu.test.ts.snap
index c14ccb6160..8dd45c656a 100644
--- a/src/behaviours/extensions/__snapshots__/navigation-using-application-menu.test.ts.snap
+++ b/src/behaviours/extensions/__snapshots__/navigation-using-application-menu.test.ts.snap
@@ -2,6 +2,16 @@
 
 exports[`extensions - navigation using application menu renders 1`] = `
 
        
+  
        
+    
        
+    
        
+  
        
   
        
@@ -10,6 +20,16 @@ exports[`extensions - navigation using application menu renders 1`] = `
 
 exports[`extensions - navigation using application menu when navigating to extensions using application menu renders 1`] = `
 
        
+  
        
+    
        
+    
        
+  
        
   
         {
   });
 
   describe("when navigating to extensions using application menu", () => {
-    beforeEach(async () => {
-      await applicationBuilder.applicationMenu.click("root.extensions");
+    beforeEach(() => {
+      applicationBuilder.applicationMenu.click("root.extensions");
     });
 
     it("focuses the window", () => {
diff --git a/src/behaviours/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap b/src/behaviours/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap
new file mode 100644
index 0000000000..21803cf04a
--- /dev/null
+++ b/src/behaviours/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap
@@ -0,0 +1,6951 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`add custom helm repository in preferences when navigating to preferences containing helm repositories renders 1`] = `
+
+  
        
+    
        
+      
        
+      
        
+    
        
+    
        
+      
+      
        
+        
        
+          
        
+            
        
+              
        
+                Kubernetes
+              
        
+              
        
+                
        
+                  Kubectl binary download
+                   
+                
        
+                
+              
        
+              
        
+                
        
+                  Download mirror
+                   
+                
        
+                
        
+                  
+                  
+                  
        
+                    
        
+                      
        
+                        Download mirror for kubectl
+                      
        
+                      
        
+                        
+                      
        
+                    
        
+                    
        
+                      
+                      
+                    
        
+                  
        
+                
        
+              
        
+              
        
+                
        
+                  Directory for binaries
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  The directory to download binaries into.
+                
        
+              
        
+              
        
+                
        
+                  Path to kubectl binary
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Kubeconfig Syncs
+              
        
+              
        
+                
+              
        
+              
        
+                Synced Items
+                 
+              
        
+              
        
+                
        
+                  No files and folders have been synced yet
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Helm Charts
+              
        
+              
        
+                
        
+                  
        
+                    
        
+                      
+                      
+                      
        
+                        
        
+                          
        
+                            Repositories
+                          
        
+                          
        
+                            
+                          
        
+                        
        
+                        
        
+                          
+                          
+                          
+                        
        
+                      
        
+                    
        
+                    
+                  
        
+                  
        
+                    
        
+                      
        
+                    
        
+                  
        
+                  
        
+                
        
+              
        
+            
        
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                  
+                    close
+                  
+                
+              
        
+              
+            
        
+          
        
+        
        
+      
        
+    
        
+    
        
+  
        
+
+`;
+
+exports[`add custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve renders 1`] = `
+
+  
        
+    
        
+      
        
+      
        
+    
        
+    
        
+      
+      
        
+        
        
+          
        
+            
        
+              
        
+                Kubernetes
+              
        
+              
        
+                
        
+                  Kubectl binary download
+                   
+                
        
+                
+              
        
+              
        
+                
        
+                  Download mirror
+                   
+                
        
+                
        
+                  
+                  
+                  
        
+                    
        
+                      
        
+                        Download mirror for kubectl
+                      
        
+                      
        
+                        
+                      
        
+                    
        
+                    
        
+                      
+                      
+                    
        
+                  
        
+                
        
+              
        
+              
        
+                
        
+                  Directory for binaries
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  The directory to download binaries into.
+                
        
+              
        
+              
        
+                
        
+                  Path to kubectl binary
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Kubeconfig Syncs
+              
        
+              
        
+                
+              
        
+              
        
+                Synced Items
+                 
+              
        
+              
        
+                
        
+                  No files and folders have been synced yet
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Helm Charts
+              
        
+              
        
+                
        
+                  
        
+                    
        
+                      
+                      
+                      
        
+                        
        
+                          
        
+                            Repositories
+                          
        
+                          
        
+                            
+                          
        
+                        
        
+                        
        
+                          
+                          
+                        
        
+                      
        
+                    
        
+                    
+                  
        
+                  
        
+                    
        
+                      
        
+                        
        
+                          Some active repository
+                        
        
+                        
        
+                          some-url
+                        
        
+                      
        
+                      
+                        
+                          delete
+                        
+                      
+                    
        
+                  
        
+                  
        
+                
        
+              
        
+            
        
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                  
+                    close
+                  
+                
+              
        
+              
+            
        
+          
        
+        
        
+      
        
+    
        
+    
        
+  
        
+
+`;
+
+exports[`add custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository renders 1`] = `
+
+  
        
+    
        
+      
        
+      
        
+    
        
+    
        
+      
+      
        
+        
        
+          
        
+            
        
+              
        
+                Kubernetes
+              
        
+              
        
+                
        
+                  Kubectl binary download
+                   
+                
        
+                
+              
        
+              
        
+                
        
+                  Download mirror
+                   
+                
        
+                
        
+                  
+                  
+                  
        
+                    
        
+                      
        
+                        Download mirror for kubectl
+                      
        
+                      
        
+                        
+                      
        
+                    
        
+                    
        
+                      
+                      
+                    
        
+                  
        
+                
        
+              
        
+              
        
+                
        
+                  Directory for binaries
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  The directory to download binaries into.
+                
        
+              
        
+              
        
+                
        
+                  Path to kubectl binary
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Kubeconfig Syncs
+              
        
+              
        
+                
+              
        
+              
        
+                Synced Items
+                 
+              
        
+              
        
+                
        
+                  No files and folders have been synced yet
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Helm Charts
+              
        
+              
        
+                
        
+                  
        
+                    
        
+                      
+                      
+                      
        
+                        
        
+                          
        
+                            Repositories
+                          
        
+                          
        
+                            
+                          
        
+                        
        
+                        
        
+                          
+                          
+                        
        
+                      
        
+                    
        
+                    
+                  
        
+                  
        
+                    
        
+                      
        
+                        
        
+                          Some active repository
+                        
        
+                        
        
+                          some-url
+                        
        
+                      
        
+                      
+                        
+                          delete
+                        
+                      
+                    
        
+                  
        
+                  
        
+                
        
+              
        
+            
        
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                  
+                    close
+                  
+                
+              
        
+              
+            
        
+          
        
+        
        
+      
        
+    
        
+    
        
+  
        
+  
        
+    
        
+      
        
+        
        
+          
        
+            Add custom Helm Repo
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                
        
+              
        
+              
        
+                
+                
        
+              
        
+              
+            
        
+          
        
+          
        
+            
+            
+          
        
+        
+      
        
+    
        
+  
        
+
+`;
+
+exports[`add custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository when closing the dialog by clicking cancel renders 1`] = `
+
+  
        
+    
        
+      
        
+      
        
+    
        
+    
        
+      
+      
        
+        
        
+          
        
+            
        
+              
        
+                Kubernetes
+              
        
+              
        
+                
        
+                  Kubectl binary download
+                   
+                
        
+                
+              
        
+              
        
+                
        
+                  Download mirror
+                   
+                
        
+                
        
+                  
+                  
+                  
        
+                    
        
+                      
        
+                        Download mirror for kubectl
+                      
        
+                      
        
+                        
+                      
        
+                    
        
+                    
        
+                      
+                      
+                    
        
+                  
        
+                
        
+              
        
+              
        
+                
        
+                  Directory for binaries
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  The directory to download binaries into.
+                
        
+              
        
+              
        
+                
        
+                  Path to kubectl binary
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Kubeconfig Syncs
+              
        
+              
        
+                
+              
        
+              
        
+                Synced Items
+                 
+              
        
+              
        
+                
        
+                  No files and folders have been synced yet
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Helm Charts
+              
        
+              
        
+                
        
+                  
        
+                    
        
+                      
+                      
+                      
        
+                        
        
+                          
        
+                            Repositories
+                          
        
+                          
        
+                            
+                          
        
+                        
        
+                        
        
+                          
+                          
+                        
        
+                      
        
+                    
        
+                    
+                  
        
+                  
        
+                    
        
+                      
        
+                        
        
+                          Some active repository
+                        
        
+                        
        
+                          some-url
+                        
        
+                      
        
+                      
+                        
+                          delete
+                        
+                      
+                    
        
+                  
        
+                  
        
+                
        
+              
        
+            
        
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                  
+                    close
+                  
+                
+              
        
+              
+            
        
+          
        
+        
        
+      
        
+    
        
+    
        
+  
        
+  
        
+    
        
+  
        
+
+`;
+
+exports[`add custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository when inputted minimal options for the repository renders 1`] = `
+
+  
        
+    
        
+      
        
+      
        
+    
        
+    
        
+      
+      
        
+        
        
+          
        
+            
        
+              
        
+                Kubernetes
+              
        
+              
        
+                
        
+                  Kubectl binary download
+                   
+                
        
+                
+              
        
+              
        
+                
        
+                  Download mirror
+                   
+                
        
+                
        
+                  
+                  
+                  
        
+                    
        
+                      
        
+                        Download mirror for kubectl
+                      
        
+                      
        
+                        
+                      
        
+                    
        
+                    
        
+                      
+                      
+                    
        
+                  
        
+                
        
+              
        
+              
        
+                
        
+                  Directory for binaries
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  The directory to download binaries into.
+                
        
+              
        
+              
        
+                
        
+                  Path to kubectl binary
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Kubeconfig Syncs
+              
        
+              
        
+                
+              
        
+              
        
+                Synced Items
+                 
+              
        
+              
        
+                
        
+                  No files and folders have been synced yet
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Helm Charts
+              
        
+              
        
+                
        
+                  
        
+                    
        
+                      
+                      
+                      
        
+                        
        
+                          
        
+                            Repositories
+                          
        
+                          
        
+                            
+                          
        
+                        
        
+                        
        
+                          
+                          
+                        
        
+                      
        
+                    
        
+                    
+                  
        
+                  
        
+                    
        
+                      
        
+                        
        
+                          Some active repository
+                        
        
+                        
        
+                          some-url
+                        
        
+                      
        
+                      
+                        
+                          delete
+                        
+                      
+                    
        
+                  
        
+                  
        
+                
        
+              
        
+            
        
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                  
+                    close
+                  
+                
+              
        
+              
+            
        
+          
        
+        
        
+      
        
+    
        
+    
        
+  
        
+  
        
+    
        
+      
        
+        
        
+          
        
+            Add custom Helm Repo
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                
        
+              
        
+              
        
+                
+                
        
+              
        
+              
+            
        
+          
        
+          
        
+            
+            
+          
        
+        
+      
        
+    
        
+  
        
+
+`;
+
+exports[`add custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository when inputted minimal options for the repository when showing the maximal options renders 1`] = `
+
+  
        
+    
        
+      
        
+      
        
+    
        
+    
        
+      
+      
        
+        
        
+          
        
+            
        
+              
        
+                Kubernetes
+              
        
+              
        
+                
        
+                  Kubectl binary download
+                   
+                
        
+                
+              
        
+              
        
+                
        
+                  Download mirror
+                   
+                
        
+                
        
+                  
+                  
+                  
        
+                    
        
+                      
        
+                        Download mirror for kubectl
+                      
        
+                      
        
+                        
+                      
        
+                    
        
+                    
        
+                      
+                      
+                    
        
+                  
        
+                
        
+              
        
+              
        
+                
        
+                  Directory for binaries
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  The directory to download binaries into.
+                
        
+              
        
+              
        
+                
        
+                  Path to kubectl binary
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Kubeconfig Syncs
+              
        
+              
        
+                
+              
        
+              
        
+                Synced Items
+                 
+              
        
+              
        
+                
        
+                  No files and folders have been synced yet
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Helm Charts
+              
        
+              
        
+                
        
+                  
        
+                    
        
+                      
+                      
+                      
        
+                        
        
+                          
        
+                            Repositories
+                          
        
+                          
        
+                            
+                          
        
+                        
        
+                        
        
+                          
+                          
+                        
        
+                      
        
+                    
        
+                    
+                  
        
+                  
        
+                    
        
+                      
        
+                        
        
+                          Some active repository
+                        
        
+                        
        
+                          some-url
+                        
        
+                      
        
+                      
+                        
+                          delete
+                        
+                      
+                    
        
+                  
        
+                  
        
+                
        
+              
        
+            
        
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                  
+                    close
+                  
+                
+              
        
+              
+            
        
+          
        
+        
        
+      
        
+    
        
+    
        
+  
        
+  
        
+    
        
+      
        
+        
        
+          
        
+            Add custom Helm Repo
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                
        
+              
        
+              
        
+                
+                
        
+              
        
+              
+              
        
+                
        
+                  Security settings
+                   
+                
        
+                
+                
        
+                  
        
+                    
+                    
        
+                  
        
+                  
+                    
+                      folder
+                    
+                  
+                
        
+                
        
+                  
        
+                    
+                    
        
+                  
        
+                  
+                    
+                      folder
+                    
+                  
+                
        
+                
        
+                  
        
+                    
+                    
        
+                  
        
+                  
+                    
+                      folder
+                    
+                  
+                
        
+                
        
+                  Chart Repository Credentials
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+          
        
+          
        
+            
+            
+          
        
+        
+      
        
+    
        
+  
        
+
+`;
+
+exports[`add custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository when inputted minimal options for the repository when showing the maximal options when hiding maximal options renders 1`] = `
+
+  
        
+    
        
+      
        
+      
        
+    
        
+    
        
+      
+      
        
+        
        
+          
        
+            
        
+              
        
+                Kubernetes
+              
        
+              
        
+                
        
+                  Kubectl binary download
+                   
+                
        
+                
+              
        
+              
        
+                
        
+                  Download mirror
+                   
+                
        
+                
        
+                  
+                  
+                  
        
+                    
        
+                      
        
+                        Download mirror for kubectl
+                      
        
+                      
        
+                        
+                      
        
+                    
        
+                    
        
+                      
+                      
+                    
        
+                  
        
+                
        
+              
        
+              
        
+                
        
+                  Directory for binaries
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  The directory to download binaries into.
+                
        
+              
        
+              
        
+                
        
+                  Path to kubectl binary
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Kubeconfig Syncs
+              
        
+              
        
+                
+              
        
+              
        
+                Synced Items
+                 
+              
        
+              
        
+                
        
+                  No files and folders have been synced yet
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Helm Charts
+              
        
+              
        
+                
        
+                  
        
+                    
        
+                      
+                      
+                      
        
+                        
        
+                          
        
+                            Repositories
+                          
        
+                          
        
+                            
+                          
        
+                        
        
+                        
        
+                          
+                          
+                        
        
+                      
        
+                    
        
+                    
+                  
        
+                  
        
+                    
        
+                      
        
+                        
        
+                          Some active repository
+                        
        
+                        
        
+                          some-url
+                        
        
+                      
        
+                      
+                        
+                          delete
+                        
+                      
+                    
        
+                  
        
+                  
        
+                
        
+              
        
+            
        
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                  
+                    close
+                  
+                
+              
        
+              
+            
        
+          
        
+        
        
+      
        
+    
        
+    
        
+  
        
+  
        
+    
        
+      
        
+        
        
+          
        
+            Add custom Helm Repo
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                
        
+              
        
+              
        
+                
+                
        
+              
        
+              
+            
        
+          
        
+          
        
+            
+            
+          
        
+        
+      
        
+    
        
+  
        
+
+`;
+
+exports[`add custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository when inputted minimal options for the repository when showing the maximal options when inputted maximal options renders 1`] = `
+
+  
        
+    
        
+      
        
+      
        
+    
        
+    
        
+      
+      
        
+        
        
+          
        
+            
        
+              
        
+                Kubernetes
+              
        
+              
        
+                
        
+                  Kubectl binary download
+                   
+                
        
+                
+              
        
+              
        
+                
        
+                  Download mirror
+                   
+                
        
+                
        
+                  
+                  
+                  
        
+                    
        
+                      
        
+                        Download mirror for kubectl
+                      
        
+                      
        
+                        
+                      
        
+                    
        
+                    
        
+                      
+                      
+                    
        
+                  
        
+                
        
+              
        
+              
        
+                
        
+                  Directory for binaries
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  The directory to download binaries into.
+                
        
+              
        
+              
        
+                
        
+                  Path to kubectl binary
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Kubeconfig Syncs
+              
        
+              
        
+                
+              
        
+              
        
+                Synced Items
+                 
+              
        
+              
        
+                
        
+                  No files and folders have been synced yet
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Helm Charts
+              
        
+              
        
+                
        
+                  
        
+                    
        
+                      
+                      
+                      
        
+                        
        
+                          
        
+                            Repositories
+                          
        
+                          
        
+                            
+                          
        
+                        
        
+                        
        
+                          
+                          
+                        
        
+                      
        
+                    
        
+                    
+                  
        
+                  
        
+                    
        
+                      
        
+                        
        
+                          Some active repository
+                        
        
+                        
        
+                          some-url
+                        
        
+                      
        
+                      
+                        
+                          delete
+                        
+                      
+                    
        
+                  
        
+                  
        
+                
        
+              
        
+            
        
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                  
+                    close
+                  
+                
+              
        
+              
+            
        
+          
        
+        
        
+      
        
+    
        
+    
        
+  
        
+  
        
+    
        
+      
        
+        
        
+          
        
+            Add custom Helm Repo
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                
        
+              
        
+              
        
+                
+                
        
+              
        
+              
+              
        
+                
        
+                  Security settings
+                   
+                
        
+                
+                
        
+                  
        
+                    
+                    
        
+                  
        
+                  
+                    
+                      folder
+                    
+                  
+                
        
+                
        
+                  
        
+                    
+                    
        
+                  
        
+                  
+                    
+                      folder
+                    
+                  
+                
        
+                
        
+                  
        
+                    
+                    
        
+                  
        
+                  
+                    
+                      folder
+                    
+                  
+                
        
+                
        
+                  Chart Repository Credentials
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+          
        
+          
        
+            
+            
+          
        
+        
+      
        
+    
        
+  
        
+
+`;
+
+exports[`add custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository when inputted minimal options for the repository when submitted and some time passes renders 1`] = `
+
+  
        
+    
        
+      
        
+      
        
+    
        
+    
        
+      
+      
        
+        
        
+          
        
+            
        
+              
        
+                Kubernetes
+              
        
+              
        
+                
        
+                  Kubectl binary download
+                   
+                
        
+                
+              
        
+              
        
+                
        
+                  Download mirror
+                   
+                
        
+                
        
+                  
+                  
+                  
        
+                    
        
+                      
        
+                        Download mirror for kubectl
+                      
        
+                      
        
+                        
+                      
        
+                    
        
+                    
        
+                      
+                      
+                    
        
+                  
        
+                
        
+              
        
+              
        
+                
        
+                  Directory for binaries
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  The directory to download binaries into.
+                
        
+              
        
+              
        
+                
        
+                  Path to kubectl binary
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Kubeconfig Syncs
+              
        
+              
        
+                
+              
        
+              
        
+                Synced Items
+                 
+              
        
+              
        
+                
        
+                  No files and folders have been synced yet
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Helm Charts
+              
        
+              
        
+                
        
+                  
        
+                    
        
+                      
+                      
+                      
        
+                        
        
+                          
        
+                            Repositories
+                          
        
+                          
        
+                            
+                          
        
+                        
        
+                        
        
+                          
+                          
+                        
        
+                      
        
+                    
        
+                    
+                  
        
+                  
        
+                    
        
+                      
        
+                        
        
+                          Some active repository
+                        
        
+                        
        
+                          some-url
+                        
        
+                      
        
+                      
+                        
+                          delete
+                        
+                      
+                    
        
+                  
        
+                  
        
+                
        
+              
        
+            
        
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                  
+                    close
+                  
+                
+              
        
+              
+            
        
+          
        
+        
        
+      
        
+    
        
+    
        
+  
        
+  
        
+    
        
+      
        
+        
        
+          
        
+            Add custom Helm Repo
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                
        
+              
        
+              
        
+                
+                
        
+              
        
+              
+            
        
+          
        
+          
        
+            
+            
+          
        
+        
+      
        
+    
        
+  
        
+
+`;
+
+exports[`add custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository when inputted minimal options for the repository when submitted and some time passes when activation rejects renders 1`] = `
+
+  
        
+    
        
+      
        
+      
        
+    
        
+    
        
+      
+      
        
+        
        
+          
        
+            
        
+              
        
+                Kubernetes
+              
        
+              
        
+                
        
+                  Kubectl binary download
+                   
+                
        
+                
+              
        
+              
        
+                
        
+                  Download mirror
+                   
+                
        
+                
        
+                  
+                  
+                  
        
+                    
        
+                      
        
+                        Download mirror for kubectl
+                      
        
+                      
        
+                        
+                      
        
+                    
        
+                    
        
+                      
+                      
+                    
        
+                  
        
+                
        
+              
        
+              
        
+                
        
+                  Directory for binaries
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  The directory to download binaries into.
+                
        
+              
        
+              
        
+                
        
+                  Path to kubectl binary
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Kubeconfig Syncs
+              
        
+              
        
+                
+              
        
+              
        
+                Synced Items
+                 
+              
        
+              
        
+                
        
+                  No files and folders have been synced yet
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Helm Charts
+              
        
+              
        
+                
        
+                  
        
+                    
        
+                      
+                      
+                      
        
+                        
        
+                          
        
+                            Repositories
+                          
        
+                          
        
+                            
+                          
        
+                        
        
+                        
        
+                          
+                          
+                        
        
+                      
        
+                    
        
+                    
+                  
        
+                  
        
+                    
        
+                      
        
+                        
        
+                          Some active repository
+                        
        
+                        
        
+                          some-url
+                        
        
+                      
        
+                      
+                        
+                          delete
+                        
+                      
+                    
        
+                  
        
+                  
        
+                
        
+              
        
+            
        
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                  
+                    close
+                  
+                
+              
        
+              
+            
        
+          
        
+        
        
+      
        
+    
        
+    
        
+  
        
+  
        
+    
        
+  
        
+
+`;
+
+exports[`add custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository when inputted minimal options for the repository when submitted and some time passes when activation resolves with success renders 1`] = `
+
+  
        
+    
        
+      
        
+      
        
+    
        
+    
        
+      
+      
        
+        
        
+          
        
+            
        
+              
        
+                Kubernetes
+              
        
+              
        
+                
        
+                  Kubectl binary download
+                   
+                
        
+                
+              
        
+              
        
+                
        
+                  Download mirror
+                   
+                
        
+                
        
+                  
+                  
+                  
        
+                    
        
+                      
        
+                        Download mirror for kubectl
+                      
        
+                      
        
+                        
+                      
        
+                    
        
+                    
        
+                      
+                      
+                    
        
+                  
        
+                
        
+              
        
+              
        
+                
        
+                  Directory for binaries
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  The directory to download binaries into.
+                
        
+              
        
+              
        
+                
        
+                  Path to kubectl binary
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Kubeconfig Syncs
+              
        
+              
        
+                
+              
        
+              
        
+                Synced Items
+                 
+              
        
+              
        
+                
        
+                  No files and folders have been synced yet
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Helm Charts
+              
        
+              
        
+                
        
+                  
        
+                    
        
+                      
+                      
+                      
        
+                        
        
+                          
        
+                            Repositories
+                          
        
+                          
        
+                            
+                          
        
+                        
        
+                        
        
+                          
+                          
+                          
+                        
        
+                      
        
+                    
        
+                    
+                  
        
+                  
        
+                    
        
+                      
        
+                    
        
+                  
        
+                  
        
+                
        
+              
        
+            
        
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                  
+                    close
+                  
+                
+              
        
+              
+            
        
+          
        
+        
        
+      
        
+    
        
+    
        
+  
        
+  
        
+    
        
+  
        
+
+`;
+
+exports[`add custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository when inputted minimal options for the repository when submitted and some time passes when activation resolves with success when adding custom repository again renders 1`] = `
+
+  
        
+    
        
+      
        
+      
        
+    
        
+    
        
+      
+      
        
+        
        
+          
        
+            
        
+              
        
+                Kubernetes
+              
        
+              
        
+                
        
+                  Kubectl binary download
+                   
+                
        
+                
+              
        
+              
        
+                
        
+                  Download mirror
+                   
+                
        
+                
        
+                  
+                  
+                  
        
+                    
        
+                      
        
+                        Download mirror for kubectl
+                      
        
+                      
        
+                        
+                      
        
+                    
        
+                    
        
+                      
+                      
+                    
        
+                  
        
+                
        
+              
        
+              
        
+                
        
+                  Directory for binaries
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  The directory to download binaries into.
+                
        
+              
        
+              
        
+                
        
+                  Path to kubectl binary
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Kubeconfig Syncs
+              
        
+              
        
+                
+              
        
+              
        
+                Synced Items
+                 
+              
        
+              
        
+                
        
+                  No files and folders have been synced yet
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Helm Charts
+              
        
+              
        
+                
        
+                  
        
+                    
        
+                      
+                      
+                      
        
+                        
        
+                          
        
+                            Repositories
+                          
        
+                          
        
+                            
+                          
        
+                        
        
+                        
        
+                          
+                          
+                          
+                        
        
+                      
        
+                    
        
+                    
+                  
        
+                  
        
+                    
        
+                      
        
+                    
        
+                  
        
+                  
        
+                
        
+              
        
+            
        
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                  
+                    close
+                  
+                
+              
        
+              
+            
        
+          
        
+        
        
+      
        
+    
        
+    
        
+  
        
+  
        
+    
        
+      
        
+        
        
+          
        
+            Add custom Helm Repo
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                
        
+              
        
+              
        
+                
+                
        
+              
        
+              
+            
        
+          
        
+          
        
+            
+            
+          
        
+        
+      
        
+    
        
+  
        
+
+`;
diff --git a/src/behaviours/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap b/src/behaviours/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap
new file mode 100644
index 0000000000..82c9bfb7e4
--- /dev/null
+++ b/src/behaviours/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap
@@ -0,0 +1,5046 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories renders 1`] = `
+
+  
        
+    
        
+      
        
+      
        
+    
        
+    
        
+      
+      
        
+        
        
+          
        
+            
        
+              
        
+                Kubernetes
+              
        
+              
        
+                
        
+                  Kubectl binary download
+                   
+                
        
+                
+              
        
+              
        
+                
        
+                  Download mirror
+                   
+                
        
+                
        
+                  
+                  
+                  
        
+                    
        
+                      
        
+                        Download mirror for kubectl
+                      
        
+                      
        
+                        
+                      
        
+                    
        
+                    
        
+                      
+                      
+                    
        
+                  
        
+                
        
+              
        
+              
        
+                
        
+                  Directory for binaries
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  The directory to download binaries into.
+                
        
+              
        
+              
        
+                
        
+                  Path to kubectl binary
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Kubeconfig Syncs
+              
        
+              
        
+                
+              
        
+              
        
+                Synced Items
+                 
+              
        
+              
        
+                
        
+                  No files and folders have been synced yet
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Helm Charts
+              
        
+              
        
+                
        
+                  
        
+                    
        
+                      
+                      
+                      
        
+                        
        
+                          
        
+                            Repositories
+                          
        
+                          
        
+                            
+                          
        
+                        
        
+                        
        
+                          
+                          
+                          
+                        
        
+                      
        
+                    
        
+                    
+                  
        
+                  
        
+                    
        
+                      
        
+                    
        
+                  
        
+                  
        
+                
        
+              
        
+            
        
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                  
+                    close
+                  
+                
+              
        
+              
+            
        
+          
        
+        
        
+      
        
+    
        
+    
        
+  
        
+
+`;
+
+exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve renders 1`] = `
+
+  
        
+    
        
+      
        
+      
        
+    
        
+    
        
+      
+      
        
+        
        
+          
        
+            
        
+              
        
+                Kubernetes
+              
        
+              
        
+                
        
+                  Kubectl binary download
+                   
+                
        
+                
+              
        
+              
        
+                
        
+                  Download mirror
+                   
+                
        
+                
        
+                  
+                  
+                  
        
+                    
        
+                      
        
+                        Download mirror for kubectl
+                      
        
+                      
        
+                        
+                      
        
+                    
        
+                    
        
+                      
+                      
+                    
        
+                  
        
+                
        
+              
        
+              
        
+                
        
+                  Directory for binaries
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  The directory to download binaries into.
+                
        
+              
        
+              
        
+                
        
+                  Path to kubectl binary
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Kubeconfig Syncs
+              
        
+              
        
+                
+              
        
+              
        
+                Synced Items
+                 
+              
        
+              
        
+                
        
+                  No files and folders have been synced yet
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Helm Charts
+              
        
+              
        
+                
        
+                  
        
+                    
        
+                      
+                      
+                      
        
+                        
        
+                          
        
+                            Repositories
+                          
        
+                          
        
+                            
+                          
        
+                        
        
+                        
        
+                          
+                          
+                        
        
+                      
        
+                    
        
+                    
+                  
        
+                  
        
+                    
        
+                      
        
+                        
        
+                          Some already active repository
+                        
        
+                        
        
+                          some-url
+                        
        
+                      
        
+                      
+                        
+                          delete
+                        
+                      
+                    
        
+                  
        
+                  
        
+                
        
+              
        
+            
        
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                  
+                    close
+                  
+                
+              
        
+              
+            
        
+          
        
+        
        
+      
        
+    
        
+    
        
+  
        
+
+`;
+
+exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for adding public repositories is clicked renders 1`] = `
+
+  
        
+    
        
+      
        
+      
        
+    
        
+    
        
+      
+      
        
+        
        
+          
        
+            
        
+              
        
+                Kubernetes
+              
        
+              
        
+                
        
+                  Kubectl binary download
+                   
+                
        
+                
+              
        
+              
        
+                
        
+                  Download mirror
+                   
+                
        
+                
        
+                  
+                  
+                  
        
+                    
        
+                      
        
+                        Download mirror for kubectl
+                      
        
+                      
        
+                        
+                      
        
+                    
        
+                    
        
+                      
+                      
+                    
        
+                  
        
+                
        
+              
        
+              
        
+                
        
+                  Directory for binaries
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  The directory to download binaries into.
+                
        
+              
        
+              
        
+                
        
+                  Path to kubectl binary
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Kubeconfig Syncs
+              
        
+              
        
+                
+              
        
+              
        
+                Synced Items
+                 
+              
        
+              
        
+                
        
+                  No files and folders have been synced yet
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Helm Charts
+              
        
+              
        
+                
        
+                  
        
+                    
        
+                      
+                      
+                      
        
+                        
        
+                          
        
+                            Repositories
+                          
        
+                          
        
+                            
+                          
        
+                        
        
+                        
        
+                          
+                          
+                        
        
+                      
        
+                    
        
+                    
+                  
        
+                  
        
+                    
        
+                      
        
+                        
        
+                          Some already active repository
+                        
        
+                        
        
+                          some-url
+                        
        
+                      
        
+                      
+                        
+                          delete
+                        
+                      
+                    
        
+                  
        
+                  
        
+                
        
+              
        
+            
        
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                  
+                    close
+                  
+                
+              
        
+              
+            
        
+          
        
+        
        
+      
        
+    
        
+    
        
+  
        
+  
        
+    
        
+      
        
+        
        
+          
        
+            
+              Some already active repository
+            
+            
+              
+                check
+              
+            
+          
        
+        
        
+        
        
+          
        
+            
+              Some to be added repository
+            
+          
        
+        
        
+      
        
+    
        
+  
        
+
+`;
+
+exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for adding public repositories is clicked when deactive public repository is selected renders 1`] = `
+
+  
        
+    
        
+      
        
+      
        
+    
        
+    
        
+      
+      
        
+        
        
+          
        
+            
        
+              
        
+                Kubernetes
+              
        
+              
        
+                
        
+                  Kubectl binary download
+                   
+                
        
+                
+              
        
+              
        
+                
        
+                  Download mirror
+                   
+                
        
+                
        
+                  
+                  
+                  
        
+                    
        
+                      
        
+                        Download mirror for kubectl
+                      
        
+                      
        
+                        
+                      
        
+                    
        
+                    
        
+                      
+                      
+                    
        
+                  
        
+                
        
+              
        
+              
        
+                
        
+                  Directory for binaries
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  The directory to download binaries into.
+                
        
+              
        
+              
        
+                
        
+                  Path to kubectl binary
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Kubeconfig Syncs
+              
        
+              
        
+                
+              
        
+              
        
+                Synced Items
+                 
+              
        
+              
        
+                
        
+                  No files and folders have been synced yet
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Helm Charts
+              
        
+              
        
+                
        
+                  
        
+                    
        
+                      
+                      
+                      
        
+                        
        
+                          
        
+                            Repositories
+                          
        
+                          
        
+                            
+                          
        
+                        
        
+                        
        
+                          
+                          
+                        
        
+                      
        
+                    
        
+                    
+                  
        
+                  
        
+                    
        
+                      
        
+                        
        
+                          Some already active repository
+                        
        
+                        
        
+                          some-url
+                        
        
+                      
        
+                      
+                        
+                          delete
+                        
+                      
+                    
        
+                  
        
+                  
        
+                
        
+              
        
+            
        
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                  
+                    close
+                  
+                
+              
        
+              
+            
        
+          
        
+        
        
+      
        
+    
        
+    
        
+  
        
+
+`;
+
+exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for adding public repositories is clicked when deactive public repository is selected when adding rejects renders 1`] = `
+
+  
        
+    
        
+      
        
+      
        
+    
        
+    
        
+      
+      
        
+        
        
+          
        
+            
        
+              
        
+                Kubernetes
+              
        
+              
        
+                
        
+                  Kubectl binary download
+                   
+                
        
+                
+              
        
+              
        
+                
        
+                  Download mirror
+                   
+                
        
+                
        
+                  
+                  
+                  
        
+                    
        
+                      
        
+                        Download mirror for kubectl
+                      
        
+                      
        
+                        
+                      
        
+                    
        
+                    
        
+                      
+                      
+                    
        
+                  
        
+                
        
+              
        
+              
        
+                
        
+                  Directory for binaries
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  The directory to download binaries into.
+                
        
+              
        
+              
        
+                
        
+                  Path to kubectl binary
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Kubeconfig Syncs
+              
        
+              
        
+                
+              
        
+              
        
+                Synced Items
+                 
+              
        
+              
        
+                
        
+                  No files and folders have been synced yet
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Helm Charts
+              
        
+              
        
+                
        
+                  
        
+                    
        
+                      
+                      
+                      
        
+                        
        
+                          
        
+                            Repositories
+                          
        
+                          
        
+                            
+                          
        
+                        
        
+                        
        
+                          
+                          
+                        
        
+                      
        
+                    
        
+                    
+                  
        
+                  
        
+                    
        
+                      
        
+                        
        
+                          Some already active repository
+                        
        
+                        
        
+                          some-url
+                        
        
+                      
        
+                      
+                        
+                          delete
+                        
+                      
+                    
        
+                  
        
+                  
        
+                
        
+              
        
+            
        
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                  
+                    close
+                  
+                
+              
        
+              
+            
        
+          
        
+        
        
+      
        
+    
        
+    
        
+  
        
+
+`;
+
+exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for adding public repositories is clicked when deactive public repository is selected when adding resolves renders 1`] = `
+
+  
        
+    
        
+      
        
+      
        
+    
        
+    
        
+      
+      
        
+        
        
+          
        
+            
        
+              
        
+                Kubernetes
+              
        
+              
        
+                
        
+                  Kubectl binary download
+                   
+                
        
+                
+              
        
+              
        
+                
        
+                  Download mirror
+                   
+                
        
+                
        
+                  
+                  
+                  
        
+                    
        
+                      
        
+                        Download mirror for kubectl
+                      
        
+                      
        
+                        
+                      
        
+                    
        
+                    
        
+                      
+                      
+                    
        
+                  
        
+                
        
+              
        
+              
        
+                
        
+                  Directory for binaries
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  The directory to download binaries into.
+                
        
+              
        
+              
        
+                
        
+                  Path to kubectl binary
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Kubeconfig Syncs
+              
        
+              
        
+                
+              
        
+              
        
+                Synced Items
+                 
+              
        
+              
        
+                
        
+                  No files and folders have been synced yet
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Helm Charts
+              
        
+              
        
+                
        
+                  
        
+                    
        
+                      
+                      
+                      
        
+                        
        
+                          
        
+                            Repositories
+                          
        
+                          
        
+                            
+                          
        
+                        
        
+                        
        
+                          
+                          
+                          
+                        
        
+                      
        
+                    
        
+                    
+                  
        
+                  
        
+                    
        
+                      
        
+                    
        
+                  
        
+                  
        
+                
        
+              
        
+            
        
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                  
+                    close
+                  
+                
+              
        
+              
+            
        
+          
        
+        
        
+      
        
+    
        
+    
        
+  
        
+
+`;
+
+exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for adding public repositories is clicked when deactive public repository is selected when adding resolves when active repositories resolve again renders 1`] = `
+
+  
        
+    
        
+      
        
+      
        
+    
        
+    
        
+      
+      
        
+        
        
+          
        
+            
        
+              
        
+                Kubernetes
+              
        
+              
        
+                
        
+                  Kubectl binary download
+                   
+                
        
+                
+              
        
+              
        
+                
        
+                  Download mirror
+                   
+                
        
+                
        
+                  
+                  
+                  
        
+                    
        
+                      
        
+                        Download mirror for kubectl
+                      
        
+                      
        
+                        
+                      
        
+                    
        
+                    
        
+                      
+                      
+                    
        
+                  
        
+                
        
+              
        
+              
        
+                
        
+                  Directory for binaries
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  The directory to download binaries into.
+                
        
+              
        
+              
        
+                
        
+                  Path to kubectl binary
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Kubeconfig Syncs
+              
        
+              
        
+                
+              
        
+              
        
+                Synced Items
+                 
+              
        
+              
        
+                
        
+                  No files and folders have been synced yet
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Helm Charts
+              
        
+              
        
+                
        
+                  
        
+                    
        
+                      
+                      
+                      
        
+                        
        
+                          
        
+                            Repositories
+                          
        
+                          
        
+                            
+                          
        
+                        
        
+                        
        
+                          
+                          
+                        
        
+                      
        
+                    
        
+                    
+                  
        
+                  
        
+                    
        
+                      
        
+                        
        
+                          Some already active repository
+                        
        
+                        
        
+                          some-url
+                        
        
+                      
        
+                      
+                        
+                          delete
+                        
+                      
+                    
        
+                    
        
+                      
        
+                        
        
+                          Some to be added repository
+                        
        
+                        
        
+                          some-other-url
+                        
        
+                      
        
+                      
+                        
+                          delete
+                        
+                      
+                    
        
+                  
        
+                  
        
+                
        
+              
        
+            
        
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                  
+                    close
+                  
+                
+              
        
+              
+            
        
+          
        
+        
        
+      
        
+    
        
+    
        
+  
        
+
+`;
+
+exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for adding public repositories is clicked when deactive public repository is selected when adding resolves when active repositories resolve again when select for selecting active repositories is clicked renders 1`] = `
+
+  
        
+    
        
+      
        
+      
        
+    
        
+    
        
+      
+      
        
+        
        
+          
        
+            
        
+              
        
+                Kubernetes
+              
        
+              
        
+                
        
+                  Kubectl binary download
+                   
+                
        
+                
+              
        
+              
        
+                
        
+                  Download mirror
+                   
+                
        
+                
        
+                  
+                  
+                  
        
+                    
        
+                      
        
+                        Download mirror for kubectl
+                      
        
+                      
        
+                        
+                      
        
+                    
        
+                    
        
+                      
+                      
+                    
        
+                  
        
+                
        
+              
        
+              
        
+                
        
+                  Directory for binaries
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  The directory to download binaries into.
+                
        
+              
        
+              
        
+                
        
+                  Path to kubectl binary
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Kubeconfig Syncs
+              
        
+              
        
+                
+              
        
+              
        
+                Synced Items
+                 
+              
        
+              
        
+                
        
+                  No files and folders have been synced yet
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Helm Charts
+              
        
+              
        
+                
        
+                  
        
+                    
        
+                      
+                      
+                      
        
+                        
        
+                          
        
+                            Repositories
+                          
        
+                          
        
+                            
+                          
        
+                        
        
+                        
        
+                          
+                          
+                        
        
+                      
        
+                    
        
+                    
+                  
        
+                  
        
+                    
        
+                      
        
+                        
        
+                          Some already active repository
+                        
        
+                        
        
+                          some-url
+                        
        
+                      
        
+                      
+                        
+                          delete
+                        
+                      
+                    
        
+                    
        
+                      
        
+                        
        
+                          Some to be added repository
+                        
        
+                        
        
+                          some-other-url
+                        
        
+                      
        
+                      
+                        
+                          delete
+                        
+                      
+                    
        
+                  
        
+                  
        
+                
        
+              
        
+            
        
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                  
+                    close
+                  
+                
+              
        
+              
+            
        
+          
        
+        
        
+      
        
+    
        
+    
        
+  
        
+  
        
+    
        
+      
        
+        
        
+          
        
+            
+              Some already active repository
+            
+            
+              
+                check
+              
+            
+          
        
+        
        
+        
        
+          
        
+            
+              Some to be added repository
+            
+            
+              
+                check
+              
+            
+          
        
+        
        
+      
        
+    
        
+  
        
+
+`;
+
+exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for adding public repositories is clicked when deactive public repository is selected when adding resolves when active repositories resolve again when select for selecting active repositories is clicked when active repository is selected renders 1`] = `
+
+  
        
+    
        
+      
        
+      
        
+    
        
+    
        
+      
+      
        
+        
        
+          
        
+            
        
+              
        
+                Kubernetes
+              
        
+              
        
+                
        
+                  Kubectl binary download
+                   
+                
        
+                
+              
        
+              
        
+                
        
+                  Download mirror
+                   
+                
        
+                
        
+                  
+                  
+                  
        
+                    
        
+                      
        
+                        Download mirror for kubectl
+                      
        
+                      
        
+                        
+                      
        
+                    
        
+                    
        
+                      
+                      
+                    
        
+                  
        
+                
        
+              
        
+              
        
+                
        
+                  Directory for binaries
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  The directory to download binaries into.
+                
        
+              
        
+              
        
+                
        
+                  Path to kubectl binary
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Kubeconfig Syncs
+              
        
+              
        
+                
+              
        
+              
        
+                Synced Items
+                 
+              
        
+              
        
+                
        
+                  No files and folders have been synced yet
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Helm Charts
+              
        
+              
        
+                
        
+                  
        
+                    
        
+                      
+                      
+                      
        
+                        
        
+                          
        
+                            Repositories
+                          
        
+                          
        
+                            
+                          
        
+                        
        
+                        
        
+                          
+                          
+                        
        
+                      
        
+                    
        
+                    
+                  
        
+                  
        
+                    
        
+                      
        
+                        
        
+                          Some already active repository
+                        
        
+                        
        
+                          some-url
+                        
        
+                      
        
+                      
+                        
+                          delete
+                        
+                      
+                    
        
+                    
        
+                      
        
+                        
        
+                          Some to be added repository
+                        
        
+                        
        
+                          some-other-url
+                        
        
+                      
        
+                      
+                        
+                          delete
+                        
+                      
+                    
        
+                  
        
+                  
        
+                
        
+              
        
+            
        
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                  
+                    close
+                  
+                
+              
        
+              
+            
        
+          
        
+        
        
+      
        
+    
        
+    
        
+  
        
+
+`;
+
+exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for adding public repositories is clicked when deactive public repository is selected when adding resolves when active repositories resolve again when select for selecting active repositories is clicked when active repository is selected when removing resolves renders 1`] = `
+
+  
        
+    
        
+      
        
+      
        
+    
        
+    
        
+      
+      
        
+        
        
+          
        
+            
        
+              
        
+                Kubernetes
+              
        
+              
        
+                
        
+                  Kubectl binary download
+                   
+                
        
+                
+              
        
+              
        
+                
        
+                  Download mirror
+                   
+                
        
+                
        
+                  
+                  
+                  
        
+                    
        
+                      
        
+                        Download mirror for kubectl
+                      
        
+                      
        
+                        
+                      
        
+                    
        
+                    
        
+                      
+                      
+                    
        
+                  
        
+                
        
+              
        
+              
        
+                
        
+                  Directory for binaries
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  The directory to download binaries into.
+                
        
+              
        
+              
        
+                
        
+                  Path to kubectl binary
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Kubeconfig Syncs
+              
        
+              
        
+                
+              
        
+              
        
+                Synced Items
+                 
+              
        
+              
        
+                
        
+                  No files and folders have been synced yet
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Helm Charts
+              
        
+              
        
+                
        
+                  
        
+                    
        
+                      
+                      
+                      
        
+                        
        
+                          
        
+                            Repositories
+                          
        
+                          
        
+                            
+                          
        
+                        
        
+                        
        
+                          
+                          
+                          
+                        
        
+                      
        
+                    
        
+                    
+                  
        
+                  
        
+                    
        
+                      
        
+                    
        
+                  
        
+                  
        
+                
        
+              
        
+            
        
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                  
+                    close
+                  
+                
+              
        
+              
+            
        
+          
        
+        
        
+      
        
+    
        
+    
        
+  
        
+
+`;
diff --git a/src/behaviours/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap b/src/behaviours/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap
new file mode 100644
index 0000000000..d350470ef4
--- /dev/null
+++ b/src/behaviours/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap
@@ -0,0 +1,4288 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`listing active helm repositories in preferences when navigating to preferences containing helm repositories renders 1`] = `
+
+  
        
+    
        
+      
        
+      
        
+    
        
+    
        
+      
+      
        
+        
        
+          
        
+            
        
+              
        
+                Kubernetes
+              
        
+              
        
+                
        
+                  Kubectl binary download
+                   
+                
        
+                
+              
        
+              
        
+                
        
+                  Download mirror
+                   
+                
        
+                
        
+                  
+                  
+                  
        
+                    
        
+                      
        
+                        Download mirror for kubectl
+                      
        
+                      
        
+                        
+                      
        
+                    
        
+                    
        
+                      
+                      
+                    
        
+                  
        
+                
        
+              
        
+              
        
+                
        
+                  Directory for binaries
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  The directory to download binaries into.
+                
        
+              
        
+              
        
+                
        
+                  Path to kubectl binary
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Kubeconfig Syncs
+              
        
+              
        
+                
+              
        
+              
        
+                Synced Items
+                 
+              
        
+              
        
+                
        
+                  No files and folders have been synced yet
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Helm Charts
+              
        
+              
        
+                
        
+                  
        
+                    
        
+                      
+                      
+                      
        
+                        
        
+                          
        
+                            Repositories
+                          
        
+                          
        
+                            
+                          
        
+                        
        
+                        
        
+                          
+                          
+                          
+                        
        
+                      
        
+                    
        
+                    
+                  
        
+                  
        
+                    
        
+                      
        
+                    
        
+                  
        
+                  
        
+                
        
+              
        
+            
        
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                  
+                    close
+                  
+                
+              
        
+              
+            
        
+          
        
+        
        
+      
        
+    
        
+    
        
+  
        
+
+`;
+
+exports[`listing active helm repositories in preferences when navigating to preferences containing helm repositories when configuration resolves renders 1`] = `
+
+  
        
+    
        
+      
        
+      
        
+    
        
+    
        
+      
+      
        
+        
        
+          
        
+            
        
+              
        
+                Kubernetes
+              
        
+              
        
+                
        
+                  Kubectl binary download
+                   
+                
        
+                
+              
        
+              
        
+                
        
+                  Download mirror
+                   
+                
        
+                
        
+                  
+                  
+                  
        
+                    
        
+                      
        
+                        Download mirror for kubectl
+                      
        
+                      
        
+                        
+                      
        
+                    
        
+                    
        
+                      
+                      
+                    
        
+                  
        
+                
        
+              
        
+              
        
+                
        
+                  Directory for binaries
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  The directory to download binaries into.
+                
        
+              
        
+              
        
+                
        
+                  Path to kubectl binary
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Kubeconfig Syncs
+              
        
+              
        
+                
+              
        
+              
        
+                Synced Items
+                 
+              
        
+              
        
+                
        
+                  No files and folders have been synced yet
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Helm Charts
+              
        
+              
        
+                
        
+                  
        
+                    
        
+                      
+                      
+                      
        
+                        
        
+                          
        
+                            Repositories
+                          
        
+                          
        
+                            
+                          
        
+                        
        
+                        
        
+                          
+                          
+                          
+                        
        
+                      
        
+                    
        
+                    
+                  
        
+                  
        
+                    
        
+                      
        
+                    
        
+                  
        
+                  
        
+                
        
+              
        
+            
        
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                  
+                    close
+                  
+                
+              
        
+              
+            
        
+          
        
+        
        
+      
        
+    
        
+    
        
+  
        
+
+`;
+
+exports[`listing active helm repositories in preferences when navigating to preferences containing helm repositories when configuration resolves when updating repositories reject with any other error renders 1`] = `
+
+  
        
+    
        
+      
        
+      
        
+    
        
+    
        
+      
+      
        
+        
        
+          
        
+            
        
+              
        
+                Kubernetes
+              
        
+              
        
+                
        
+                  Kubectl binary download
+                   
+                
        
+                
+              
        
+              
        
+                
        
+                  Download mirror
+                   
+                
        
+                
        
+                  
+                  
+                  
        
+                    
        
+                      
        
+                        Download mirror for kubectl
+                      
        
+                      
        
+                        
+                      
        
+                    
        
+                    
        
+                      
+                      
+                    
        
+                  
        
+                
        
+              
        
+              
        
+                
        
+                  Directory for binaries
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  The directory to download binaries into.
+                
        
+              
        
+              
        
+                
        
+                  Path to kubectl binary
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Kubeconfig Syncs
+              
        
+              
        
+                
+              
        
+              
        
+                Synced Items
+                 
+              
        
+              
        
+                
        
+                  No files and folders have been synced yet
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Helm Charts
+              
        
+              
        
+                
        
+                  
        
+                    Error updating Helm repositories: Some error
+                  
        
+                
        
+              
        
+            
        
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                  
+                    close
+                  
+                
+              
        
+              
+            
        
+          
        
+        
        
+      
        
+    
        
+    
        
+  
        
+
+`;
+
+exports[`listing active helm repositories in preferences when navigating to preferences containing helm repositories when configuration resolves when updating repositories reject with error about no existing repositories renders 1`] = `
+
+  
        
+    
        
+      
        
+      
        
+    
        
+    
        
+      
+      
        
+        
        
+          
        
+            
        
+              
        
+                Kubernetes
+              
        
+              
        
+                
        
+                  Kubectl binary download
+                   
+                
        
+                
+              
        
+              
        
+                
        
+                  Download mirror
+                   
+                
        
+                
        
+                  
+                  
+                  
        
+                    
        
+                      
        
+                        Download mirror for kubectl
+                      
        
+                      
        
+                        
+                      
        
+                    
        
+                    
        
+                      
+                      
+                    
        
+                  
        
+                
        
+              
        
+              
        
+                
        
+                  Directory for binaries
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  The directory to download binaries into.
+                
        
+              
        
+              
        
+                
        
+                  Path to kubectl binary
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Kubeconfig Syncs
+              
        
+              
        
+                
+              
        
+              
        
+                Synced Items
+                 
+              
        
+              
        
+                
        
+                  No files and folders have been synced yet
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Helm Charts
+              
        
+              
        
+                
        
+                  
        
+                    
        
+                      
+                      
+                      
        
+                        
        
+                          
        
+                            Repositories
+                          
        
+                          
        
+                            
+                          
        
+                        
        
+                        
        
+                          
+                          
+                          
+                        
        
+                      
        
+                    
        
+                    
+                  
        
+                  
        
+                    
        
+                      
        
+                    
        
+                  
        
+                  
        
+                
        
+              
        
+            
        
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                  
+                    close
+                  
+                
+              
        
+              
+            
        
+          
        
+        
        
+      
        
+    
        
+    
        
+  
        
+
+`;
+
+exports[`listing active helm repositories in preferences when navigating to preferences containing helm repositories when configuration resolves when updating repositories reject with error about no existing repositories when adding default repository reject renders 1`] = `
+
+  
        
+    
        
+      
        
+      
        
+    
        
+    
        
+      
+      
        
+        
        
+          
        
+            
        
+              
        
+                Kubernetes
+              
        
+              
        
+                
        
+                  Kubectl binary download
+                   
+                
        
+                
+              
        
+              
        
+                
        
+                  Download mirror
+                   
+                
        
+                
        
+                  
+                  
+                  
        
+                    
        
+                      
        
+                        Download mirror for kubectl
+                      
        
+                      
        
+                        
+                      
        
+                    
        
+                    
        
+                      
+                      
+                    
        
+                  
        
+                
        
+              
        
+              
        
+                
        
+                  Directory for binaries
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  The directory to download binaries into.
+                
        
+              
        
+              
        
+                
        
+                  Path to kubectl binary
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Kubeconfig Syncs
+              
        
+              
        
+                
+              
        
+              
        
+                Synced Items
+                 
+              
        
+              
        
+                
        
+                  No files and folders have been synced yet
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Helm Charts
+              
        
+              
        
+                
        
+                  
        
+                    Error when adding default Helm repository: Some error
+                  
        
+                
        
+              
        
+            
        
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                  
+                    close
+                  
+                
+              
        
+              
+            
        
+          
        
+        
        
+      
        
+    
        
+    
        
+  
        
+
+`;
+
+exports[`listing active helm repositories in preferences when navigating to preferences containing helm repositories when configuration resolves when updating repositories reject with error about no existing repositories when adding of default repository resolves renders 1`] = `
+
+  
        
+    
        
+      
        
+      
        
+    
        
+    
        
+      
+      
        
+        
        
+          
        
+            
        
+              
        
+                Kubernetes
+              
        
+              
        
+                
        
+                  Kubectl binary download
+                   
+                
        
+                
+              
        
+              
        
+                
        
+                  Download mirror
+                   
+                
        
+                
        
+                  
+                  
+                  
        
+                    
        
+                      
        
+                        Download mirror for kubectl
+                      
        
+                      
        
+                        
+                      
        
+                    
        
+                    
        
+                      
+                      
+                    
        
+                  
        
+                
        
+              
        
+              
        
+                
        
+                  Directory for binaries
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  The directory to download binaries into.
+                
        
+              
        
+              
        
+                
        
+                  Path to kubectl binary
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Kubeconfig Syncs
+              
        
+              
        
+                
+              
        
+              
        
+                Synced Items
+                 
+              
        
+              
        
+                
        
+                  No files and folders have been synced yet
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Helm Charts
+              
        
+              
        
+                
        
+                  
        
+                    
        
+                      
+                      
+                      
        
+                        
        
+                          
        
+                            Repositories
+                          
        
+                          
        
+                            
+                          
        
+                        
        
+                        
        
+                          
+                          
+                          
+                        
        
+                      
        
+                    
        
+                    
+                  
        
+                  
        
+                    
        
+                      
        
+                    
        
+                  
        
+                  
        
+                
        
+              
        
+            
        
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                  
+                    close
+                  
+                
+              
        
+              
+            
        
+          
        
+        
        
+      
        
+    
        
+    
        
+  
        
+
+`;
+
+exports[`listing active helm repositories in preferences when navigating to preferences containing helm repositories when configuration resolves when updating repositories resolve when repositories resolves renders 1`] = `
+
+  
        
+    
        
+      
        
+      
        
+    
        
+    
        
+      
+      
        
+        
        
+          
        
+            
        
+              
        
+                Kubernetes
+              
        
+              
        
+                
        
+                  Kubectl binary download
+                   
+                
        
+                
+              
        
+              
        
+                
        
+                  Download mirror
+                   
+                
        
+                
        
+                  
+                  
+                  
        
+                    
        
+                      
        
+                        Download mirror for kubectl
+                      
        
+                      
        
+                        
+                      
        
+                    
        
+                    
        
+                      
+                      
+                    
        
+                  
        
+                
        
+              
        
+              
        
+                
        
+                  Directory for binaries
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  The directory to download binaries into.
+                
        
+              
        
+              
        
+                
        
+                  Path to kubectl binary
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Kubeconfig Syncs
+              
        
+              
        
+                
+              
        
+              
        
+                Synced Items
+                 
+              
        
+              
        
+                
        
+                  No files and folders have been synced yet
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Helm Charts
+              
        
+              
        
+                
        
+                  
        
+                    
        
+                      
+                      
+                      
        
+                        
        
+                          
        
+                            Repositories
+                          
        
+                          
        
+                            
+                          
        
+                        
        
+                        
        
+                          
+                          
+                        
        
+                      
        
+                    
        
+                    
+                  
        
+                  
        
+                    
        
+                      
        
+                        
        
+                          some-repository
+                        
        
+                        
        
+                          some-repository-url
+                        
        
+                      
        
+                      
+                        
+                          delete
+                        
+                      
+                    
        
+                    
        
+                      
        
+                        
        
+                          some-other-repository
+                        
        
+                        
        
+                          some-other-repository-url
+                        
        
+                      
        
+                      
+                        
+                          delete
+                        
+                      
+                    
        
+                  
        
+                  
        
+                
        
+              
        
+            
        
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                  
+                    close
+                  
+                
+              
        
+              
+            
        
+          
        
+        
        
+      
        
+    
        
+    
        
+  
        
+
+`;
+
+exports[`listing active helm repositories in preferences when navigating to preferences containing helm repositories when configuration resolves without path to repository cache directory renders 1`] = `
+
+  
        
+    
        
+      
        
+      
        
+    
        
+    
        
+      
+      
        
+        
        
+          
        
+            
        
+              
        
+                Kubernetes
+              
        
+              
        
+                
        
+                  Kubectl binary download
+                   
+                
        
+                
+              
        
+              
        
+                
        
+                  Download mirror
+                   
+                
        
+                
        
+                  
+                  
+                  
        
+                    
        
+                      
        
+                        Download mirror for kubectl
+                      
        
+                      
        
+                        
+                      
        
+                    
        
+                    
        
+                      
+                      
+                    
        
+                  
        
+                
        
+              
        
+              
        
+                
        
+                  Directory for binaries
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  The directory to download binaries into.
+                
        
+              
        
+              
        
+                
        
+                  Path to kubectl binary
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Kubeconfig Syncs
+              
        
+              
        
+                
+              
        
+              
        
+                Synced Items
+                 
+              
        
+              
        
+                
        
+                  No files and folders have been synced yet
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Helm Charts
+              
        
+              
        
+                
        
+                  
        
+                    Error getting Helm configuration: Tried to get Helm repositories, but HELM_REPOSITORY_CACHE was not present in \`$ helm env\`.
+                  
        
+                
        
+              
        
+            
        
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                  
+                    close
+                  
+                
+              
        
+              
+            
        
+          
        
+        
        
+      
        
+    
        
+    
        
+  
        
+
+`;
+
+exports[`listing active helm repositories in preferences when navigating to preferences containing helm repositories when configuration resolves without path to repository config file renders 1`] = `
+
+  
        
+    
        
+      
        
+      
        
+    
        
+    
        
+      
+      
        
+        
        
+          
        
+            
        
+              
        
+                Kubernetes
+              
        
+              
        
+                
        
+                  Kubectl binary download
+                   
+                
        
+                
+              
        
+              
        
+                
        
+                  Download mirror
+                   
+                
        
+                
        
+                  
+                  
+                  
        
+                    
        
+                      
        
+                        Download mirror for kubectl
+                      
        
+                      
        
+                        
+                      
        
+                    
        
+                    
        
+                      
+                      
+                    
        
+                  
        
+                
        
+              
        
+              
        
+                
        
+                  Directory for binaries
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  The directory to download binaries into.
+                
        
+              
        
+              
        
+                
        
+                  Path to kubectl binary
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Kubeconfig Syncs
+              
        
+              
        
+                
+              
        
+              
        
+                Synced Items
+                 
+              
        
+              
        
+                
        
+                  No files and folders have been synced yet
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Helm Charts
+              
        
+              
        
+                
        
+                  
        
+                    Error getting Helm configuration: Tried to get Helm repositories, but HELM_REPOSITORY_CONFIG was not present in \`$ helm env\`.
+                  
        
+                
        
+              
        
+            
        
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                  
+                    close
+                  
+                
+              
        
+              
+            
        
+          
        
+        
        
+      
        
+    
        
+    
        
+  
        
+
+`;
+
+exports[`listing active helm repositories in preferences when navigating to preferences containing helm repositories when getting configuration rejects renders 1`] = `
+
+  
        
+    
        
+      
        
+      
        
+    
        
+    
        
+      
+      
        
+        
        
+          
        
+            
        
+              
        
+                Kubernetes
+              
        
+              
        
+                
        
+                  Kubectl binary download
+                   
+                
        
+                
+              
        
+              
        
+                
        
+                  Download mirror
+                   
+                
        
+                
        
+                  
+                  
+                  
        
+                    
        
+                      
        
+                        Download mirror for kubectl
+                      
        
+                      
        
+                        
+                      
        
+                    
        
+                    
        
+                      
+                      
+                    
        
+                  
        
+                
        
+              
        
+              
        
+                
        
+                  Directory for binaries
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  The directory to download binaries into.
+                
        
+              
        
+              
        
+                
        
+                  Path to kubectl binary
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Kubeconfig Syncs
+              
        
+              
        
+                
+              
        
+              
        
+                Synced Items
+                 
+              
        
+              
        
+                
        
+                  No files and folders have been synced yet
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Helm Charts
+              
        
+              
        
+                
        
+                  
        
+                    Error getting Helm configuration: some-error
+                  
        
+                
        
+              
        
+            
        
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                  
+                    close
+                  
+                
+              
        
+              
+            
        
+          
        
+        
        
+      
        
+    
        
+    
        
+  
        
+
+`;
diff --git a/src/behaviours/helm-charts/__snapshots__/navigation-to-helm-charts.test.ts.snap b/src/behaviours/helm-charts/__snapshots__/navigation-to-helm-charts.test.ts.snap
index e323205008..72075146e7 100644
--- a/src/behaviours/helm-charts/__snapshots__/navigation-to-helm-charts.test.ts.snap
+++ b/src/behaviours/helm-charts/__snapshots__/navigation-to-helm-charts.test.ts.snap
@@ -444,8 +444,14 @@ exports[`helm-charts - navigation to Helm charts when navigating to Helm charts
               
        
             
        
             
        
+              class="NoItems flex box grow"
+            >
+              
        
+                Item list is empty
+              
        
+            
        
           
        
           
        
+  
        
+    
        
+      
        
+      
        
+    
        
+    
        
+      
+      
        
+        
        
+          
        
+            
        
+              
        
+                Kubernetes
+              
        
+              
        
+                
        
+                  Kubectl binary download
+                   
+                
        
+                
+              
        
+              
        
+                
        
+                  Download mirror
+                   
+                
        
+                
        
+                  
+                  
+                  
        
+                    
        
+                      
        
+                        Download mirror for kubectl
+                      
        
+                      
        
+                        
+                      
        
+                    
        
+                    
        
+                      
+                      
+                    
        
+                  
        
+                
        
+              
        
+              
        
+                
        
+                  Directory for binaries
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  The directory to download binaries into.
+                
        
+              
        
+              
        
+                
        
+                  Path to kubectl binary
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Kubeconfig Syncs
+              
        
+              
        
+                
+              
        
+              
        
+                Synced Items
+                 
+              
        
+              
        
+                
        
+                  No files and folders have been synced yet
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Helm Charts
+              
        
+              
        
+                
        
+                  
        
+                    
        
+                      
+                      
+                      
        
+                        
        
+                          
        
+                            Repositories
+                          
        
+                          
        
+                            
+                          
        
+                        
        
+                        
        
+                          
+                          
+                          
+                        
        
+                      
        
+                    
        
+                    
+                  
        
+                  
        
+                    
        
+                      
        
+                    
        
+                  
        
+                  
        
+                
        
+              
        
+            
        
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                  
+                    close
+                  
+                
+              
        
+              
+            
        
+          
        
+        
        
+      
        
+    
        
+    
        
+  
        
+
+`;
+
+exports[`remove helm repository from list of active repositories in preferences when navigating to preferences containing helm repositories when active repositories resolve renders 1`] = `
+
+  
        
+    
        
+      
        
+      
        
+    
        
+    
        
+      
+      
        
+        
        
+          
        
+            
        
+              
        
+                Kubernetes
+              
        
+              
        
+                
        
+                  Kubectl binary download
+                   
+                
        
+                
+              
        
+              
        
+                
        
+                  Download mirror
+                   
+                
        
+                
        
+                  
+                  
+                  
        
+                    
        
+                      
        
+                        Download mirror for kubectl
+                      
        
+                      
        
+                        
+                      
        
+                    
        
+                    
        
+                      
+                      
+                    
        
+                  
        
+                
        
+              
        
+              
        
+                
        
+                  Directory for binaries
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  The directory to download binaries into.
+                
        
+              
        
+              
        
+                
        
+                  Path to kubectl binary
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Kubeconfig Syncs
+              
        
+              
        
+                
+              
        
+              
        
+                Synced Items
+                 
+              
        
+              
        
+                
        
+                  No files and folders have been synced yet
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Helm Charts
+              
        
+              
        
+                
        
+                  
        
+                    
        
+                      
+                      
+                      
        
+                        
        
+                          
        
+                            Repositories
+                          
        
+                          
        
+                            
+                          
        
+                        
        
+                        
        
+                          
+                          
+                        
        
+                      
        
+                    
        
+                    
+                  
        
+                  
        
+                    
        
+                      
        
+                        
        
+                          some-active-repository
+                        
        
+                        
        
+                          some-url
+                        
        
+                      
        
+                      
+                        
+                          delete
+                        
+                      
+                    
        
+                  
        
+                  
        
+                
        
+              
        
+            
        
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                  
+                    close
+                  
+                
+              
        
+              
+            
        
+          
        
+        
        
+      
        
+    
        
+    
        
+  
        
+
+`;
+
+exports[`remove helm repository from list of active repositories in preferences when navigating to preferences containing helm repositories when active repositories resolve when removing repository renders 1`] = `
+
+  
        
+    
        
+      
        
+      
        
+    
        
+    
        
+      
+      
        
+        
        
+          
        
+            
        
+              
        
+                Kubernetes
+              
        
+              
        
+                
        
+                  Kubectl binary download
+                   
+                
        
+                
+              
        
+              
        
+                
        
+                  Download mirror
+                   
+                
        
+                
        
+                  
+                  
+                  
        
+                    
        
+                      
        
+                        Download mirror for kubectl
+                      
        
+                      
        
+                        
+                      
        
+                    
        
+                    
        
+                      
+                      
+                    
        
+                  
        
+                
        
+              
        
+              
        
+                
        
+                  Directory for binaries
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  The directory to download binaries into.
+                
        
+              
        
+              
        
+                
        
+                  Path to kubectl binary
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Kubeconfig Syncs
+              
        
+              
        
+                
+              
        
+              
        
+                Synced Items
+                 
+              
        
+              
        
+                
        
+                  No files and folders have been synced yet
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Helm Charts
+              
        
+              
        
+                
        
+                  
        
+                    
        
+                      
+                      
+                      
        
+                        
        
+                          
        
+                            Repositories
+                          
        
+                          
        
+                            
+                          
        
+                        
        
+                        
        
+                          
+                          
+                        
        
+                      
        
+                    
        
+                    
+                  
        
+                  
        
+                    
        
+                      
        
+                        
        
+                          some-active-repository
+                        
        
+                        
        
+                          some-url
+                        
        
+                      
        
+                      
+                        
+                          delete
+                        
+                      
+                    
        
+                  
        
+                  
        
+                
        
+              
        
+            
        
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                  
+                    close
+                  
+                
+              
        
+              
+            
        
+          
        
+        
        
+      
        
+    
        
+    
        
+  
        
+
+`;
+
+exports[`remove helm repository from list of active repositories in preferences when navigating to preferences containing helm repositories when active repositories resolve when removing repository when removing resolves renders 1`] = `
+
+  
        
+    
        
+      
        
+      
        
+    
        
+    
        
+      
+      
        
+        
        
+          
        
+            
        
+              
        
+                Kubernetes
+              
        
+              
        
+                
        
+                  Kubectl binary download
+                   
+                
        
+                
+              
        
+              
        
+                
        
+                  Download mirror
+                   
+                
        
+                
        
+                  
+                  
+                  
        
+                    
        
+                      
        
+                        Download mirror for kubectl
+                      
        
+                      
        
+                        
+                      
        
+                    
        
+                    
        
+                      
+                      
+                    
        
+                  
        
+                
        
+              
        
+              
        
+                
        
+                  Directory for binaries
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+                
        
+                  The directory to download binaries into.
+                
        
+              
        
+              
        
+                
        
+                  Path to kubectl binary
+                   
+                
        
+                
        
+                  
+                  
        
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Kubeconfig Syncs
+              
        
+              
        
+                
+              
        
+              
        
+                Synced Items
+                 
+              
        
+              
        
+                
        
+                  No files and folders have been synced yet
+                
        
+              
        
+            
        
+            
        
+            
        
+              
        
+                Helm Charts
+              
        
+              
        
+                
        
+                  
        
+                    
        
+                      
+                      
+                      
        
+                        
        
+                          
        
+                            Repositories
+                          
        
+                          
        
+                            
+                          
        
+                        
        
+                        
        
+                          
+                          
+                          
+                        
        
+                      
        
+                    
        
+                    
+                  
        
+                  
        
+                    
        
+                      
        
+                    
        
+                  
        
+                  
        
+                
        
+              
        
+            
        
+          
        
+        
        
+        
        
+          
        
+            
        
+              
        
+                
+                  
+                    close
+                  
+                
+              
        
+              
+            
        
+          
        
+        
        
+      
        
+    
        
+    
        
+  
        
+
+`;
diff --git a/src/behaviours/helm-charts/add-custom-helm-repository-in-preferences.test.ts b/src/behaviours/helm-charts/add-custom-helm-repository-in-preferences.test.ts
new file mode 100644
index 0000000000..c13cfcc7af
--- /dev/null
+++ b/src/behaviours/helm-charts/add-custom-helm-repository-in-preferences.test.ts
@@ -0,0 +1,387 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { RenderResult } from "@testing-library/react";
+import { fireEvent } 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 type { AsyncFnMock } from "@async-fn/jest";
+import asyncFn from "@async-fn/jest";
+import execFileInjectable from "../../common/fs/exec-file.injectable";
+import helmBinaryPathInjectable from "../../main/helm/helm-binary-path.injectable";
+import getActiveHelmRepositoriesInjectable from "../../main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable";
+import type { HelmRepo } from "../../common/helm/helm-repo";
+import callForPublicHelmRepositoriesInjectable from "../../renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable";
+import isPathInjectable from "../../renderer/components/input/validators/is-path.injectable";
+import showSuccessNotificationInjectable from "../../renderer/components/notifications/show-success-notification.injectable";
+import showErrorNotificationInjectable from "../../renderer/components/notifications/show-error-notification.injectable";
+import type { AsyncResult } from "../../common/utils/async-result";
+
+// TODO: Make tooltips free of side effects by making it deterministic
+jest.mock("../../renderer/components/tooltip/withTooltip", () => ({
+  withTooltip: (target: any) => target,
+}));
+
+describe("add custom helm repository in preferences", () => {
+  let applicationBuilder: ApplicationBuilder;
+  let showSuccessNotificationMock: jest.Mock;
+  let showErrorNotificationMock: jest.Mock;
+  let rendered: RenderResult;
+  let execFileMock: AsyncFnMock<
+    ReturnType
+  >;
+  let getActiveHelmRepositoriesMock: AsyncFnMock<() => AsyncResult>;
+
+  beforeEach(async () => {
+    jest.useFakeTimers();
+
+    applicationBuilder = getApplicationBuilder();
+
+    execFileMock = asyncFn();
+    getActiveHelmRepositoriesMock = asyncFn();
+
+    applicationBuilder.beforeApplicationStart(({ mainDi, rendererDi }) => {
+      rendererDi.override(callForPublicHelmRepositoriesInjectable, () => async () => []);
+
+      showSuccessNotificationMock = jest.fn();
+
+      rendererDi.override(showSuccessNotificationInjectable, () => showSuccessNotificationMock);
+
+      showErrorNotificationMock = jest.fn();
+
+      rendererDi.override(showErrorNotificationInjectable, () => showErrorNotificationMock);
+
+      // TODO: Figure out how to make async validators unit testable
+      rendererDi.override(isPathInjectable, () => ({ debounce: 0, validate: async () => {} }));
+
+      mainDi.override(
+        getActiveHelmRepositoriesInjectable,
+        () => getActiveHelmRepositoriesMock,
+      );
+
+      mainDi.override(execFileInjectable, () => execFileMock);
+      mainDi.override(helmBinaryPathInjectable, () => "some-helm-binary-path");
+    });
+
+    rendered = await applicationBuilder.render();
+  });
+
+  describe("when navigating to preferences containing helm repositories", () => {
+    beforeEach(async () => {
+      applicationBuilder.preferences.navigate();
+      applicationBuilder.preferences.navigation.click("kubernetes");
+    });
+
+    it("renders", () => {
+      expect(rendered.baseElement).toMatchSnapshot();
+    });
+
+    describe("when active repositories resolve", () => {
+      beforeEach(async () => {
+        await Promise.all([
+          getActiveHelmRepositoriesMock.resolve({
+            callWasSuccessful: true,
+            response: [
+              { name: "Some active repository", url: "some-url" },
+            ],
+          }),
+        ]);
+      });
+
+      it("renders", () => {
+        expect(rendered.baseElement).toMatchSnapshot();
+      });
+
+      describe("when selecting to add custom repository", () => {
+        beforeEach(() => {
+          const button = rendered.getByTestId("add-custom-helm-repo-button");
+
+          fireEvent.click(button);
+        });
+
+        it("renders", () => {
+          expect(rendered.baseElement).toMatchSnapshot();
+        });
+
+        it("shows dialog", () => {
+          expect(
+            rendered.queryByTestId("add-custom-helm-repository-dialog"),
+          ).toBeInTheDocument();
+        });
+
+        // TODO: Figure out how to close dialog by clicking outside of it
+        xdescribe("when closing the dialog by clicking outside", () => {
+          beforeEach(() => {});
+
+          it("renders", () => {
+            expect(rendered.baseElement).toMatchSnapshot();
+          });
+
+          it("does not show dialog anymore", () => {
+            expect(
+              rendered.queryByTestId("add-custom-helm-repository-dialog"),
+            ).not.toBeInTheDocument();
+          });
+        });
+
+        describe("when closing the dialog by clicking cancel", () => {
+          beforeEach(() => {
+            const button = rendered.getByTestId("custom-helm-repository-cancel-button");
+
+            fireEvent.click(button);
+          });
+
+          it("renders", () => {
+            expect(rendered.baseElement).toMatchSnapshot();
+          });
+
+          it("does not show dialog anymore", () => {
+            expect(
+              rendered.queryByTestId("add-custom-helm-repository-dialog"),
+            ).not.toBeInTheDocument();
+          });
+        });
+
+        describe("when inputted minimal options for the repository", () => {
+          beforeEach(() => {
+            getActiveHelmRepositoriesMock.mockClear();
+
+            const nameInput = rendered.getByTestId("custom-helm-repository-name-input");
+
+            fireEvent.change(nameInput, { target: { value: "some-custom-repository" }});
+
+            const urlInput = rendered.getByTestId("custom-helm-repository-url-input");
+
+            fireEvent.change(urlInput, { target: { value: "http://some.url" }});
+          });
+
+          it("renders", () => {
+            expect(rendered.baseElement).toMatchSnapshot();
+          });
+
+          describe("when submitted and some time passes", () => {
+            beforeEach(() => {
+              const submitButton = rendered.getByTestId("custom-helm-repository-submit-button");
+
+              fireEvent.click(submitButton);
+
+              // TODO: Remove when debounce is removed from WizardStep.submit
+              jest.runOnlyPendingTimers();
+            });
+
+            it("renders", () => {
+              expect(rendered.baseElement).toMatchSnapshot();
+            });
+
+            it("adds the repository", () => {
+              expect(execFileMock).toHaveBeenCalledWith(
+                "some-helm-binary-path",
+                ["repo", "add", "some-custom-repository", "http://some.url"],
+              );
+            });
+
+            it("does not reload active repositories yet", () => {
+              expect(getActiveHelmRepositoriesMock).not.toHaveBeenCalled();
+            });
+
+            it("does not show notification yet", () => {
+              expect(showSuccessNotificationMock).not.toHaveBeenCalled();
+            });
+
+            describe("when activation rejects", () => {
+              beforeEach(async () => {
+                await execFileMock.reject(
+                  "Some error",
+                );
+              });
+
+              it("renders", () => {
+                expect(rendered.baseElement).toMatchSnapshot();
+              });
+
+              it("shows error notification", () => {
+                expect(showErrorNotificationMock).toHaveBeenCalledWith(
+                  "Some error",
+                );
+              });
+
+              it("does not show success notification", () => {
+                expect(showSuccessNotificationMock).not.toHaveBeenCalled();
+              });
+
+              it("does not show dialog anymore", () => {
+                expect(rendered.queryByTestId("add-custom-helm-repository-dialog")).not.toBeInTheDocument();
+              });
+
+              it("does not reload active repositories", () => {
+                expect(getActiveHelmRepositoriesMock).not.toHaveBeenCalled();
+              });
+            });
+
+            describe("when activation resolves with success", () => {
+              beforeEach(async () => {
+                await execFileMock.resolveSpecific(
+                  [
+                    "some-helm-binary-path",
+                    ["repo", "add", "some-custom-repository", "http://some.url"],
+                  ],
+
+                  "",
+                );
+              });
+
+              it("renders", () => {
+                expect(rendered.baseElement).toMatchSnapshot();
+              });
+
+              it("does not show dialog anymore", () => {
+                expect(rendered.queryByTestId("add-custom-helm-repository-dialog")).not.toBeInTheDocument();
+              });
+
+              it("reloads active repositories", () => {
+                expect(getActiveHelmRepositoriesMock).toHaveBeenCalled();
+              });
+
+              it("shows success notification", () => {
+                expect(showSuccessNotificationMock).toHaveBeenCalledWith(
+                  "Helm repository some-custom-repository has been added.",
+                );
+              });
+
+              describe("when adding custom repository again", () => {
+                beforeEach(() => {
+                  const button = rendered.getByTestId("add-custom-helm-repo-button");
+
+                  fireEvent.click(button);
+                });
+
+                it("renders", () => {
+                  expect(rendered.baseElement).toMatchSnapshot();
+                });
+
+                it("repository name is empty", () => {
+                  const input = rendered.getByTestId("custom-helm-repository-name-input") as HTMLInputElement;
+
+                  expect(input.value).toBe("");
+                });
+
+                it("repository url is empty", () => {
+                  const input = rendered.getByTestId("custom-helm-repository-url-input") as HTMLInputElement;
+
+                  expect(input.value).toBe("");
+                });
+              });
+            });
+          });
+
+          describe("when showing the maximal options", () => {
+            beforeEach(() => {
+              const button = rendered.getByTestId("toggle-maximal-options-for-custom-helm-repository-button");
+
+              fireEvent.click(button);
+            });
+
+            it("shows maximal options", () => {
+              const maximalOptions = rendered.getByTestId("maximal-options-for-custom-helm-repository-dialog");
+
+              expect(maximalOptions).toBeInTheDocument();
+            });
+
+            it("renders", () => {
+              expect(rendered.baseElement).toMatchSnapshot();
+            });
+
+            it("given closing the dialog, when reopening the dialog, still shows maximal options", () => {
+              const cancelButton = rendered.getByTestId("custom-helm-repository-cancel-button");
+
+              fireEvent.click(cancelButton);
+
+              const openButton = rendered.getByTestId("add-custom-helm-repo-button");
+
+              fireEvent.click(openButton);
+
+              const maximalOptions = rendered.getByTestId("maximal-options-for-custom-helm-repository-dialog");
+
+              expect(maximalOptions).toBeInTheDocument();
+            });
+
+            describe("when hiding maximal options", () => {
+              beforeEach(() => {
+                const button = rendered.getByTestId("toggle-maximal-options-for-custom-helm-repository-button");
+
+                fireEvent.click(button);
+              });
+
+              it("renders", () => {
+                expect(rendered.baseElement).toMatchSnapshot();
+              });
+
+              it("does not show maximal options anymore", () => {
+                const maximalOptions = rendered.queryByTestId("maximal-options-for-custom-helm-repository-dialog");
+
+                expect(maximalOptions).not.toBeInTheDocument();
+              });
+            });
+
+            describe("when inputted maximal options", () => {
+              beforeEach(async () => {
+                [
+                  { selector: "username-input", value: "some-username" },
+                  { selector: "password-input", value: "some-password" },
+                  { selector: "ca-cert-file-input", value: "some-ca-cert-file" },
+                  { selector: "cert-file-input", value: "some-cert-file" },
+                  { selector: "key-file-input", value: "some-key-file" },
+                ].forEach(({ selector, value }) => {
+                  const input = rendered.getByTestId(`custom-helm-repository-${selector}`);
+
+                  fireEvent.change(input, { target: { value }});
+                });
+
+                const checkbox = rendered.getByTestId(`custom-helm-repository-verify-tls-input`);
+
+                fireEvent.click(checkbox);
+
+                jest.runOnlyPendingTimers();
+              });
+
+              it("renders", () => {
+                expect(rendered.baseElement).toMatchSnapshot();
+              });
+
+              it("when submitted and some time passes, adds the repository with maximal options", () => {
+                const submitButton = rendered.getByTestId("custom-helm-repository-submit-button");
+
+                fireEvent.click(submitButton);
+
+                // TODO: Remove when debounce is removed from WizardStep.submit
+                jest.runOnlyPendingTimers();
+
+                expect(execFileMock).toHaveBeenCalledWith(
+                  "some-helm-binary-path",
+                  [
+                    "repo",
+                    "add",
+                    "some-custom-repository",
+                    "http://some.url",
+                    "--insecure-skip-tls-verify",
+                    "--username",
+                    "some-username",
+                    "--password",
+                    "some-password",
+                    "--ca-file",
+                    "some-ca-cert-file",
+                    "--key-file",
+                    "some-key-file",
+                    "--cert-file",
+                    "some-cert-file",
+                  ],
+                );
+              });
+            });
+          });
+        });
+      });
+    });
+  });
+});
diff --git a/src/behaviours/helm-charts/add-helm-repository-from-list-in-preferences.test.ts b/src/behaviours/helm-charts/add-helm-repository-from-list-in-preferences.test.ts
new file mode 100644
index 0000000000..1a4b9db775
--- /dev/null
+++ b/src/behaviours/helm-charts/add-helm-repository-from-list-in-preferences.test.ts
@@ -0,0 +1,278 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+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 type { AsyncFnMock } from "@async-fn/jest";
+import asyncFn from "@async-fn/jest";
+import execFileInjectable from "../../common/fs/exec-file.injectable";
+import helmBinaryPathInjectable from "../../main/helm/helm-binary-path.injectable";
+import getActiveHelmRepositoriesInjectable from "../../main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable";
+import type { HelmRepo } from "../../common/helm/helm-repo";
+import callForPublicHelmRepositoriesInjectable from "../../renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable";
+import showSuccessNotificationInjectable from "../../renderer/components/notifications/show-success-notification.injectable";
+import showErrorNotificationInjectable from "../../renderer/components/notifications/show-error-notification.injectable";
+import type { AsyncResult } from "../../common/utils/async-result";
+
+// TODO: Make tooltips free of side effects by making it deterministic
+jest.mock("../../renderer/components/tooltip/withTooltip", () => ({
+  withTooltip: (target: any) => target,
+}));
+
+describe("add helm repository from list in preferences", () => {
+  let applicationBuilder: ApplicationBuilder;
+  let showSuccessNotificationMock: jest.Mock;
+  let showErrorNotificationMock: jest.Mock;
+  let rendered: RenderResult;
+  let execFileMock: AsyncFnMock<
+    ReturnType
+  >;
+  let getActiveHelmRepositoriesMock: AsyncFnMock<() => AsyncResult>;
+  let callForPublicHelmRepositoriesMock: AsyncFnMock<() => Promise>;
+
+  beforeEach(async () => {
+    applicationBuilder = getApplicationBuilder();
+
+    execFileMock = asyncFn();
+    getActiveHelmRepositoriesMock = asyncFn();
+    callForPublicHelmRepositoriesMock = asyncFn();
+
+    applicationBuilder.beforeApplicationStart(({ mainDi, rendererDi }) => {
+      showSuccessNotificationMock = jest.fn();
+
+      rendererDi.override(showSuccessNotificationInjectable, () => showSuccessNotificationMock);
+
+      showErrorNotificationMock = jest.fn();
+
+      rendererDi.override(showErrorNotificationInjectable, () => showErrorNotificationMock);
+
+      rendererDi.override(
+        callForPublicHelmRepositoriesInjectable,
+        () => callForPublicHelmRepositoriesMock,
+      );
+
+      mainDi.override(
+        getActiveHelmRepositoriesInjectable,
+        () => getActiveHelmRepositoriesMock,
+      );
+      mainDi.override(execFileInjectable, () => execFileMock);
+      mainDi.override(helmBinaryPathInjectable, () => "some-helm-binary-path");
+    });
+
+    rendered = await applicationBuilder.render();
+  });
+
+  describe("when navigating to preferences containing helm repositories", () => {
+    beforeEach(async () => {
+      applicationBuilder.preferences.navigate();
+      applicationBuilder.preferences.navigation.click("kubernetes");
+    });
+
+    it("renders", () => {
+      expect(rendered.baseElement).toMatchSnapshot();
+    });
+
+    it("calls for public repositories", () => {
+      expect(callForPublicHelmRepositoriesMock).toHaveBeenCalled();
+    });
+
+    it("calls for active repositories", () => {
+      expect(getActiveHelmRepositoriesMock).toHaveBeenCalled();
+    });
+
+    describe("when both active and public repositories resolve", () => {
+      beforeEach(async () => {
+        await Promise.all([
+          callForPublicHelmRepositoriesMock.resolve([
+            { name: "Some already active repository", url: "some-url" },
+            { name: "Some to be added repository", url: "some-other-url" },
+          ]),
+
+          getActiveHelmRepositoriesMock.resolve({
+            callWasSuccessful: true,
+            response: [
+              { name: "Some already active repository", url: "some-url" },
+            ],
+          }),
+        ]);
+      });
+
+      it("renders", () => {
+        expect(rendered.baseElement).toMatchSnapshot();
+      });
+
+      describe("when select for adding public repositories is clicked", () => {
+        beforeEach(() => {
+          applicationBuilder.select.openMenu(
+            "selection-of-active-public-helm-repository",
+          );
+        });
+
+        it("renders", () => {
+          expect(rendered.baseElement).toMatchSnapshot();
+        });
+
+        describe("when deactive public repository is selected", () => {
+          beforeEach(async () => {
+            getActiveHelmRepositoriesMock.mockClear();
+
+            applicationBuilder.select.selectOption(
+              "selection-of-active-public-helm-repository",
+              "Some to be added repository",
+            );
+          });
+
+          it("renders", () => {
+            expect(rendered.baseElement).toMatchSnapshot();
+          });
+
+          it("adds the repository", () => {
+            expect(execFileMock).toHaveBeenCalledWith(
+              "some-helm-binary-path",
+              ["repo", "add", "Some to be added repository", "some-other-url"],
+            );
+          });
+
+          it("does not reload active repositories yet", () => {
+            expect(getActiveHelmRepositoriesMock).not.toHaveBeenCalled();
+          });
+
+          describe("when adding rejects", () => {
+            beforeEach(async () => {
+              await execFileMock.reject(
+                "Some error",
+              );
+            });
+
+            it("renders", () => {
+              expect(rendered.baseElement).toMatchSnapshot();
+            });
+
+            it("shows error notification", () => {
+              expect(showErrorNotificationMock).toHaveBeenCalledWith(
+                "Some error",
+              );
+            });
+
+            it("does not show success notification", () => {
+              expect(showSuccessNotificationMock).not.toHaveBeenCalled();
+            });
+
+            it("does not show dialog anymore", () => {
+              expect(rendered.queryByTestId("add-custom-helm-repository-dialog")).not.toBeInTheDocument();
+            });
+
+            it("does not reload active repositories", () => {
+              expect(getActiveHelmRepositoriesMock).not.toHaveBeenCalled();
+            });
+          });
+
+          describe("when adding resolves", () => {
+            beforeEach(async () => {
+              await execFileMock.resolveSpecific(
+                [
+                  "some-helm-binary-path",
+                  ["repo", "add", "Some to be added repository", "some-other-url"],
+                ],
+
+                "",
+              );
+            });
+
+            it("renders", () => {
+              expect(rendered.baseElement).toMatchSnapshot();
+            });
+
+            it("reloads active repositories", () => {
+              expect(getActiveHelmRepositoriesMock).toHaveBeenCalled();
+            });
+
+            it("shows success notification", () => {
+              expect(showSuccessNotificationMock).toHaveBeenCalledWith(
+                "Helm repository Some to be added repository has been added.",
+              );
+            });
+
+            describe("when active repositories resolve again", () => {
+              beforeEach(async () => {
+                await getActiveHelmRepositoriesMock.resolve({
+                  callWasSuccessful: true,
+                  response: [
+                    { name: "Some already active repository", url: "some-url" },
+                    { name: "Some to be added repository", url: "some-other-url" },
+                  ],
+                });
+              });
+
+              it("renders", () => {
+                expect(rendered.baseElement).toMatchSnapshot();
+              });
+
+              describe("when select for selecting active repositories is clicked", () => {
+                beforeEach(() => {
+                  applicationBuilder.select.openMenu(
+                    "selection-of-active-public-helm-repository",
+                  );
+                });
+
+                it("renders", () => {
+                  expect(rendered.baseElement).toMatchSnapshot();
+                });
+
+                describe("when active repository is selected", () => {
+                  beforeEach(() => {
+                    execFileMock.mockClear();
+                    getActiveHelmRepositoriesMock.mockClear();
+
+                    applicationBuilder.select.selectOption(
+                      "selection-of-active-public-helm-repository",
+                      "Some already active repository",
+                    );
+                  });
+
+                  it("renders", () => {
+                    expect(rendered.baseElement).toMatchSnapshot();
+                  });
+
+                  it("removes the repository", () => {
+                    expect(execFileMock).toHaveBeenCalledWith(
+                      "some-helm-binary-path",
+                      ["repo", "remove", "Some already active repository"],
+                    );
+                  });
+
+                  it("does not reload active repositories yet", () => {
+                    expect(getActiveHelmRepositoriesMock).not.toHaveBeenCalled();
+                  });
+
+                  describe("when removing resolves", () => {
+                    beforeEach(async () => {
+                      await execFileMock.resolveSpecific(
+                        [
+                          "some-helm-binary-path",
+                          ["repo", "remove", "Some already active repository"],
+                        ],
+
+                        "",
+                      );
+                    });
+
+                    it("renders", () => {
+                      expect(rendered.baseElement).toMatchSnapshot();
+                    });
+
+                    it("reloads active repositories", () => {
+                      expect(getActiveHelmRepositoriesMock).toHaveBeenCalled();
+                    });
+                  });
+                });
+              });
+            });
+          });
+        });
+      });
+    });
+  });
+});
diff --git a/src/behaviours/helm-charts/listing-active-helm-repositories-in-preferences.test.ts b/src/behaviours/helm-charts/listing-active-helm-repositories-in-preferences.test.ts
new file mode 100644
index 0000000000..a801487d10
--- /dev/null
+++ b/src/behaviours/helm-charts/listing-active-helm-repositories-in-preferences.test.ts
@@ -0,0 +1,458 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+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 type { ReadYamlFile } from "../../common/fs/read-yaml-file.injectable";
+import readYamlFileInjectable from "../../common/fs/read-yaml-file.injectable";
+import type { AsyncFnMock } from "@async-fn/jest";
+import asyncFn from "@async-fn/jest";
+import type { HelmRepositoriesFromYaml } from "../../main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable";
+import execFileInjectable from "../../common/fs/exec-file.injectable";
+import helmBinaryPathInjectable from "../../main/helm/helm-binary-path.injectable";
+import loggerInjectable from "../../common/logger.injectable";
+import type { Logger } from "../../common/logger";
+import callForPublicHelmRepositoriesInjectable from "../../renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable";
+import showErrorNotificationInjectable from "../../renderer/components/notifications/show-error-notification.injectable";
+
+// TODO: Make tooltips free of side effects by making it deterministic
+jest.mock("../../renderer/components/tooltip/withTooltip", () => ({
+  withTooltip: (target: any) => target,
+}));
+
+describe("listing active helm repositories in preferences", () => {
+  let applicationBuilder: ApplicationBuilder;
+  let rendered: RenderResult;
+  let readYamlFileMock: AsyncFnMock;
+  let execFileMock: AsyncFnMock>;
+  let loggerStub: Logger;
+  let showErrorNotificationMock: jest.Mock;
+
+  beforeEach(async () => {
+    applicationBuilder = getApplicationBuilder();
+
+    readYamlFileMock = asyncFn();
+    execFileMock = asyncFn();
+
+    loggerStub = { error: jest.fn() } as unknown as Logger;
+
+    applicationBuilder.beforeApplicationStart(({ mainDi, rendererDi }) => {
+      showErrorNotificationMock = jest.fn();
+
+      rendererDi.override(showErrorNotificationInjectable, () => showErrorNotificationMock);
+      rendererDi.override(callForPublicHelmRepositoriesInjectable, () => async () => []);
+      mainDi.override(readYamlFileInjectable, () => readYamlFileMock);
+      mainDi.override(execFileInjectable, () => execFileMock);
+      mainDi.override(helmBinaryPathInjectable, () => "some-helm-binary-path");
+      mainDi.override(loggerInjectable, () => loggerStub);
+    });
+
+    rendered = await applicationBuilder.render();
+  });
+
+  describe("when navigating to preferences containing helm repositories", () => {
+    beforeEach(async () => {
+      applicationBuilder.preferences.navigate();
+      applicationBuilder.preferences.navigation.click("kubernetes");
+    });
+
+    it("renders", () => {
+      expect(rendered.baseElement).toMatchSnapshot();
+    });
+
+    it("shows loader for repositories", () => {
+      expect(
+        rendered.getByTestId("helm-repositories-are-loading"),
+      ).toBeInTheDocument();
+    });
+
+    it("calls for helm configuration", () => {
+      expect(execFileMock).toHaveBeenCalledWith(
+        "some-helm-binary-path",
+        ["env"],
+      );
+    });
+
+    it("does not call for updating of repositories yet", () => {
+      expect(execFileMock).not.toHaveBeenCalledWith(
+        "some-helm-binary-path",
+        ["repo", "update"],
+      );
+    });
+
+    describe("when getting configuration rejects", () => {
+      beforeEach(async () => {
+        await execFileMock.reject("some-error");
+      });
+
+      it("shows error notification", () => {
+        expect(showErrorNotificationMock).toHaveBeenCalledWith(
+          "Error getting Helm configuration: some-error",
+        );
+      });
+
+      it("removes all helm controls", () => {
+        expect(
+          rendered.queryByTestId("helm-controls"),
+        ).not.toBeInTheDocument();
+      });
+
+      it("does not show loader for repositories anymore", () => {
+        expect(
+          rendered.queryByTestId("helm-repositories-are-loading"),
+        ).not.toBeInTheDocument();
+      });
+
+      it("renders", () => {
+        expect(rendered.baseElement).toMatchSnapshot();
+      });
+    });
+
+    describe("when configuration resolves without path to repository config file", () => {
+      beforeEach(async () => {
+        execFileMock.mockClear();
+
+        await execFileMock.resolveSpecific(
+          ["some-helm-binary-path", ["env"]],
+          "HELM_REPOSITORY_CACHE=some-helm-repository-cache-path",
+        );
+      });
+
+      it("logs error", () => {
+        expect(loggerStub.error).toHaveBeenCalledWith(
+          "Tried to get Helm repositories, but HELM_REPOSITORY_CONFIG was not present in `$ helm env`.",
+        );
+      });
+
+      it("shows error notification", () => {
+        expect(showErrorNotificationMock).toHaveBeenCalledWith(
+          "Error getting Helm configuration: Tried to get Helm repositories, but HELM_REPOSITORY_CONFIG was not present in `$ helm env`.",
+        );
+      });
+
+      it("removes all helm controls", () => {
+        expect(
+          rendered.queryByTestId("helm-controls"),
+        ).not.toBeInTheDocument();
+      });
+
+      it("does not show loader for repositories anymore", () => {
+        expect(
+          rendered.queryByTestId("helm-repositories-are-loading"),
+        ).not.toBeInTheDocument();
+      });
+
+      it("renders", () => {
+        expect(rendered.baseElement).toMatchSnapshot();
+      });
+    });
+
+    describe("when configuration resolves without path to repository cache directory", () => {
+      beforeEach(async () => {
+        execFileMock.mockClear();
+
+        await execFileMock.resolveSpecific(
+          ["some-helm-binary-path", ["env"]],
+          "HELM_REPOSITORY_CONFIG=some-helm-repository-config-file.yaml",
+        );
+      });
+
+      it("logs error", () => {
+        expect(loggerStub.error).toHaveBeenCalledWith(
+          "Tried to get Helm repositories, but HELM_REPOSITORY_CACHE was not present in `$ helm env`.",
+        );
+      });
+
+      it("shows error notification", () => {
+        expect(showErrorNotificationMock).toHaveBeenCalledWith(
+          "Error getting Helm configuration: Tried to get Helm repositories, but HELM_REPOSITORY_CACHE was not present in `$ helm env`.",
+        );
+      });
+
+      it("removes all helm controls", () => {
+        expect(
+          rendered.queryByTestId("helm-controls"),
+        ).not.toBeInTheDocument();
+      });
+
+      it("does not show loader for repositories anymore", () => {
+        expect(
+          rendered.queryByTestId("helm-repositories-are-loading"),
+        ).not.toBeInTheDocument();
+      });
+
+      it("renders", () => {
+        expect(rendered.baseElement).toMatchSnapshot();
+      });
+    });
+
+    describe("when configuration resolves", () => {
+      beforeEach(async () => {
+        execFileMock.mockClear();
+
+        await execFileMock.resolveSpecific(
+          ["some-helm-binary-path", ["env"]],
+
+          [
+            "HELM_REPOSITORY_CONFIG=some-helm-repository-config-file.yaml",
+            "HELM_REPOSITORY_CACHE=some-helm-repository-cache-path",
+          ].join("\n"),
+        );
+      });
+
+      it("renders", () => {
+        expect(rendered.baseElement).toMatchSnapshot();
+      });
+
+      it("calls for update of repositories", () => {
+        expect(execFileMock).toHaveBeenCalledWith(
+          "some-helm-binary-path",
+          ["repo", "update"],
+        );
+      });
+
+      it("does not call for repositories yet", () => {
+        expect(readYamlFileMock).not.toHaveBeenCalled();
+      });
+
+      describe("when updating repositories reject with any other error", () => {
+        beforeEach(async () => {
+          await execFileMock.reject("Some error");
+        });
+
+        it("shows error notification", () => {
+          expect(showErrorNotificationMock).toHaveBeenCalledWith(
+            "Error updating Helm repositories: Some error",
+          );
+        });
+
+        it("removes all helm controls", () => {
+          expect(
+            rendered.queryByTestId("helm-controls"),
+          ).not.toBeInTheDocument();
+        });
+
+        it("does not show loader for repositories anymore", () => {
+          expect(
+            rendered.queryByTestId("helm-repositories-are-loading"),
+          ).not.toBeInTheDocument();
+        });
+
+        it("renders", () => {
+          expect(rendered.baseElement).toMatchSnapshot();
+        });
+      });
+
+      describe("when updating repositories reject with error about no existing repositories", () => {
+        beforeEach(async () => {
+          execFileMock.mockClear();
+
+          await execFileMock.reject(
+            "Error: no repositories found. You must add one before updating",
+          );
+        });
+
+        it("renders", () => {
+          expect(rendered.baseElement).toMatchSnapshot();
+        });
+
+        it("still shows the loader for repositories", () => {
+          expect(
+            rendered.queryByTestId("helm-repositories-are-loading"),
+          ).toBeInTheDocument();
+        });
+
+        it('adds "bitnami" as default repository', () => {
+          expect(execFileMock).toHaveBeenCalledWith(
+            "some-helm-binary-path",
+            ["repo", "add", "bitnami", "https://charts.bitnami.com/bitnami"],
+          );
+        });
+
+        describe("when adding default repository reject", () => {
+          beforeEach(async () => {
+            await execFileMock.reject("Some error");
+          });
+
+          it("shows error notification", () => {
+            expect(showErrorNotificationMock).toHaveBeenCalledWith(
+              "Error when adding default Helm repository: Some error",
+            );
+          });
+
+          it("removes all helm controls", () => {
+            expect(
+              rendered.queryByTestId("helm-controls"),
+            ).not.toBeInTheDocument();
+          });
+
+          it("does not show loader for repositories anymore", () => {
+            expect(
+              rendered.queryByTestId("helm-repositories-are-loading"),
+            ).not.toBeInTheDocument();
+          });
+
+          it("renders", () => {
+            expect(rendered.baseElement).toMatchSnapshot();
+          });
+        });
+
+        describe("when adding of default repository resolves", () => {
+          beforeEach(async () => {
+            readYamlFileMock.mockClear();
+
+            await execFileMock.resolveSpecific(
+              [
+                "some-helm-binary-path",
+
+                [
+                  "repo",
+                  "add",
+                  "bitnami",
+                  "https://charts.bitnami.com/bitnami",
+                ],
+              ],
+
+              "",
+            );
+          });
+
+          it("renders", () => {
+            expect(rendered.baseElement).toMatchSnapshot();
+          });
+
+          it("still shows the loader for repositories", () => {
+            expect(
+              rendered.queryByTestId("helm-repositories-are-loading"),
+            ).toBeInTheDocument();
+          });
+
+          it("calls for repositories again", () => {
+            expect(readYamlFileMock).toHaveBeenCalledWith(
+              "some-helm-repository-config-file.yaml",
+            );
+          });
+
+          describe("when another call for repositories resolve", () => {
+            beforeEach(async () => {
+              await readYamlFileMock.resolveSpecific(
+                ["some-helm-repository-config-file.yaml"],
+
+                {
+                  repositories: [
+                    {
+                      name: "bitnami",
+                      url: "https://charts.bitnami.com/bitnami",
+                      caFile: "irrelevant",
+                      certFile: "irrelevant",
+                      insecure_skip_tls_verify: false,
+                      keyFile: "irrelevant",
+                      pass_credentials_all: false,
+                      password: "irrelevant",
+                      username: "irrelevant",
+                    },
+                  ],
+                },
+              );
+            });
+
+            it("does not show loader for repositories anymore", () => {
+              expect(
+                rendered.queryByTestId("helm-repositories-are-loading"),
+              ).not.toBeInTheDocument();
+            });
+
+            it("shows the added repository", () => {
+              const actual = rendered.getByTestId("helm-repository-bitnami");
+
+              expect(actual).toBeInTheDocument();
+            });
+          });
+        });
+      });
+
+      describe("when updating repositories resolve", () => {
+        beforeEach(async () => {
+          execFileMock.mockClear();
+
+          await execFileMock.resolveSpecific(
+            ["some-helm-binary-path", ["repo", "update"]],
+            "",
+          );
+        });
+
+        it("loads repositories from file system", () => {
+          expect(readYamlFileMock).toHaveBeenCalledWith(
+            "some-helm-repository-config-file.yaml",
+          );
+        });
+
+        describe("when repositories resolves", () => {
+          beforeEach(async () => {
+            execFileMock.mockClear();
+
+            await readYamlFileMock.resolveSpecific(
+              ["some-helm-repository-config-file.yaml"],
+              repositoryConfigStub,
+            );
+          });
+
+          it("does not add default repository", () => {
+            expect(execFileMock).not.toHaveBeenCalledWith(
+              "some-helm-binary-path",
+              ["repo", "add", "bitnami", "https://charts.bitnami.com/bitnami"],
+            );
+          });
+
+          it("renders", () => {
+            expect(rendered.baseElement).toMatchSnapshot();
+          });
+
+          it("does not show loader for repositories anymore", () => {
+            expect(
+              rendered.queryByTestId("helm-repositories-are-loading"),
+            ).not.toBeInTheDocument();
+          });
+
+          it("shows repositories in use", () => {
+            const actual = rendered.getAllByTestId(
+              /^helm-repository-(some-repository|some-other-repository)$/,
+            );
+
+            expect(actual).toHaveLength(2);
+          });
+        });
+      });
+    });
+  });
+});
+
+const repositoryConfigStub: HelmRepositoriesFromYaml = {
+  repositories: [
+    {
+      name: "some-repository",
+      url: "some-repository-url",
+      caFile: "irrelevant",
+      certFile: "irrelevant",
+      insecure_skip_tls_verify: false,
+      keyFile: "irrelevant",
+      pass_credentials_all: false,
+      password: "irrelevant",
+      username: "irrelevant",
+    },
+
+    {
+      name: "some-other-repository",
+      url: "some-other-repository-url",
+      caFile: "irrelevant",
+      certFile: "irrelevant",
+      insecure_skip_tls_verify: false,
+      keyFile: "irrelevant",
+      pass_credentials_all: false,
+      password: "irrelevant",
+      username: "irrelevant",
+    },
+  ],
+};
diff --git a/src/behaviours/helm-charts/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts b/src/behaviours/helm-charts/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts
new file mode 100644
index 0000000000..0d3dfe331a
--- /dev/null
+++ b/src/behaviours/helm-charts/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts
@@ -0,0 +1,126 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { RenderResult } from "@testing-library/react";
+import { fireEvent } 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 type { AsyncFnMock } from "@async-fn/jest";
+import asyncFn from "@async-fn/jest";
+import execFileInjectable from "../../common/fs/exec-file.injectable";
+import helmBinaryPathInjectable from "../../main/helm/helm-binary-path.injectable";
+import getActiveHelmRepositoriesInjectable from "../../main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable";
+import type { HelmRepo } from "../../common/helm/helm-repo";
+import callForPublicHelmRepositoriesInjectable from "../../renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable";
+import type { AsyncResult } from "../../common/utils/async-result";
+
+// TODO: Make tooltips free of side effects by making it deterministic
+jest.mock("../../renderer/components/tooltip/withTooltip", () => ({
+  withTooltip: (target: any) => target,
+}));
+
+describe("remove helm repository from list of active repositories in preferences", () => {
+  let applicationBuilder: ApplicationBuilder;
+  let rendered: RenderResult;
+  let getActiveHelmRepositoriesMock: AsyncFnMock<() => AsyncResult>;
+  let execFileMock: AsyncFnMock<
+    ReturnType
+  >;
+
+  beforeEach(async () => {
+    applicationBuilder = getApplicationBuilder();
+
+    execFileMock = asyncFn();
+    getActiveHelmRepositoriesMock = asyncFn();
+
+    applicationBuilder.beforeApplicationStart(({ mainDi, rendererDi }) => {
+      rendererDi.override(callForPublicHelmRepositoriesInjectable, () => async () => []);
+
+      mainDi.override(
+        getActiveHelmRepositoriesInjectable,
+        () => getActiveHelmRepositoriesMock,
+      );
+
+      mainDi.override(execFileInjectable, () => execFileMock);
+      mainDi.override(helmBinaryPathInjectable, () => "some-helm-binary-path");
+    });
+
+    rendered = await applicationBuilder.render();
+  });
+
+  describe("when navigating to preferences containing helm repositories", () => {
+    beforeEach(async () => {
+      applicationBuilder.preferences.navigate();
+      applicationBuilder.preferences.navigation.click("kubernetes");
+    });
+
+    it("renders", () => {
+      expect(rendered.baseElement).toMatchSnapshot();
+    });
+
+    describe("when active repositories resolve", () => {
+      beforeEach(async () => {
+        getActiveHelmRepositoriesMock.resolve({
+          callWasSuccessful: true,
+          response: [
+            { name: "some-active-repository", url: "some-url" },
+          ],
+        });
+      });
+
+      it("renders", () => {
+        expect(rendered.baseElement).toMatchSnapshot();
+      });
+
+      describe("when removing repository", () => {
+        beforeEach(() => {
+          execFileMock.mockClear();
+          getActiveHelmRepositoriesMock.mockClear();
+
+          const removeButton = rendered.getByTestId(
+            "remove-helm-repository-some-active-repository",
+          );
+
+          fireEvent.click(removeButton);
+        });
+
+        it("renders", () => {
+          expect(rendered.baseElement).toMatchSnapshot();
+        });
+
+        it("removes the repository", () => {
+          expect(execFileMock).toHaveBeenCalledWith(
+            "some-helm-binary-path",
+            ["repo", "remove", "some-active-repository"],
+          );
+        });
+
+        it("does not reload active repositories yet", () => {
+          expect(getActiveHelmRepositoriesMock).not.toHaveBeenCalled();
+        });
+
+        describe("when removing resolves", () => {
+          beforeEach(async () => {
+            await execFileMock.resolveSpecific(
+              [
+                "some-helm-binary-path",
+                ["repo", "remove", "some-active-repository"],
+              ],
+
+              "",
+            );
+          });
+
+          it("renders", () => {
+            expect(rendered.baseElement).toMatchSnapshot();
+          });
+
+          it("reloads active repositories", () => {
+            expect(getActiveHelmRepositoriesMock).toHaveBeenCalled();
+          });
+        });
+      });
+    });
+  });
+});
diff --git a/src/behaviours/navigating-between-routes.test.tsx b/src/behaviours/navigating-between-routes.test.tsx
index 4def9b383f..ab0240b2a4 100644
--- a/src/behaviours/navigating-between-routes.test.tsx
+++ b/src/behaviours/navigating-between-routes.test.tsx
@@ -9,8 +9,8 @@ import { computed } from "mobx";
 import type { RenderResult } from "@testing-library/react";
 import { routeSpecificComponentInjectionToken } from "../renderer/routes/route-specific-component-injection-token";
 import { observer } from "mobx-react";
-import type { Route } from "../common/front-end-routing/route-injection-token";
-import { routeInjectionToken } from "../common/front-end-routing/route-injection-token";
+import type { Route } from "../common/front-end-routing/front-end-route-injection-token";
+import { frontEndRouteInjectionToken } from "../common/front-end-routing/front-end-route-injection-token";
 import type { ApplicationBuilder } from "../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../renderer/components/test-utils/get-application-builder";
 import currentRouteInjectable from "../renderer/routes/current-route.injectable";
@@ -192,7 +192,7 @@ describe("navigating between routes", () => {
 
 const testRouteWithoutPathParametersInjectable = getInjectable({
   id: "some-route",
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 
   instantiate: () => ({
     path: "/some-path",
@@ -214,7 +214,7 @@ const testRouteWithoutPathParametersComponentInjectable = getInjectable({
 
 const routeWithOptionalPathParametersInjectable = getInjectable({
   id: "some-route",
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 
   instantiate: (): Route<{ someParameter?: string; someOtherParameter?: string }> => ({
     path: "/some-path/:someParameter?/:someOtherParameter?",
diff --git a/src/behaviours/preferences/__snapshots__/closing-preferences.test.tsx.snap b/src/behaviours/preferences/__snapshots__/closing-preferences.test.tsx.snap
index 5cdee87f39..13c0967f4d 100644
--- a/src/behaviours/preferences/__snapshots__/closing-preferences.test.tsx.snap
+++ b/src/behaviours/preferences/__snapshots__/closing-preferences.test.tsx.snap
@@ -2,6 +2,16 @@
 
 exports[`preferences - closing-preferences given accessing preferences directly renders 1`] = `
 
        
+  
        
+    
        
+    
        
+  
        
   
        
+  
        
+    
        
+    
        
+  
        
   
        
@@ -688,6 +708,16 @@ exports[`preferences - closing-preferences given accessing preferences directly
 
 exports[`preferences - closing-preferences given accessing preferences directly when navigating to a tab in preferences when preferences are closed renders 1`] = `
 
        
+  
        
+    
        
+    
        
+  
        
   
        
     Some front page
   
        
@@ -699,6 +729,16 @@ exports[`preferences - closing-preferences given accessing preferences directly
 
 exports[`preferences - closing-preferences given accessing preferences directly when preferences are closed renders 1`] = `
 
        
+  
        
+    
        
+    
        
+  
        
   
        
     Some front page
   
        
@@ -710,6 +750,16 @@ exports[`preferences - closing-preferences given accessing preferences directly
 
 exports[`preferences - closing-preferences given already in a page and then navigated to preferences renders 1`] = `
 
        
+  
        
+    
        
+    
        
+  
        
   
        
+  
        
+    
        
+    
        
+  
        
   
        
@@ -1396,6 +1456,16 @@ exports[`preferences - closing-preferences given already in a page and then navi
 
 exports[`preferences - closing-preferences given already in a page and then navigated to preferences when navigating to a tab in preferences when preferences are closed renders 1`] = `
 
        
+  
        
+    
        
+    
        
+  
        
   
        
@@ -1541,6 +1611,16 @@ exports[`preferences - closing-preferences given already in a page and then navi
 
 exports[`preferences - closing-preferences given already in a page and then navigated to preferences when preferences are closed renders 1`] = `
 
        
+  
        
+    
        
+    
        
+  
        
   
        
diff --git a/src/behaviours/preferences/__snapshots__/navigation-to-application-preferences.test.ts.snap b/src/behaviours/preferences/__snapshots__/navigation-to-application-preferences.test.ts.snap
index 7cd89769f5..44dd4be6ca 100644
--- a/src/behaviours/preferences/__snapshots__/navigation-to-application-preferences.test.ts.snap
+++ b/src/behaviours/preferences/__snapshots__/navigation-to-application-preferences.test.ts.snap
@@ -2,6 +2,16 @@
 
 exports[`preferences - navigation to application preferences given in some child page of preferences, when rendered renders 1`] = `
 
        
+  
        
+    
        
+    
        
+  
        
   
        
+  
        
+    
        
+    
        
+  
        
   
        
+  
        
+    
        
+    
        
+  
        
   
        
+  
        
+    
        
+    
        
+  
        
   
        
+  
        
+    
        
+    
        
+  
        
   
        
+  
        
+    
        
+    
        
+  
        
   
        
+  
        
+    
        
+    
        
+  
        
   
        
+  
        
+    
        
+    
        
+  
        
   
        
+  
        
+    
        
+    
        
+  
        
   
        
             
        
               
        
                 
        
-                  
-                  
                   
        
+                    
+                    
                     
        
                       
        
-                        Repositories
-                      
        
-                      
        
-                        
-                      
        
-                    
        
-                    
        
-                      
-                      
-                      
+                      
        
+                        
+                        
                       
        
                     
        
                   
        
+                  
                 
        
-                
-              
        
-              
        
                 
        
-                  
        
-                
        
+                  class="repos"
+                />
+                
        
               
        
             
        
           
diff --git a/src/behaviours/preferences/__snapshots__/navigation-to-proxy-preferences.test.ts.snap b/src/behaviours/preferences/__snapshots__/navigation-to-proxy-preferences.test.ts.snap
index 4710bb1957..d89450a19d 100644
--- a/src/behaviours/preferences/__snapshots__/navigation-to-proxy-preferences.test.ts.snap
+++ b/src/behaviours/preferences/__snapshots__/navigation-to-proxy-preferences.test.ts.snap
@@ -2,6 +2,16 @@
 
 exports[`preferences - navigation to proxy preferences given in preferences, when rendered renders 1`] = `
 
        
+  
        
+    
        
+    
        
+  
        
   
        
+  
        
+    
        
+    
        
+  
        
   
        
+  
        
+    
        
+    
        
+  
        
   
        
+  
        
+    
        
+    
        
+  
        
   
        
+  
        
+    
        
+    
        
+  
        
   
        
+  
        
+    
        
+    
        
+  
        
   
        
+  
        
+    
        
+    
        
+  
        
   
        
+  
        
+    
        
+    
        
+  
        
   
        
+  
        
+    
        
+    
        
+  
        
   
        
+  
        
+    
        
+    
        
+  
        
   
        
@@ -10,6 +20,16 @@ exports[`preferences - navigation using application menu renders 1`] = `
 
 exports[`preferences - navigation using application menu when navigating to preferences using application menu renders 1`] = `
 
        
+  
        
+    
        
+    
        
+  
        
   
        
   
        
+    
        
+      
        
+      
        
+    
        
     
        
@@ -13,6 +23,16 @@ exports[`show-about-using-tray renders 1`] = `
 exports[`show-about-using-tray when navigating using tray renders 1`] = `
 
   
        
+    
        
+      
        
+      
        
+    
        
     
         true),
   }),
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 const testPreferencesRouteComponentInjectable = getInjectable({
@@ -225,7 +225,7 @@ const testFrontPageRouteInjectable = getInjectable({
     isEnabled: computed(() => true),
   }),
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 const testFrontPageRouteComponentInjectable = getInjectable({
diff --git a/src/behaviours/preferences/navigation-to-kubernetes-preferences.test.ts b/src/behaviours/preferences/navigation-to-kubernetes-preferences.test.ts
index e404e1f489..75b4585c21 100644
--- a/src/behaviours/preferences/navigation-to-kubernetes-preferences.test.ts
+++ b/src/behaviours/preferences/navigation-to-kubernetes-preferences.test.ts
@@ -5,6 +5,8 @@
 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 callForPublicHelmRepositoriesInjectable from "../../renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable";
+import getActiveHelmRepositoriesInjectable from "../../main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable";
 
 describe("preferences - navigation to kubernetes preferences", () => {
   let applicationBuilder: ApplicationBuilder;
@@ -17,6 +19,15 @@ describe("preferences - navigation to kubernetes preferences", () => {
     let rendered: RenderResult;
 
     beforeEach(async () => {
+      applicationBuilder.beforeApplicationStart(({ rendererDi, mainDi }) => {
+        rendererDi.override(callForPublicHelmRepositoriesInjectable, () => async () => []);
+
+        mainDi.override(
+          getActiveHelmRepositoriesInjectable,
+          () => async () => ({ callWasSuccessful: true, response: [] }),
+        );
+      });
+
       applicationBuilder.beforeRender(() => {
         applicationBuilder.preferences.navigate();
       });
diff --git a/src/behaviours/preferences/navigation-using-application-menu.test.ts b/src/behaviours/preferences/navigation-using-application-menu.test.ts
index e12aa85a44..c78e546442 100644
--- a/src/behaviours/preferences/navigation-using-application-menu.test.ts
+++ b/src/behaviours/preferences/navigation-using-application-menu.test.ts
@@ -28,8 +28,8 @@ describe("preferences - navigation using application menu", () => {
   });
 
   describe("when navigating to preferences using application menu", () => {
-    beforeEach(async () => {
-      await applicationBuilder.applicationMenu.click("root.preferences");
+    beforeEach(() => {
+      applicationBuilder.applicationMenu.click("root.preferences");
     });
 
     it("renders", () => {
diff --git a/src/behaviours/quitting-and-restarting-the-app/opening-application-window-using-tray.test.ts b/src/behaviours/quitting-and-restarting-the-app/opening-application-window-using-tray.test.ts
new file mode 100644
index 0000000000..7b7765b988
--- /dev/null
+++ b/src/behaviours/quitting-and-restarting-the-app/opening-application-window-using-tray.test.ts
@@ -0,0 +1,238 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
+import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
+import { lensWindowInjectionToken } from "../../main/start-main-application/lens-window/application-window/lens-window-injection-token";
+import applicationWindowInjectable from "../../main/start-main-application/lens-window/application-window/application-window.injectable";
+import createElectronWindowForInjectable from "../../main/start-main-application/lens-window/application-window/create-electron-window.injectable";
+import type { AsyncFnMock } from "@async-fn/jest";
+import asyncFn from "@async-fn/jest";
+import type { ElectronWindow, LensWindowConfiguration } from "../../main/start-main-application/lens-window/application-window/create-lens-window.injectable";
+import type { DiContainer } from "@ogre-tools/injectable";
+import { flushPromises } from "../../common/test-utils/flush-promises";
+import lensResourcesDirInjectable from "../../common/vars/lens-resources-dir.injectable";
+
+describe("opening application window using tray", () => {
+  describe("given application has started", () => {
+    let applicationBuilder: ApplicationBuilder;
+    let createElectronWindowMock: jest.Mock;
+    let expectWindowsToBeOpen: (windowIds: string[]) => void;
+    let callForSplashWindowHtmlMock: AsyncFnMock<() => void>;
+    let callForApplicationWindowHtmlMock: AsyncFnMock<() => void>;
+
+    beforeEach(async () => {
+      applicationBuilder = getApplicationBuilder().beforeApplicationStart(
+        ({ mainDi }) => {
+          mainDi.override(lensResourcesDirInjectable, () => "some-lens-resources-directory");
+
+          createElectronWindowMock = jest.fn((configuration: LensWindowConfiguration) =>
+            ({
+              splash: {
+                send: () => {},
+                close: () => {},
+                show: () => {},
+                loadFile: callForSplashWindowHtmlMock,
+                loadUrl: () => { throw new Error("Should never come here"); },
+              },
+
+              "only-application-window": {
+                send: () => {},
+                close: () => {},
+                show: () => {},
+                loadFile: () => { throw new Error("Should never come here"); },
+                loadUrl: callForApplicationWindowHtmlMock,
+              },
+            }[configuration.id] as ElectronWindow));
+
+          mainDi.override(
+            createElectronWindowForInjectable,
+
+            () => createElectronWindowMock,
+          );
+
+          expectWindowsToBeOpen = expectWindowsToBeOpenFor(mainDi);
+
+          callForSplashWindowHtmlMock = asyncFn();
+          callForApplicationWindowHtmlMock = asyncFn();
+        },
+      );
+
+      const renderPromise = applicationBuilder.render();
+
+      await flushPromises();
+
+      await callForSplashWindowHtmlMock.resolve();
+      await callForApplicationWindowHtmlMock.resolve();
+
+      await renderPromise;
+    });
+
+    it("only an application window is open", () => {
+      expectWindowsToBeOpen(["only-application-window"]);
+    });
+
+    describe("when an attempt to reopen the already started application is made using tray", () => {
+      beforeEach(() => {
+        applicationBuilder.tray.click("open-app");
+      });
+
+      it("still shows only the application window", () => {
+        expectWindowsToBeOpen(["only-application-window"]);
+      });
+    });
+
+    describe("when the application window is closed", () => {
+      beforeEach(() => {
+        const applicationWindow = applicationBuilder.dis.mainDi.inject(
+          applicationWindowInjectable,
+        );
+
+        applicationWindow.close();
+      });
+
+      it("no windows are open", () => {
+        expectWindowsToBeOpen([]);
+      });
+
+      describe("when an application window is reopened using tray", () => {
+        beforeEach(() => {
+          callForSplashWindowHtmlMock.mockClear();
+          callForApplicationWindowHtmlMock.mockClear();
+
+          applicationBuilder.tray.click("open-app");
+        });
+
+        it("still no windows are open", () => {
+          expectWindowsToBeOpen([]);
+        });
+
+        it("starts loading static HTML of splash window", () => {
+          expect(callForSplashWindowHtmlMock).toHaveBeenCalledWith("/some-absolute-root-directory/some-lens-resources-directory/static/splash.html");
+        });
+
+        describe("when loading of splash window HTML resolves", () => {
+          beforeEach(async () => {
+            await callForSplashWindowHtmlMock.resolve();
+          });
+
+          it("shows just the splash window", () => {
+            expectWindowsToBeOpen(["splash"]);
+          });
+
+          it("starts loading of content for the application window", () => {
+            expect(callForApplicationWindowHtmlMock).toHaveBeenCalledWith("http://localhost:42");
+          });
+
+          describe("given static HTML of application window has not resolved yet, when opening from tray again", () => {
+            beforeEach(() => {
+              callForApplicationWindowHtmlMock.mockClear();
+              callForSplashWindowHtmlMock.mockClear();
+
+              applicationBuilder.tray.click("open-app");
+            });
+
+            it("does not load contents of splash window again", () => {
+              expect(callForSplashWindowHtmlMock).not.toHaveBeenCalled();
+            });
+
+            it("does not load contents of application window again", () => {
+              expect(callForApplicationWindowHtmlMock).not.toHaveBeenCalled();
+            });
+
+            it("shows just the blank application window to permit developer tool access", () => {
+              expectWindowsToBeOpen(["only-application-window"]);
+            });
+          });
+
+          describe("when static HTML of application window resolves", () => {
+            beforeEach(async () => {
+              await callForApplicationWindowHtmlMock.resolve();
+            });
+
+            it("shows just the application window", () => {
+              expectWindowsToBeOpen(["only-application-window"]);
+            });
+
+            describe("when reopening the application using tray", () => {
+              beforeEach(() => {
+                callForSplashWindowHtmlMock.mockClear();
+                callForApplicationWindowHtmlMock.mockClear();
+
+                applicationBuilder.tray.click("open-app");
+              });
+
+              it("still shows just the application window", () => {
+                expectWindowsToBeOpen(["only-application-window"]);
+              });
+
+              it("does not load HTML for splash window again", () => {
+                expect(callForSplashWindowHtmlMock).not.toHaveBeenCalled();
+              });
+
+              it("does not load HTML for application window again", () => {
+                expect(callForApplicationWindowHtmlMock).not.toHaveBeenCalled();
+              });
+            });
+          });
+        });
+
+        describe("given opening of splash window has not finished yet, but another attempt to open the application is made", () => {
+          beforeEach(() => {
+            createElectronWindowMock.mockClear();
+
+            applicationBuilder.tray.click("open-app");
+          });
+
+          it("does not open any new windows", () => {
+            expect(createElectronWindowMock).not.toHaveBeenCalled();
+          });
+        });
+
+        describe("when opening of splash window resolves", () => {
+          beforeEach(async () => {
+            await callForSplashWindowHtmlMock.resolve();
+          });
+
+          it("still only splash window is open", () => {
+            expectWindowsToBeOpen(["splash"]);
+          });
+
+          it("when opening of application window finishes, only an application window is open", async () => {
+            await callForApplicationWindowHtmlMock.resolve();
+
+            expectWindowsToBeOpen(["only-application-window"]);
+          });
+
+          describe("given opening of application window has not finished yet, but another attempt to open the application is made", () => {
+            beforeEach(() => {
+              createElectronWindowMock.mockClear();
+
+              applicationBuilder.tray.click("open-app");
+            });
+
+            it("does not open any new windows", () => {
+              expect(createElectronWindowMock).not.toHaveBeenCalled();
+            });
+
+            it("when opening finishes, only an application window is open", async () => {
+              await callForApplicationWindowHtmlMock.resolve();
+
+              expectWindowsToBeOpen(["only-application-window"]);
+            });
+          });
+        });
+      });
+    });
+  });
+});
+
+const expectWindowsToBeOpenFor = (di: DiContainer) => (windowIds: string[]) => {
+  const windows = di.injectMany(lensWindowInjectionToken);
+
+  expect(
+    windows.filter((window) => window.isVisible).map((window) => window.id),
+  ).toEqual(windowIds);
+};
diff --git a/src/behaviours/quitting-and-restarting-the-app/quitting-the-app-using-application-menu.test.ts b/src/behaviours/quitting-and-restarting-the-app/quitting-the-app-using-application-menu.test.ts
new file mode 100644
index 0000000000..5f96bb06fb
--- /dev/null
+++ b/src/behaviours/quitting-and-restarting-the-app/quitting-the-app-using-application-menu.test.ts
@@ -0,0 +1,90 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
+import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
+import type { ClusterManager } from "../../main/cluster-manager";
+import { lensWindowInjectionToken } from "../../main/start-main-application/lens-window/application-window/lens-window-injection-token";
+import exitAppInjectable from "../../main/electron-app/features/exit-app.injectable";
+import clusterManagerInjectable from "../../main/cluster-manager.injectable";
+import stopServicesAndExitAppInjectable from "../../main/stop-services-and-exit-app.injectable";
+
+describe("quitting the app using application menu", () => {
+  describe("given application has started", () => {
+    let applicationBuilder: ApplicationBuilder;
+    let clusterManagerStub: ClusterManager;
+    let exitAppMock: jest.Mock;
+
+    beforeEach(async () => {
+      jest.useFakeTimers();
+
+      applicationBuilder = getApplicationBuilder().beforeApplicationStart(
+        ({ mainDi }) => {
+          mainDi.unoverride(stopServicesAndExitAppInjectable);
+
+          clusterManagerStub = { stop: jest.fn() } as unknown as ClusterManager;
+          mainDi.override(clusterManagerInjectable, () => clusterManagerStub);
+
+          exitAppMock = jest.fn();
+          mainDi.override(exitAppInjectable, () => exitAppMock);
+        },
+      );
+
+      await applicationBuilder.render();
+    });
+
+    it("only an application window is open", () => {
+      const windows = applicationBuilder.dis.mainDi.injectMany(
+        lensWindowInjectionToken,
+      );
+
+      expect(
+        windows.map((window) => ({ id: window.id, visible: window.isVisible })),
+      ).toEqual([
+        { id: "only-application-window", visible: true },
+        { id: "splash", visible: false },
+      ]);
+    });
+
+    describe("when application is quit", () => {
+      beforeEach(() => {
+        applicationBuilder.applicationMenu.click("root.quit");
+      });
+
+      it("closes all windows", () => {
+        const windows = applicationBuilder.dis.mainDi.injectMany(
+          lensWindowInjectionToken,
+        );
+
+        expect(
+          windows.map((window) => ({ id: window.id, visible: window.isVisible })),
+        ).toEqual([
+          { id: "only-application-window", visible: false },
+          { id: "splash", visible: false },
+        ]);
+      });
+
+      it("disconnects all clusters", () => {
+        expect(clusterManagerStub.stop).toHaveBeenCalled();
+      });
+
+      it("after insufficient time passes, does not terminate application yet", () => {
+        jest.advanceTimersByTime(999);
+
+        expect(exitAppMock).not.toHaveBeenCalled();
+      });
+
+      describe("after sufficient time passes", () => {
+        beforeEach(() => {
+          jest.advanceTimersByTime(1000);
+        });
+
+        it("terminates application", () => {
+          expect(exitAppMock).toHaveBeenCalled();
+        });
+      });
+    });
+  });
+});
diff --git a/src/behaviours/welcome/__snapshots__/navigation-using-application-menu.test.ts.snap b/src/behaviours/welcome/__snapshots__/navigation-using-application-menu.test.ts.snap
index 05eee498bf..1f1426e962 100644
--- a/src/behaviours/welcome/__snapshots__/navigation-using-application-menu.test.ts.snap
+++ b/src/behaviours/welcome/__snapshots__/navigation-using-application-menu.test.ts.snap
@@ -2,6 +2,16 @@
 
 exports[`welcome - navigation using application menu renders 1`] = `
 
        
+  
        
+    
        
+    
        
+  
        
   
        
@@ -10,6 +20,16 @@ exports[`welcome - navigation using application menu renders 1`] = `
 
 exports[`welcome - navigation using application menu when navigating to welcome using application menu renders 1`] = `
 
        
+  
        
+    
        
+    
        
+  
        
   
         {
   });
 
   describe("when navigating to welcome using application menu", () => {
-    beforeEach(async () => {
-      await applicationBuilder.applicationMenu.click("help.welcome");
+    beforeEach(() => {
+      applicationBuilder.applicationMenu.click("help.welcome");
     });
 
     it("renders", () => {
diff --git a/src/common/app-event-bus/emit-event.injectable.ts b/src/common/app-event-bus/emit-event.injectable.ts
new file mode 100644
index 0000000000..47bf2ca691
--- /dev/null
+++ b/src/common/app-event-bus/emit-event.injectable.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 { getInjectable } from "@ogre-tools/injectable";
+import appEventBusInjectable from "./app-event-bus.injectable";
+
+const emitEventInjectable = getInjectable({
+  id: "emit-event",
+  instantiate: (di) => di.inject(appEventBusInjectable).emit,
+});
+
+export default emitEventInjectable;
diff --git a/src/common/cluster-store/allowed-resources-injection-token.ts b/src/common/cluster-store/allowed-resources-injection-token.ts
new file mode 100644
index 0000000000..ad387d26a2
--- /dev/null
+++ b/src/common/cluster-store/allowed-resources-injection-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 { getInjectionToken } from "@ogre-tools/injectable";
+import type { IComputedValue } from "mobx";
+
+export const allowedResourcesInjectionToken = getInjectionToken<
+  IComputedValue>
+>({
+  id: "allowed-resources",
+});
diff --git a/src/common/front-end-routing/route-injection-token.ts b/src/common/front-end-routing/front-end-route-injection-token.ts
similarity index 82%
rename from src/common/front-end-routing/route-injection-token.ts
rename to src/common/front-end-routing/front-end-route-injection-token.ts
index 7ecdbba635..cf1f9ed87e 100644
--- a/src/common/front-end-routing/route-injection-token.ts
+++ b/src/common/front-end-routing/front-end-route-injection-token.ts
@@ -6,8 +6,8 @@ import { getInjectionToken } from "@ogre-tools/injectable";
 import type { IComputedValue } from "mobx";
 import type { LensRendererExtension } from "../../extensions/lens-renderer-extension";
 
-export const routeInjectionToken = getInjectionToken>({
-  id: "route-injection-token",
+export const frontEndRouteInjectionToken = getInjectionToken>({
+  id: "front-end-route-injection-token",
 });
 
 export interface Route {
diff --git a/src/common/front-end-routing/navigate-to-route-injection-token.ts b/src/common/front-end-routing/navigate-to-route-injection-token.ts
index d6321f017e..29fb82867c 100644
--- a/src/common/front-end-routing/navigate-to-route-injection-token.ts
+++ b/src/common/front-end-routing/navigate-to-route-injection-token.ts
@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectionToken } from "@ogre-tools/injectable";
-import type { Route } from "./route-injection-token";
+import type { Route } from "./front-end-route-injection-token";
 
 type InferParametersFrom = TRoute extends Route
   ? TParameters
diff --git a/src/common/front-end-routing/routes/add-cluster/add-cluster-route.injectable.ts b/src/common/front-end-routing/routes/add-cluster/add-cluster-route.injectable.ts
index ce5bdcebd3..41e165dc59 100644
--- a/src/common/front-end-routing/routes/add-cluster/add-cluster-route.injectable.ts
+++ b/src/common/front-end-routing/routes/add-cluster/add-cluster-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
-import { routeInjectionToken } from "../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../front-end-route-injection-token";
 
 const addClusterRouteInjectable = getInjectable({
   id: "add-cluster-route",
@@ -15,7 +15,7 @@ const addClusterRouteInjectable = getInjectable({
     isEnabled: computed(() => true),
   }),
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default addClusterRouteInjectable;
diff --git a/src/common/front-end-routing/routes/catalog/catalog-route.injectable.ts b/src/common/front-end-routing/routes/catalog/catalog-route.injectable.ts
index 203c62e65a..bfe0904073 100644
--- a/src/common/front-end-routing/routes/catalog/catalog-route.injectable.ts
+++ b/src/common/front-end-routing/routes/catalog/catalog-route.injectable.ts
@@ -4,8 +4,8 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
-import type { Route } from "../../route-injection-token";
-import { routeInjectionToken } from "../../route-injection-token";
+import type { Route } from "../../front-end-route-injection-token";
+import { frontEndRouteInjectionToken } from "../../front-end-route-injection-token";
 
 export interface CatalogPathParameters {
   group?: string;
@@ -21,7 +21,7 @@ const catalogRouteInjectable = getInjectable({
     isEnabled: computed(() => true),
   }),
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default catalogRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster-view/cluster-view-route.injectable.ts b/src/common/front-end-routing/routes/cluster-view/cluster-view-route.injectable.ts
index 23fea9874b..e912ff63e0 100644
--- a/src/common/front-end-routing/routes/cluster-view/cluster-view-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster-view/cluster-view-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
-import { routeInjectionToken } from "../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../front-end-route-injection-token";
 
 const clusterViewRouteInjectable = getInjectable({
   id: "cluster-view-route",
@@ -15,7 +15,7 @@ const clusterViewRouteInjectable = getInjectable({
     isEnabled: computed(() => true),
   }),
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default clusterViewRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/config/config-maps/config-maps-route.injectable.ts b/src/common/front-end-routing/routes/cluster/config/config-maps/config-maps-route.injectable.ts
index b8c605fc64..3ab2bc515c 100644
--- a/src/common/front-end-routing/routes/cluster/config/config-maps/config-maps-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/config/config-maps/config-maps-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable";
-import { routeInjectionToken } from "../../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
 
 const configMapsRouteInjectable = getInjectable({
   id: "config-maps-route",
@@ -19,7 +19,7 @@ const configMapsRouteInjectable = getInjectable({
     };
   },
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default configMapsRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/config/horizontal-pod-autoscalers/horizontal-pod-autoscalers-route.injectable.ts b/src/common/front-end-routing/routes/cluster/config/horizontal-pod-autoscalers/horizontal-pod-autoscalers-route.injectable.ts
index d9eff7a026..fe1814734f 100644
--- a/src/common/front-end-routing/routes/cluster/config/horizontal-pod-autoscalers/horizontal-pod-autoscalers-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/config/horizontal-pod-autoscalers/horizontal-pod-autoscalers-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable";
-import { routeInjectionToken } from "../../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
 
 const horizontalPodAutoscalersRouteInjectable = getInjectable({
   id: "horizontal-pod-autoscalers-route",
@@ -19,7 +19,7 @@ const horizontalPodAutoscalersRouteInjectable = getInjectable({
     };
   },
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default horizontalPodAutoscalersRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/config/limit-ranges/limit-ranges-route.injectable.ts b/src/common/front-end-routing/routes/cluster/config/limit-ranges/limit-ranges-route.injectable.ts
index 70f40cb99d..bcf740113b 100644
--- a/src/common/front-end-routing/routes/cluster/config/limit-ranges/limit-ranges-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/config/limit-ranges/limit-ranges-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable";
-import { routeInjectionToken } from "../../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
 
 const limitRangesRouteInjectable = getInjectable({
   id: "limit-ranges-route",
@@ -22,7 +22,7 @@ const limitRangesRouteInjectable = getInjectable({
     };
   },
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default limitRangesRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/config/pod-disruption-budgets/pod-disruption-budgets-route.injectable.ts b/src/common/front-end-routing/routes/cluster/config/pod-disruption-budgets/pod-disruption-budgets-route.injectable.ts
index 8d113e6727..df6d89fb06 100644
--- a/src/common/front-end-routing/routes/cluster/config/pod-disruption-budgets/pod-disruption-budgets-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/config/pod-disruption-budgets/pod-disruption-budgets-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable";
-import { routeInjectionToken } from "../../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
 
 const podDisruptionBudgetsRouteInjectable = getInjectable({
   id: "pod-disruption-budgets-route",
@@ -19,7 +19,7 @@ const podDisruptionBudgetsRouteInjectable = getInjectable({
     };
   },
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default podDisruptionBudgetsRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/config/resource-quotas/resource-quotas-route.injectable.ts b/src/common/front-end-routing/routes/cluster/config/resource-quotas/resource-quotas-route.injectable.ts
index ee28deba5e..496a42ed0c 100644
--- a/src/common/front-end-routing/routes/cluster/config/resource-quotas/resource-quotas-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/config/resource-quotas/resource-quotas-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable";
-import { routeInjectionToken } from "../../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
 
 const resourceQuotasRouteInjectable = getInjectable({
   id: "resource-quotas-route",
@@ -19,7 +19,7 @@ const resourceQuotasRouteInjectable = getInjectable({
     };
   },
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default resourceQuotasRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/config/secrets/secrets-route.injectable.ts b/src/common/front-end-routing/routes/cluster/config/secrets/secrets-route.injectable.ts
index 7806238e0c..f451f51d0c 100644
--- a/src/common/front-end-routing/routes/cluster/config/secrets/secrets-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/config/secrets/secrets-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable";
-import { routeInjectionToken } from "../../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
 
 const secretsRouteInjectable = getInjectable({
   id: "secrets-route",
@@ -19,7 +19,7 @@ const secretsRouteInjectable = getInjectable({
     };
   },
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default secretsRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/custom-resources/crd-list/crd-list-route.injectable.ts b/src/common/front-end-routing/routes/cluster/custom-resources/crd-list/crd-list-route.injectable.ts
index 3a4865cc53..854b3a8c3a 100644
--- a/src/common/front-end-routing/routes/cluster/custom-resources/crd-list/crd-list-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/custom-resources/crd-list/crd-list-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
-import { routeInjectionToken } from "../../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
 
 const crdListRouteInjectable = getInjectable({
   id: "crd-list-route",
@@ -15,7 +15,7 @@ const crdListRouteInjectable = getInjectable({
     isEnabled: computed(() => true),
   }),
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default crdListRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/custom-resources/custom-resources/custom-resources-route.injectable.ts b/src/common/front-end-routing/routes/cluster/custom-resources/custom-resources/custom-resources-route.injectable.ts
index 8e0709f33e..cc7d9b40be 100644
--- a/src/common/front-end-routing/routes/cluster/custom-resources/custom-resources/custom-resources-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/custom-resources/custom-resources/custom-resources-route.injectable.ts
@@ -4,8 +4,8 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
-import type { Route } from "../../../../route-injection-token";
-import { routeInjectionToken } from "../../../../route-injection-token";
+import type { Route } from "../../../../front-end-route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
 
 export interface CustomResourcesPathParameters {
   group?: string;
@@ -21,7 +21,7 @@ const customResourcesRouteInjectable = getInjectable({
     isEnabled: computed(() => true),
   }),
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default customResourcesRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/events/events-route.injectable.ts b/src/common/front-end-routing/routes/cluster/events/events-route.injectable.ts
index 6fb9ff51f9..a53cb5d1f8 100644
--- a/src/common/front-end-routing/routes/cluster/events/events-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/events/events-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import isAllowedResourceInjectable from "../../../../utils/is-allowed-resource.injectable";
-import { routeInjectionToken } from "../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../front-end-route-injection-token";
 
 const eventsRouteInjectable = getInjectable({
   id: "events-route",
@@ -19,7 +19,7 @@ const eventsRouteInjectable = getInjectable({
     };
   },
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default eventsRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/helm/charts/helm-charts-route.injectable.ts b/src/common/front-end-routing/routes/cluster/helm/charts/helm-charts-route.injectable.ts
index 11509867e4..02161b082a 100644
--- a/src/common/front-end-routing/routes/cluster/helm/charts/helm-charts-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/helm/charts/helm-charts-route.injectable.ts
@@ -4,8 +4,8 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
-import type { Route } from "../../../../route-injection-token";
-import { routeInjectionToken } from "../../../../route-injection-token";
+import type { Route } from "../../../../front-end-route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
 
 export interface HelmChartsPathParameters {
   repo?: string;
@@ -21,7 +21,7 @@ const helmChartsRouteInjectable = getInjectable({
     isEnabled: computed(() => true),
   }),
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default helmChartsRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/helm/releases/helm-releases-route.injectable.ts b/src/common/front-end-routing/routes/cluster/helm/releases/helm-releases-route.injectable.ts
index bdc5a8a164..fb66416c63 100644
--- a/src/common/front-end-routing/routes/cluster/helm/releases/helm-releases-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/helm/releases/helm-releases-route.injectable.ts
@@ -4,8 +4,8 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
-import type { Route } from "../../../../route-injection-token";
-import { routeInjectionToken } from "../../../../route-injection-token";
+import type { Route } from "../../../../front-end-route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
 
 export interface HelmReleasesPathParameters {
   namespace?: string;
@@ -21,7 +21,7 @@ const helmReleasesRouteInjectable = getInjectable({
     isEnabled: computed(() => true),
   }),
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default helmReleasesRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/namespaces/namespaces-route.injectable.ts b/src/common/front-end-routing/routes/cluster/namespaces/namespaces-route.injectable.ts
index 361771d575..395c128682 100644
--- a/src/common/front-end-routing/routes/cluster/namespaces/namespaces-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/namespaces/namespaces-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import isAllowedResourceInjectable from "../../../../utils/is-allowed-resource.injectable";
-import { routeInjectionToken } from "../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../front-end-route-injection-token";
 
 const namespacesRouteInjectable = getInjectable({
   id: "namespaces-route",
@@ -19,7 +19,7 @@ const namespacesRouteInjectable = getInjectable({
     };
   },
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default namespacesRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/network/endpoints/endpoints-route.injectable.ts b/src/common/front-end-routing/routes/cluster/network/endpoints/endpoints-route.injectable.ts
index cc093f6cf3..e30df3123b 100644
--- a/src/common/front-end-routing/routes/cluster/network/endpoints/endpoints-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/network/endpoints/endpoints-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable";
-import { routeInjectionToken } from "../../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
 
 const endpointsRouteInjectable = getInjectable({
   id: "endpoints-route",
@@ -19,7 +19,7 @@ const endpointsRouteInjectable = getInjectable({
     };
   },
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default endpointsRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/network/ingresses/ingresses-route.injectable.ts b/src/common/front-end-routing/routes/cluster/network/ingresses/ingresses-route.injectable.ts
index 8c30cefe74..12565deeaf 100644
--- a/src/common/front-end-routing/routes/cluster/network/ingresses/ingresses-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/network/ingresses/ingresses-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable";
-import { routeInjectionToken } from "../../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
 
 const ingressesRouteInjectable = getInjectable({
   id: "ingresses-route",
@@ -19,7 +19,7 @@ const ingressesRouteInjectable = getInjectable({
     };
   },
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default ingressesRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/network/network-policies/network-policies-route.injectable.ts b/src/common/front-end-routing/routes/cluster/network/network-policies/network-policies-route.injectable.ts
index 99f94d68fe..ead62ee435 100644
--- a/src/common/front-end-routing/routes/cluster/network/network-policies/network-policies-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/network/network-policies/network-policies-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable";
-import { routeInjectionToken } from "../../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
 
 const networkPoliciesRouteInjectable = getInjectable({
   id: "network-policies-route",
@@ -19,7 +19,7 @@ const networkPoliciesRouteInjectable = getInjectable({
     };
   },
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default networkPoliciesRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/network/port-forwards/port-forwards-route.injectable.ts b/src/common/front-end-routing/routes/cluster/network/port-forwards/port-forwards-route.injectable.ts
index 5b6814ec06..0c8cd5ef2d 100644
--- a/src/common/front-end-routing/routes/cluster/network/port-forwards/port-forwards-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/network/port-forwards/port-forwards-route.injectable.ts
@@ -4,8 +4,8 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
-import type { Route } from "../../../../route-injection-token";
-import { routeInjectionToken } from "../../../../route-injection-token";
+import type { Route } from "../../../../front-end-route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
 
 export interface PortForwardsPathParameters {
   forwardport?: string;
@@ -20,7 +20,7 @@ const portForwardsRouteInjectable = getInjectable({
     isEnabled: computed(() => true),
   }),
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default portForwardsRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/network/services/services-route.injectable.ts b/src/common/front-end-routing/routes/cluster/network/services/services-route.injectable.ts
index efd83a3ffa..033c95673b 100644
--- a/src/common/front-end-routing/routes/cluster/network/services/services-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/network/services/services-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable";
-import { routeInjectionToken } from "../../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
 
 const servicesRouteInjectable = getInjectable({
   id: "services-route",
@@ -19,7 +19,7 @@ const servicesRouteInjectable = getInjectable({
     };
   },
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default servicesRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/nodes/nodes-route.injectable.ts b/src/common/front-end-routing/routes/cluster/nodes/nodes-route.injectable.ts
index 2713f1cc18..febd733343 100644
--- a/src/common/front-end-routing/routes/cluster/nodes/nodes-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/nodes/nodes-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import isAllowedResourceInjectable from "../../../../utils/is-allowed-resource.injectable";
-import { routeInjectionToken } from "../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../front-end-route-injection-token";
 
 const nodesRouteInjectable = getInjectable({
   id: "nodes-route",
@@ -19,7 +19,7 @@ const nodesRouteInjectable = getInjectable({
     };
   },
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default nodesRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/overview/cluster-overview-route.injectable.ts b/src/common/front-end-routing/routes/cluster/overview/cluster-overview-route.injectable.ts
index 9598666209..209fc113d8 100644
--- a/src/common/front-end-routing/routes/cluster/overview/cluster-overview-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/overview/cluster-overview-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import isAllowedResourceInjectable from "../../../../utils/is-allowed-resource.injectable";
-import { routeInjectionToken } from "../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../front-end-route-injection-token";
 
 const clusterOverviewRouteInjectable = getInjectable({
   id: "cluster-overview-route",
@@ -19,7 +19,7 @@ const clusterOverviewRouteInjectable = getInjectable({
     };
   },
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default clusterOverviewRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/storage/persistent-volume-claims/persistent-volume-claims-route.injectable.ts b/src/common/front-end-routing/routes/cluster/storage/persistent-volume-claims/persistent-volume-claims-route.injectable.ts
index a451c282e5..8879541355 100644
--- a/src/common/front-end-routing/routes/cluster/storage/persistent-volume-claims/persistent-volume-claims-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/storage/persistent-volume-claims/persistent-volume-claims-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable";
-import { routeInjectionToken } from "../../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
 
 const persistentVolumeClaimsRouteInjectable = getInjectable({
   id: "persistent-volume-claims-route",
@@ -19,7 +19,7 @@ const persistentVolumeClaimsRouteInjectable = getInjectable({
     };
   },
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default persistentVolumeClaimsRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/storage/persistent-volumes/persistent-volumes-route.injectable.ts b/src/common/front-end-routing/routes/cluster/storage/persistent-volumes/persistent-volumes-route.injectable.ts
index 68c8fa08f5..e6549ea45b 100644
--- a/src/common/front-end-routing/routes/cluster/storage/persistent-volumes/persistent-volumes-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/storage/persistent-volumes/persistent-volumes-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable";
-import { routeInjectionToken } from "../../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
 
 const persistentVolumesRouteInjectable = getInjectable({
   id: "persistent-volumes-route",
@@ -19,7 +19,7 @@ const persistentVolumesRouteInjectable = getInjectable({
     };
   },
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default persistentVolumesRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/storage/storage-classes/storage-classes-route.injectable.ts b/src/common/front-end-routing/routes/cluster/storage/storage-classes/storage-classes-route.injectable.ts
index 5499b5ba37..69f2b5d4ee 100644
--- a/src/common/front-end-routing/routes/cluster/storage/storage-classes/storage-classes-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/storage/storage-classes/storage-classes-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable";
-import { routeInjectionToken } from "../../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
 
 const storageClassesRouteInjectable = getInjectable({
   id: "storage-classes-route",
@@ -19,7 +19,7 @@ const storageClassesRouteInjectable = getInjectable({
     };
   },
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default storageClassesRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/user-management/cluster-role-bindings/cluster-role-bindings-route.injectable.ts b/src/common/front-end-routing/routes/cluster/user-management/cluster-role-bindings/cluster-role-bindings-route.injectable.ts
index 483397e6e1..f19491ee72 100644
--- a/src/common/front-end-routing/routes/cluster/user-management/cluster-role-bindings/cluster-role-bindings-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/user-management/cluster-role-bindings/cluster-role-bindings-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable";
-import { routeInjectionToken } from "../../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
 
 const clusterRoleBindingsRouteInjectable = getInjectable({
   id: "cluster-role-bindings-route",
@@ -19,7 +19,7 @@ const clusterRoleBindingsRouteInjectable = getInjectable({
     };
   },
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default clusterRoleBindingsRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/user-management/cluster-roles/cluster-roles-route.injectable.ts b/src/common/front-end-routing/routes/cluster/user-management/cluster-roles/cluster-roles-route.injectable.ts
index fced712dbf..d21c2c33a4 100644
--- a/src/common/front-end-routing/routes/cluster/user-management/cluster-roles/cluster-roles-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/user-management/cluster-roles/cluster-roles-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable";
-import { routeInjectionToken } from "../../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
 
 const clusterRolesRouteInjectable = getInjectable({
   id: "cluster-roles-route",
@@ -19,7 +19,7 @@ const clusterRolesRouteInjectable = getInjectable({
     };
   },
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default clusterRolesRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/user-management/pod-security-policies/pod-security-policies-route.injectable.ts b/src/common/front-end-routing/routes/cluster/user-management/pod-security-policies/pod-security-policies-route.injectable.ts
index 89220511c1..14cfcbedc5 100644
--- a/src/common/front-end-routing/routes/cluster/user-management/pod-security-policies/pod-security-policies-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/user-management/pod-security-policies/pod-security-policies-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable";
-import { routeInjectionToken } from "../../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
 
 const podSecurityPoliciesRouteInjectable = getInjectable({
   id: "pod-security-policies-route",
@@ -19,7 +19,7 @@ const podSecurityPoliciesRouteInjectable = getInjectable({
     };
   },
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default podSecurityPoliciesRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/user-management/role-bindings/role-bindings-route.injectable.ts b/src/common/front-end-routing/routes/cluster/user-management/role-bindings/role-bindings-route.injectable.ts
index 24e03d5cd9..0f908e5876 100644
--- a/src/common/front-end-routing/routes/cluster/user-management/role-bindings/role-bindings-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/user-management/role-bindings/role-bindings-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable";
-import { routeInjectionToken } from "../../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
 
 const roleBindingsRouteInjectable = getInjectable({
   id: "role-bindings-route",
@@ -19,7 +19,7 @@ const roleBindingsRouteInjectable = getInjectable({
     };
   },
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default roleBindingsRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/user-management/roles/roles-route.injectable.ts b/src/common/front-end-routing/routes/cluster/user-management/roles/roles-route.injectable.ts
index 097cbb1cf5..94db156fa4 100644
--- a/src/common/front-end-routing/routes/cluster/user-management/roles/roles-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/user-management/roles/roles-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable";
-import { routeInjectionToken } from "../../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
 
 const rolesRouteInjectable = getInjectable({
   id: "roles-route",
@@ -19,7 +19,7 @@ const rolesRouteInjectable = getInjectable({
     };
   },
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default rolesRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/user-management/service-accounts/service-accounts-route.injectable.ts b/src/common/front-end-routing/routes/cluster/user-management/service-accounts/service-accounts-route.injectable.ts
index f3424f1d8c..4d79258c54 100644
--- a/src/common/front-end-routing/routes/cluster/user-management/service-accounts/service-accounts-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/user-management/service-accounts/service-accounts-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable";
-import { routeInjectionToken } from "../../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
 
 const serviceAccountsRouteInjectable = getInjectable({
   id: "service-accounts-route",
@@ -19,7 +19,7 @@ const serviceAccountsRouteInjectable = getInjectable({
     };
   },
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default serviceAccountsRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/workloads/cron-jobs/cron-jobs-route.injectable.ts b/src/common/front-end-routing/routes/cluster/workloads/cron-jobs/cron-jobs-route.injectable.ts
index a99e13ea1f..735ea94642 100644
--- a/src/common/front-end-routing/routes/cluster/workloads/cron-jobs/cron-jobs-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/workloads/cron-jobs/cron-jobs-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable";
-import { routeInjectionToken } from "../../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
 
 const cronJobsRouteInjectable = getInjectable({
   id: "cron-jobs-route",
@@ -19,7 +19,7 @@ const cronJobsRouteInjectable = getInjectable({
     };
   },
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default cronJobsRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/workloads/daemonsets/daemonsets-route.injectable.ts b/src/common/front-end-routing/routes/cluster/workloads/daemonsets/daemonsets-route.injectable.ts
index be54e18c91..55729813e8 100644
--- a/src/common/front-end-routing/routes/cluster/workloads/daemonsets/daemonsets-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/workloads/daemonsets/daemonsets-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable";
-import { routeInjectionToken } from "../../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
 
 const daemonsetsRouteInjectable = getInjectable({
   id: "daemonsets-route",
@@ -19,7 +19,7 @@ const daemonsetsRouteInjectable = getInjectable({
     };
   },
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default daemonsetsRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/workloads/deployments/deployments-route.injectable.ts b/src/common/front-end-routing/routes/cluster/workloads/deployments/deployments-route.injectable.ts
index 65eed20f7a..b9ff072e66 100644
--- a/src/common/front-end-routing/routes/cluster/workloads/deployments/deployments-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/workloads/deployments/deployments-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable";
-import { routeInjectionToken } from "../../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
 
 const deploymentsRouteInjectable = getInjectable({
   id: "deployments-route",
@@ -19,7 +19,7 @@ const deploymentsRouteInjectable = getInjectable({
     };
   },
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default deploymentsRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/workloads/jobs/jobs-route.injectable.ts b/src/common/front-end-routing/routes/cluster/workloads/jobs/jobs-route.injectable.ts
index 5b2f087dc9..d9190a7ea8 100644
--- a/src/common/front-end-routing/routes/cluster/workloads/jobs/jobs-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/workloads/jobs/jobs-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable";
-import { routeInjectionToken } from "../../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
 
 const jobsRouteInjectable = getInjectable({
   id: "jobs-route",
@@ -19,7 +19,7 @@ const jobsRouteInjectable = getInjectable({
     };
   },
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default jobsRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/workloads/overview/workloads-overview-route.injectable.ts b/src/common/front-end-routing/routes/cluster/workloads/overview/workloads-overview-route.injectable.ts
index 00441c2ce9..188bd9f1de 100644
--- a/src/common/front-end-routing/routes/cluster/workloads/overview/workloads-overview-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/workloads/overview/workloads-overview-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
-import { routeInjectionToken } from "../../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
 
 const workloadsOverviewRouteInjectable = getInjectable({
   id: "workloads-overview-route",
@@ -15,7 +15,7 @@ const workloadsOverviewRouteInjectable = getInjectable({
     isEnabled: computed(() => true),
   }),
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default workloadsOverviewRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/workloads/pods/pods-route.injectable.ts b/src/common/front-end-routing/routes/cluster/workloads/pods/pods-route.injectable.ts
index b7c036cb65..e9fb2a2b16 100644
--- a/src/common/front-end-routing/routes/cluster/workloads/pods/pods-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/workloads/pods/pods-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable";
-import { routeInjectionToken } from "../../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
 
 const podsRouteInjectable = getInjectable({
   id: "pods-route",
@@ -19,7 +19,7 @@ const podsRouteInjectable = getInjectable({
     };
   },
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default podsRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/workloads/replicasets/replicasets-route.injectable.ts b/src/common/front-end-routing/routes/cluster/workloads/replicasets/replicasets-route.injectable.ts
index c1822339f7..0319d27550 100644
--- a/src/common/front-end-routing/routes/cluster/workloads/replicasets/replicasets-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/workloads/replicasets/replicasets-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable";
-import { routeInjectionToken } from "../../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
 
 const replicasetsRouteInjectable = getInjectable({
   id: "replicasets-route",
@@ -19,7 +19,7 @@ const replicasetsRouteInjectable = getInjectable({
     };
   },
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default replicasetsRouteInjectable;
diff --git a/src/common/front-end-routing/routes/cluster/workloads/statefulsets/statefulsets-route.injectable.ts b/src/common/front-end-routing/routes/cluster/workloads/statefulsets/statefulsets-route.injectable.ts
index ca271a22c5..a3089fa62f 100644
--- a/src/common/front-end-routing/routes/cluster/workloads/statefulsets/statefulsets-route.injectable.ts
+++ b/src/common/front-end-routing/routes/cluster/workloads/statefulsets/statefulsets-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable";
-import { routeInjectionToken } from "../../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token";
 
 const statefulsetsRouteInjectable = getInjectable({
   id: "statefulsets-route",
@@ -19,7 +19,7 @@ const statefulsetsRouteInjectable = getInjectable({
     };
   },
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default statefulsetsRouteInjectable;
diff --git a/src/common/front-end-routing/routes/entity-settings/entity-settings-route.injectable.ts b/src/common/front-end-routing/routes/entity-settings/entity-settings-route.injectable.ts
index d4ff30603f..e7d3ac5f46 100644
--- a/src/common/front-end-routing/routes/entity-settings/entity-settings-route.injectable.ts
+++ b/src/common/front-end-routing/routes/entity-settings/entity-settings-route.injectable.ts
@@ -4,8 +4,8 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
-import type { Route } from "../../route-injection-token";
-import { routeInjectionToken } from "../../route-injection-token";
+import type { Route } from "../../front-end-route-injection-token";
+import { frontEndRouteInjectionToken } from "../../front-end-route-injection-token";
 
 export interface EntitySettingsPathParameters {
   entityId: string;
@@ -20,7 +20,7 @@ const entitySettingsRouteInjectable = getInjectable({
     isEnabled: computed(() => true),
   }),
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default entitySettingsRouteInjectable;
diff --git a/src/common/front-end-routing/routes/extensions/extensions-route.injectable.ts b/src/common/front-end-routing/routes/extensions/extensions-route.injectable.ts
index 9459260412..5992355022 100644
--- a/src/common/front-end-routing/routes/extensions/extensions-route.injectable.ts
+++ b/src/common/front-end-routing/routes/extensions/extensions-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
-import { routeInjectionToken } from "../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../front-end-route-injection-token";
 
 const extensionsRouteInjectable = getInjectable({
   id: "extensions-route",
@@ -15,7 +15,7 @@ const extensionsRouteInjectable = getInjectable({
     isEnabled: computed(() => true),
   }),
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default extensionsRouteInjectable;
diff --git a/src/common/front-end-routing/routes/preferences/app/app-preferences-route.injectable.ts b/src/common/front-end-routing/routes/preferences/app/app-preferences-route.injectable.ts
index f19321f800..b4dfe5c05b 100644
--- a/src/common/front-end-routing/routes/preferences/app/app-preferences-route.injectable.ts
+++ b/src/common/front-end-routing/routes/preferences/app/app-preferences-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
-import { routeInjectionToken } from "../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../front-end-route-injection-token";
 
 const appPreferencesRouteInjectable = getInjectable({
   id: "app-preferences-route",
@@ -15,7 +15,7 @@ const appPreferencesRouteInjectable = getInjectable({
     isEnabled: computed(() => true),
   }),
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default appPreferencesRouteInjectable;
diff --git a/src/common/front-end-routing/routes/preferences/editor/editor-preferences-route.injectable.ts b/src/common/front-end-routing/routes/preferences/editor/editor-preferences-route.injectable.ts
index 485a5a1e18..ca6cbf8a70 100644
--- a/src/common/front-end-routing/routes/preferences/editor/editor-preferences-route.injectable.ts
+++ b/src/common/front-end-routing/routes/preferences/editor/editor-preferences-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
-import { routeInjectionToken } from "../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../front-end-route-injection-token";
 
 const editorPreferencesRouteInjectable = getInjectable({
   id: "editor-preferences-route",
@@ -15,7 +15,7 @@ const editorPreferencesRouteInjectable = getInjectable({
     isEnabled: computed(() => true),
   }),
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default editorPreferencesRouteInjectable;
diff --git a/src/common/front-end-routing/routes/preferences/extension/extension-preferences-route.injectable.ts b/src/common/front-end-routing/routes/preferences/extension/extension-preferences-route.injectable.ts
index 77bf98f255..38d25b4114 100644
--- a/src/common/front-end-routing/routes/preferences/extension/extension-preferences-route.injectable.ts
+++ b/src/common/front-end-routing/routes/preferences/extension/extension-preferences-route.injectable.ts
@@ -4,8 +4,8 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
-import type { Route } from "../../../route-injection-token";
-import { routeInjectionToken } from "../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../front-end-route-injection-token";
+import type { Route } from "../../../front-end-route-injection-token";
 
 interface ExtensionPreferenceRouteParams {
   extensionId: string;
@@ -21,7 +21,7 @@ const extensionPreferencesRouteInjectable = getInjectable({
     isEnabled: computed(() => true),
   }),
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default extensionPreferencesRouteInjectable;
diff --git a/src/common/front-end-routing/routes/preferences/kubernetes/kubernetes-preferences-route.injectable.ts b/src/common/front-end-routing/routes/preferences/kubernetes/kubernetes-preferences-route.injectable.ts
index 7a84a965b6..7b3479c7fa 100644
--- a/src/common/front-end-routing/routes/preferences/kubernetes/kubernetes-preferences-route.injectable.ts
+++ b/src/common/front-end-routing/routes/preferences/kubernetes/kubernetes-preferences-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
-import { routeInjectionToken } from "../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../front-end-route-injection-token";
 
 const kubernetesPreferencesRouteInjectable = getInjectable({
   id: "kubernetes-preferences-route",
@@ -15,7 +15,7 @@ const kubernetesPreferencesRouteInjectable = getInjectable({
     isEnabled: computed(() => true),
   }),
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default kubernetesPreferencesRouteInjectable;
diff --git a/src/common/front-end-routing/routes/preferences/proxy/proxy-preferences-route.injectable.ts b/src/common/front-end-routing/routes/preferences/proxy/proxy-preferences-route.injectable.ts
index b07925bab5..322e711225 100644
--- a/src/common/front-end-routing/routes/preferences/proxy/proxy-preferences-route.injectable.ts
+++ b/src/common/front-end-routing/routes/preferences/proxy/proxy-preferences-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
-import { routeInjectionToken } from "../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../front-end-route-injection-token";
 
 const proxyPreferencesRouteInjectable = getInjectable({
   id: "proxy-preferences-route",
@@ -15,7 +15,7 @@ const proxyPreferencesRouteInjectable = getInjectable({
     isEnabled: computed(() => true),
   }),
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default proxyPreferencesRouteInjectable;
diff --git a/src/common/front-end-routing/routes/preferences/telemetry/telemetry-preferences-route.injectable.ts b/src/common/front-end-routing/routes/preferences/telemetry/telemetry-preferences-route.injectable.ts
index f42cb83717..2ae9f14acd 100644
--- a/src/common/front-end-routing/routes/preferences/telemetry/telemetry-preferences-route.injectable.ts
+++ b/src/common/front-end-routing/routes/preferences/telemetry/telemetry-preferences-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
-import { routeInjectionToken } from "../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../front-end-route-injection-token";
 
 const telemetryPreferencesRouteInjectable = getInjectable({
   id: "telemetry-preferences-route",
@@ -15,7 +15,7 @@ const telemetryPreferencesRouteInjectable = getInjectable({
     isEnabled: computed(() => true),
   }),
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default telemetryPreferencesRouteInjectable;
diff --git a/src/common/front-end-routing/routes/preferences/terminal/terminal-preferences-route.injectable.ts b/src/common/front-end-routing/routes/preferences/terminal/terminal-preferences-route.injectable.ts
index 8f530b2b9d..c077c45bab 100644
--- a/src/common/front-end-routing/routes/preferences/terminal/terminal-preferences-route.injectable.ts
+++ b/src/common/front-end-routing/routes/preferences/terminal/terminal-preferences-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
-import { routeInjectionToken } from "../../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../../front-end-route-injection-token";
 
 const terminalPreferencesRouteInjectable = getInjectable({
   id: "terminal-preferences-route",
@@ -15,7 +15,7 @@ const terminalPreferencesRouteInjectable = getInjectable({
     isEnabled: computed(() => true),
   }),
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default terminalPreferencesRouteInjectable;
diff --git a/src/common/front-end-routing/routes/welcome/welcome-route.injectable.ts b/src/common/front-end-routing/routes/welcome/welcome-route.injectable.ts
index 516ee6cca4..75d722ab46 100644
--- a/src/common/front-end-routing/routes/welcome/welcome-route.injectable.ts
+++ b/src/common/front-end-routing/routes/welcome/welcome-route.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
-import { routeInjectionToken } from "../../route-injection-token";
+import { frontEndRouteInjectionToken } from "../../front-end-route-injection-token";
 
 const welcomeRouteInjectable = getInjectable({
   id: "welcome-route",
@@ -15,7 +15,7 @@ const welcomeRouteInjectable = getInjectable({
     isEnabled: computed(() => true),
   }),
 
-  injectionToken: routeInjectionToken,
+  injectionToken: frontEndRouteInjectionToken,
 });
 
 export default welcomeRouteInjectable;
diff --git a/src/common/front-end-routing/verify-that-all-routes-have-route-component.test.ts b/src/common/front-end-routing/verify-that-all-routes-have-route-component.test.ts
index 369fb6eb8c..4b6776bdaa 100644
--- a/src/common/front-end-routing/verify-that-all-routes-have-route-component.test.ts
+++ b/src/common/front-end-routing/verify-that-all-routes-have-route-component.test.ts
@@ -4,7 +4,7 @@
  */
 import { getDiForUnitTesting } from "../../renderer/getDiForUnitTesting";
 import { routeSpecificComponentInjectionToken } from "../../renderer/routes/route-specific-component-injection-token";
-import { routeInjectionToken } from "./route-injection-token";
+import { frontEndRouteInjectionToken } from "./front-end-route-injection-token";
 import { filter, map, matches } from "lodash/fp";
 import clusterStoreInjectable from "../cluster-store/cluster-store.injectable";
 import type { ClusterStore } from "../cluster-store/cluster-store";
@@ -18,7 +18,7 @@ describe("verify-that-all-routes-have-component", () => {
       getById: () => null,
     } as unknown as ClusterStore));
 
-    const routes = rendererDi.injectMany(routeInjectionToken);
+    const routes = rendererDi.injectMany(frontEndRouteInjectionToken);
     const routeComponents = rendererDi.injectMany(
       routeSpecificComponentInjectionToken,
     );
diff --git a/src/common/fs/exec-file.injectable.ts b/src/common/fs/exec-file.injectable.ts
new file mode 100644
index 0000000000..510fa025e4
--- /dev/null
+++ b/src/common/fs/exec-file.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 { execFile } from "child_process";
+import { promisify } from "util";
+
+export type ExecFile = (filePath: string, args: string[]) => Promise;
+
+const execFileInjectable = getInjectable({
+  id: "exec-file",
+
+  instantiate: (): ExecFile => async (filePath, args) => {
+    const asyncExecFile = promisify(execFile);
+
+    const result = await asyncExecFile(filePath, args);
+
+    return result.stdout;
+  },
+
+  causesSideEffects: true,
+});
+
+export default execFileInjectable;
diff --git a/src/common/fs/read-yaml-file.injectable.ts b/src/common/fs/read-yaml-file.injectable.ts
new file mode 100644
index 0000000000..a34a69d388
--- /dev/null
+++ b/src/common/fs/read-yaml-file.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 readFileInjectable from "./read-file.injectable";
+import yaml from "js-yaml";
+
+export type ReadYamlFile = (filePath: string) => Promise;
+
+const readYamlFileInjectable = getInjectable({
+  id: "read-yaml-file",
+
+  instantiate: (di): ReadYamlFile => {
+    const readFile = di.inject(readFileInjectable);
+
+    return async (filePath: string) => {
+      const contents = await readFile(filePath);
+
+      return yaml.load(contents);
+    };
+  },
+});
+
+export default readYamlFileInjectable;
diff --git a/src/common/helm/add-helm-repository-channel.injectable.ts b/src/common/helm/add-helm-repository-channel.injectable.ts
new file mode 100644
index 0000000000..0bc10564ad
--- /dev/null
+++ b/src/common/helm/add-helm-repository-channel.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * 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 { HelmRepo } from "./helm-repo";
+import type { RequestChannel } from "../utils/channel/request-channel-injection-token";
+import { requestChannelInjectionToken } from "../utils/channel/request-channel-injection-token";
+import type { AsyncResult } from "../utils/async-result";
+
+export type AddHelmRepositoryChannel = RequestChannel>;
+
+const addHelmRepositoryChannelInjectable = getInjectable({
+  id: "add-helm-repository-channel",
+
+  instantiate: (): AddHelmRepositoryChannel => ({
+    id: "add-helm-repository-channel",
+  }),
+
+  injectionToken: requestChannelInjectionToken,
+});
+
+export default addHelmRepositoryChannelInjectable;
diff --git a/src/common/helm/get-active-helm-repositories-channel.injectable.ts b/src/common/helm/get-active-helm-repositories-channel.injectable.ts
new file mode 100644
index 0000000000..ac7355ace7
--- /dev/null
+++ b/src/common/helm/get-active-helm-repositories-channel.injectable.ts
@@ -0,0 +1,23 @@
+/**
+ * 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 { RequestChannel } from "../utils/channel/request-channel-injection-token";
+import type { HelmRepo } from "./helm-repo";
+import { requestChannelInjectionToken } from "../utils/channel/request-channel-injection-token";
+import type { AsyncResult } from "../utils/async-result";
+
+export type GetHelmRepositoriesChannel = RequestChannel>;
+
+const getActiveHelmRepositoriesChannelInjectable = getInjectable({
+  id: "get-active-helm-repositories-channel",
+
+  instantiate: (): GetHelmRepositoriesChannel => ({
+    id: "get-helm-active-list-repositories",
+  }),
+
+  injectionToken: requestChannelInjectionToken,
+});
+
+export default getActiveHelmRepositoriesChannelInjectable;
diff --git a/src/common/helm/helm-repo.ts b/src/common/helm/helm-repo.ts
new file mode 100644
index 0000000000..9405d59bed
--- /dev/null
+++ b/src/common/helm/helm-repo.ts
@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+export type HelmRepo = {
+  name: string;
+  url: string;
+  cacheFilePath?: string;
+  caFile?: string;
+  certFile?: string;
+  insecureSkipTlsVerify?: boolean;
+  keyFile?: string;
+  username?: string;
+  password?: string;
+};
diff --git a/src/common/helm/remove-helm-repository-channel.injectable.ts b/src/common/helm/remove-helm-repository-channel.injectable.ts
new file mode 100644
index 0000000000..eddecb1ccd
--- /dev/null
+++ b/src/common/helm/remove-helm-repository-channel.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 { getInjectable } from "@ogre-tools/injectable";
+import type { HelmRepo } from "./helm-repo";
+import type { RequestChannel } from "../utils/channel/request-channel-injection-token";
+import { requestChannelInjectionToken } from "../utils/channel/request-channel-injection-token";
+
+export type RemoveHelmRepositoryChannel = RequestChannel;
+
+const removeHelmRepositoryChannelInjectable = getInjectable({
+  id: "remove-helm-repository-channel",
+
+  instantiate: (): RemoveHelmRepositoryChannel => ({
+    id: "remove-helm-repository-channel",
+  }),
+
+  injectionToken: requestChannelInjectionToken,
+});
+
+export default removeHelmRepositoryChannelInjectable;
diff --git a/src/common/k8s-api/__tests__/kube-api.test.ts b/src/common/k8s-api/__tests__/kube-api.test.ts
index 9efa23bdaf..36f2aea748 100644
--- a/src/common/k8s-api/__tests__/kube-api.test.ts
+++ b/src/common/k8s-api/__tests__/kube-api.test.ts
@@ -449,7 +449,7 @@ describe("KubeApi", () => {
       expect(spy).toHaveBeenCalledWith("/api/v1/namespaces/kube-system/pods?watch=1&resourceVersion=", { query: { timeoutSeconds: 60 }}, expect.anything());
     });
 
-    it("aborts watch using abortController", async (done) => {
+    it("aborts watch using abortController", (done) => {
       const spy = jest.spyOn(request, "getResponse");
 
       mockFetch.mockResponse(async request => {
@@ -472,10 +472,7 @@ describe("KubeApi", () => {
       });
 
       expect(spy).toHaveBeenCalledWith("/api/v1/namespaces/kube-system/pods?watch=1&resourceVersion=", { query: { timeoutSeconds: 60 }}, expect.anything());
-
-      await delay(100);
-
-      abortController.abort();
+      delay(100).then(() => abortController.abort());
     });
 
     describe("retries", () => {
diff --git a/src/common/k8s-api/kube-object.store.ts b/src/common/k8s-api/kube-object.store.ts
index ca4e1d9000..855e1a1315 100644
--- a/src/common/k8s-api/kube-object.store.ts
+++ b/src/common/k8s-api/kube-object.store.ts
@@ -7,7 +7,7 @@ import type { ClusterContext } from "./cluster-context";
 
 import { action, computed, makeObservable, observable, reaction, when } from "mobx";
 import type { Disposer } from "../utils";
-import { autoBind, includes, isRequestError, noop, rejectPromiseBy } from "../utils";
+import { waitUntilDefined, autoBind, includes, isRequestError, noop, rejectPromiseBy } from "../utils";
 import type { KubeJsonApiDataFor, KubeObject } from "./kube-object";
 import { KubeStatus } from "./kube-object";
 import type { IKubeWatchEvent } from "./kube-watch-event";
@@ -114,7 +114,7 @@ export abstract class KubeObjectStore<
     this.bindWatchEventsUpdater();
   }
 
-  get context(): ClusterContext {
+  get context(): ClusterContext | undefined {
     return KubeObjectStore.defaultContext.get();
   }
 
@@ -259,8 +259,9 @@ export abstract class KubeObjectStore<
 
   @action
   async loadAll({ namespaces, merge = true, reqInit, onLoadFailure }: KubeObjectStoreLoadAllParams = {}): Promise {
-    await this.contextReady;
-    namespaces ??= this.context.contextNamespaces;
+    const context = await waitUntilDefined(() => this.context);
+
+    namespaces ??= context.contextNamespaces;
     this.isLoading = true;
 
     try {
@@ -427,11 +428,17 @@ export abstract class KubeObjectStore<
 
   subscribe({ onLoadFailure, abortController = new AbortController() }: KubeObjectStoreSubscribeParams = {}): Disposer {
     if (this.api.isNamespaced) {
-      Promise.race([rejectPromiseBy(abortController.signal), Promise.all([this.contextReady, this.namespacesReady])])
-        .then(() => {
+      Promise.race([
+        rejectPromiseBy(abortController.signal),
+        Promise.all([
+          waitUntilDefined(() => this.context),
+          this.namespacesReady,
+        ] as const),
+      ])
+        .then(([context]) => {
           assert(this.loadedNamespaces);
 
-          if (this.context.cluster?.isGlobalWatchEnabled && this.loadedNamespaces.length === 0) {
+          if (context.cluster?.isGlobalWatchEnabled && this.loadedNamespaces.length === 0) {
             return this.watchNamespace("", abortController, { onLoadFailure });
           }
 
diff --git a/src/common/protocol-handler/router.ts b/src/common/protocol-handler/router.ts
index 476c992582..804f70c80b 100644
--- a/src/common/protocol-handler/router.ts
+++ b/src/common/protocol-handler/router.ts
@@ -63,9 +63,9 @@ export function foldAttemptResults(mainAttempt: RouteAttempt, rendererAttempt: R
   }
 }
 
-interface Dependencies {
-  extensionLoader: ExtensionLoader;
-  extensionsStore: ExtensionsStore;
+export interface LensProtocolRouterDependencies {
+  readonly extensionLoader: ExtensionLoader;
+  readonly extensionsStore: ExtensionsStore;
 }
 
 export abstract class LensProtocolRouter {
@@ -76,7 +76,7 @@ export abstract class LensProtocolRouter {
 
   static readonly ExtensionUrlSchema = `/:${EXTENSION_PUBLISHER_MATCH}(@[A-Za-z0-9_]+)?/:${EXTENSION_NAME_MATCH}`;
 
-  constructor(protected dependencies: Dependencies) {}
+  constructor(protected readonly dependencies: LensProtocolRouterDependencies) {}
 
   /**
    * Attempts to route the given URL to all internal routes that have been registered
diff --git a/src/common/test-utils/flush-promises.ts b/src/common/test-utils/flush-promises.ts
index 55335fe445..c2fdeff99e 100644
--- a/src/common/test-utils/flush-promises.ts
+++ b/src/common/test-utils/flush-promises.ts
@@ -2,4 +2,6 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
+import { setImmediate } from "timers";
+
 export const flushPromises = () => new Promise(setImmediate);
diff --git a/src/common/utils/async-result.ts b/src/common/utils/async-result.ts
new file mode 100644
index 0000000000..4e4f37866e
--- /dev/null
+++ b/src/common/utils/async-result.ts
@@ -0,0 +1,7 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+export type AsyncResult =
+  | { callWasSuccessful: true; response: Response }
+  | { callWasSuccessful: false; error: Error };
diff --git a/src/common/utils/channel/channel.test.ts b/src/common/utils/channel/channel.test.ts
index f2748104d7..84c1366f35 100644
--- a/src/common/utils/channel/channel.test.ts
+++ b/src/common/utils/channel/channel.test.ts
@@ -70,13 +70,13 @@ describe("channel", () => {
       closeAllWindows();
     });
 
-    describe("given window is shown", () => {
+    describe("given window is started", () => {
       let someWindowFake: LensWindow;
 
       beforeEach(async () => {
         someWindowFake = createTestWindow(mainDi, "some-window");
 
-        await someWindowFake.show();
+        await someWindowFake.start();
       });
 
       it("when sending message, triggers listener in window", () => {
@@ -94,12 +94,12 @@ describe("channel", () => {
       });
     });
 
-    it("given multiple shown windows, when sending message, triggers listeners in all windows", async () => {
+    it("given multiple started windows, when sending message, triggers listeners in all windows", async () => {
       const someWindowFake = createTestWindow(mainDi, "some-window");
       const someOtherWindowFake = createTestWindow(mainDi, "some-other-window");
 
-      await someWindowFake.show();
-      await someOtherWindowFake.show();
+      await someWindowFake.start();
+      await someOtherWindowFake.start();
 
       messageToChannel(testMessageChannel, "some-message");
 
diff --git a/src/common/utils/date/get-current-date-time.ts b/src/common/utils/date/get-current-date-time.ts
new file mode 100644
index 0000000000..bf3df2bd78
--- /dev/null
+++ b/src/common/utils/date/get-current-date-time.ts
@@ -0,0 +1,7 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import moment from "moment";
+
+export const getCurrentDateTime = () => moment().utc().format();
diff --git a/src/common/utils/get-error-message.ts b/src/common/utils/get-error-message.ts
new file mode 100644
index 0000000000..b5d7dd4244
--- /dev/null
+++ b/src/common/utils/get-error-message.ts
@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+export const getErrorMessage = (error: unknown): string => {
+  if (typeof error === "string") {
+    return error;
+  }
+
+  if (error instanceof Error) {
+    return error.message;
+  }
+
+  return JSON.stringify(error);
+};
diff --git a/src/common/utils/is-allowed-resource.injectable.ts b/src/common/utils/is-allowed-resource.injectable.ts
index 67050a7f02..8841a8f0cc 100644
--- a/src/common/utils/is-allowed-resource.injectable.ts
+++ b/src/common/utils/is-allowed-resource.injectable.ts
@@ -4,8 +4,8 @@
  */
 import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
 import { computed } from "mobx";
-import allowedResourcesInjectable from "../cluster-store/allowed-resources.injectable";
 import type { KubeResource } from "../rbac";
+import { allowedResourcesInjectionToken } from "../cluster-store/allowed-resources-injection-token";
 
 export type IsAllowedResource = (resource: KubeResource) => boolean;
 
@@ -13,7 +13,7 @@ const isAllowedResourceInjectable = getInjectable({
   id: "is-allowed-resource",
 
   instantiate: (di, resourceName: string) => {
-    const allowedResources = di.inject(allowedResourcesInjectable);
+    const allowedResources = di.inject(allowedResourcesInjectionToken);
 
     return computed(() => allowedResources.get().has(resourceName));
   },
diff --git a/src/common/utils/reject-promise.ts b/src/common/utils/reject-promise.ts
index 2f6c31ca2a..8212bacd3f 100644
--- a/src/common/utils/reject-promise.ts
+++ b/src/common/utils/reject-promise.ts
@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import "abort-controller/polyfill";
+import type { AbortSignal } from "abort-controller";
 
 /**
  * Creates a new promise that will be rejected when the signal rejects.
@@ -11,7 +11,7 @@ import "abort-controller/polyfill";
  * Useful for `Promise.race()` applications.
  * @param signal The AbortController's signal to reject with
  */
-export function rejectPromiseBy(signal: AbortSignal): Promise {
+export function rejectPromiseBy(signal: AbortSignal): Promise {
   return new Promise((_, reject) => {
     signal.addEventListener("abort", reject);
   });
diff --git a/src/common/utils/sync-box/create-sync-box.injectable.ts b/src/common/utils/sync-box/create-sync-box.injectable.ts
index 2cf3de6a69..1328106e24 100644
--- a/src/common/utils/sync-box/create-sync-box.injectable.ts
+++ b/src/common/utils/sync-box/create-sync-box.injectable.ts
@@ -3,6 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
+import type { IObservableValue } from "mobx";
 import { computed } from "mobx";
 import syncBoxChannelInjectable from "./sync-box-channel.injectable";
 import { messageToChannelInjectionToken } from "../channel/message-to-channel-injection-token";
@@ -17,8 +18,8 @@ const createSyncBoxInjectable = getInjectable({
     const messageToChannel = di.inject(messageToChannelInjectionToken);
     const getSyncBoxState = (id: string) => di.inject(syncBoxStateInjectable, id);
 
-    return (id: string, initialValue: TData): SyncBox => {
-      const state = getSyncBoxState(id);
+    return (id: string, initialValue: Value): SyncBox => {
+      const state = getSyncBoxState(id) as IObservableValue;
 
       state.set(initialValue);
 
diff --git a/src/common/utils/sync-box/sync-box-injection-token.ts b/src/common/utils/sync-box/sync-box-injection-token.ts
index 76ba0679f3..8db80243d3 100644
--- a/src/common/utils/sync-box/sync-box-injection-token.ts
+++ b/src/common/utils/sync-box/sync-box-injection-token.ts
@@ -4,21 +4,10 @@
  */
 import { getInjectionToken } from "@ogre-tools/injectable";
 import type { IComputedValue } from "mobx";
-
-type AsJson = T extends string | number | boolean | null
-  ? T
-  : T extends Function
-    ? never
-    : T extends Array
-      ? AsJson[]
-      : T extends object
-        ? { [K in keyof T]: AsJson }
-        : never;
-
-export interface SyncBox {
+export interface SyncBox {
   id: string;
-  value: IComputedValue>;
-  set: (value: AsJson) => void;
+  value: IComputedValue;
+  set: (value: Value) => void;
 }
 
 export const syncBoxInjectionToken = getInjectionToken>({
diff --git a/src/common/utils/type-narrowing.ts b/src/common/utils/type-narrowing.ts
index a138b2a0ec..eb5b6996cf 100644
--- a/src/common/utils/type-narrowing.ts
+++ b/src/common/utils/type-narrowing.ts
@@ -137,6 +137,14 @@ export function hasDefiniteField(field: Field): (val:
   return (val): val is T & { [f in Field]-?: NonNullable } => val[field] != null;
 }
 
+export function isPromiseSettledRejected(result: PromiseSettledResult): result is PromiseRejectedResult {
+  return result.status === "rejected";
+}
+
+export function isPromiseSettledFulfilled(result: PromiseSettledResult): result is PromiseFulfilledResult {
+  return result.status === "fulfilled";
+}
+
 export function isErrnoException(error: unknown): error is NodeJS.ErrnoException {
   return isObject(error)
     && hasOptionalTypedProperty(error, "code", isString)
diff --git a/src/common/vars/base-bundled-binaries-dir.injectable.ts b/src/common/vars/base-bundled-binaries-dir.injectable.ts
index 41f5a5e0a3..f0d78482c8 100644
--- a/src/common/vars/base-bundled-binaries-dir.injectable.ts
+++ b/src/common/vars/base-bundled-binaries-dir.injectable.ts
@@ -3,16 +3,22 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import path from "path";
-import bundledBinariesNormalizedArchInjectable from "./bundled-binaries-normalized-arch.injectable";
 import bundledResourcesDirectoryInjectable from "./bundled-resources-dir.injectable";
+import getAbsolutePathInjectable from "../path/get-absolute-path.injectable";
+import normalizedPlatformArchitectureInjectable from "./normalized-platform-architecture.injectable";
 
-const baseBundeledBinariesDirectoryInjectable = getInjectable({
-  id: "base-bundeled-binaries-directory",
-  instantiate: (di) => path.join(
-    di.inject(bundledResourcesDirectoryInjectable),
-    di.inject(bundledBinariesNormalizedArchInjectable),
-  ),
+const baseBundledBinariesDirectoryInjectable = getInjectable({
+  id: "base-bundled-binaries-directory",
+  instantiate: (di) => {
+    const bundledResourcesDirectory = di.inject(bundledResourcesDirectoryInjectable);
+    const normalizedPlatformArchitecture = di.inject(normalizedPlatformArchitectureInjectable);
+    const getAbsolutePath = di.inject(getAbsolutePathInjectable);
+
+    return getAbsolutePath(
+      bundledResourcesDirectory,
+      normalizedPlatformArchitecture,
+    );
+  },
 });
 
-export default baseBundeledBinariesDirectoryInjectable;
+export default baseBundledBinariesDirectoryInjectable;
diff --git a/src/common/vars/bundled-resources-dir.injectable.ts b/src/common/vars/bundled-resources-dir.injectable.ts
index a73ff98e78..e20a638384 100644
--- a/src/common/vars/bundled-resources-dir.injectable.ts
+++ b/src/common/vars/bundled-resources-dir.injectable.ts
@@ -3,19 +3,22 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import path from "path";
 import isProductionInjectable from "./is-production.injectable";
 import normalizedPlatformInjectable from "./normalized-platform.injectable";
+import getAbsolutePathInjectable from "../path/get-absolute-path.injectable";
+import lensResourcesDirInjectable from "./lens-resources-dir.injectable";
 
 const bundledResourcesDirectoryInjectable = getInjectable({
   id: "bundled-resources-directory",
   instantiate: (di) => {
     const isProduction = di.inject(isProductionInjectable);
     const normalizedPlatform = di.inject(normalizedPlatformInjectable);
+    const getAbsolutePath = di.inject(getAbsolutePathInjectable);
+    const lensResourcesDir = di.inject(lensResourcesDirInjectable);
 
     return isProduction
-      ? process.resourcesPath
-      : path.join(process.cwd(), "binaries", "client", normalizedPlatform);
+      ? lensResourcesDir
+      : getAbsolutePath(lensResourcesDir, "binaries", "client", normalizedPlatform);
   },
 });
 
diff --git a/src/common/vars/bundled-binaries-normalized-arch.injectable.ts b/src/common/vars/normalized-platform-architecture.injectable.ts
similarity index 77%
rename from src/common/vars/bundled-binaries-normalized-arch.injectable.ts
rename to src/common/vars/normalized-platform-architecture.injectable.ts
index 3c838d626c..c2053d2d8e 100644
--- a/src/common/vars/bundled-binaries-normalized-arch.injectable.ts
+++ b/src/common/vars/normalized-platform-architecture.injectable.ts
@@ -4,8 +4,8 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 
-const bundledBinariesNormalizedArchInjectable = getInjectable({
-  id: "bundled-binaries-normalized-arch",
+const normalizedPlatformArchitectureInjectable = getInjectable({
+  id: "normalized-platform-architecture",
   instantiate: () => {
     switch (process.arch) {
       case "arm64":
@@ -24,4 +24,4 @@ const bundledBinariesNormalizedArchInjectable = getInjectable({
   causesSideEffects: true,
 });
 
-export default bundledBinariesNormalizedArchInjectable;
+export default normalizedPlatformArchitectureInjectable;
diff --git a/src/common/vars/normalized-platform.injectable.ts b/src/common/vars/normalized-platform.injectable.ts
index 7177678407..cb34f1d2fa 100644
--- a/src/common/vars/normalized-platform.injectable.ts
+++ b/src/common/vars/normalized-platform.injectable.ts
@@ -3,11 +3,15 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
+import platformInjectable from "./platform.injectable";
 
 const normalizedPlatformInjectable = getInjectable({
   id: "normalized-platform",
-  instantiate: () => {
-    switch (process.platform) {
+
+  instantiate: (di) => {
+    const platform = di.inject(platformInjectable);
+
+    switch (platform) {
       case "darwin":
         return "darwin";
       case "linux":
@@ -15,10 +19,9 @@ const normalizedPlatformInjectable = getInjectable({
       case "win32":
         return "windows";
       default:
-        throw new Error(`platform=${process.platform} is unsupported`);
+        throw new Error(`platform=${platform} is unsupported`);
     }
   },
-  causesSideEffects: true,
 });
 
 export default normalizedPlatformInjectable;
diff --git a/src/extensions/__tests__/extension-loader.test.ts b/src/extensions/__tests__/extension-loader.test.ts
index ae150e4f99..765762c9bc 100644
--- a/src/extensions/__tests__/extension-loader.test.ts
+++ b/src/extensions/__tests__/extension-loader.test.ts
@@ -11,6 +11,7 @@ import { runInAction } from "mobx";
 import updateExtensionsStateInjectable from "../extension-loader/update-extensions-state/update-extensions-state.injectable";
 import mockFs from "mock-fs";
 import { getDiForUnitTesting } from "../../main/getDiForUnitTesting";
+import { delay } from "../../renderer/utils";
 
 console = new Console(stdout, stderr);
 
@@ -125,42 +126,39 @@ describe("ExtensionLoader", () => {
     mockFs.restore();
   });
 
-  it("renderer updates extension after ipc broadcast", async done => {
+  it("renderer updates extension after ipc broadcast", async () => {
     expect(extensionLoader.userExtensions).toMatchInlineSnapshot(`Map {}`);
 
     await extensionLoader.init();
+    await delay(10);
 
-    setTimeout(() => {
-      // Assert the extensions after the extension broadcast event
-      expect(extensionLoader.userExtensions).toMatchInlineSnapshot(`
-        Map {
-          "manifest/path" => Object {
-            "absolutePath": "/test/1",
-            "id": "manifest/path",
-            "isBundled": false,
-            "isEnabled": true,
-            "manifest": Object {
-              "name": "TestExtension",
-              "version": "1.0.0",
-            },
-            "manifestPath": "manifest/path",
+    // Assert the extensions after the extension broadcast event
+    expect(extensionLoader.userExtensions).toMatchInlineSnapshot(`
+      Map {
+        "manifest/path" => Object {
+          "absolutePath": "/test/1",
+          "id": "manifest/path",
+          "isBundled": false,
+          "isEnabled": true,
+          "manifest": Object {
+            "name": "TestExtension",
+            "version": "1.0.0",
           },
-          "manifest/path3" => Object {
-            "absolutePath": "/test/3",
-            "id": "manifest/path3",
-            "isBundled": false,
-            "isEnabled": true,
-            "manifest": Object {
-              "name": "TestExtension3",
-              "version": "3.0.0",
-            },
-            "manifestPath": "manifest/path3",
+          "manifestPath": "manifest/path",
+        },
+        "manifest/path3" => Object {
+          "absolutePath": "/test/3",
+          "id": "manifest/path3",
+          "isBundled": false,
+          "isEnabled": true,
+          "manifest": Object {
+            "name": "TestExtension3",
+            "version": "3.0.0",
           },
-        }
-      `);
-
-      done();
-    }, 10);
+          "manifestPath": "manifest/path3",
+        },
+      }
+    `);
   });
 
   it("updates ExtensionsStore after isEnabled is changed", async () => {
diff --git a/src/extensions/extension-discovery/extension-discovery.test.ts b/src/extensions/extension-discovery/extension-discovery.test.ts
index 4e71f5ff7c..0ae51623ad 100644
--- a/src/extensions/extension-discovery/extension-discovery.test.ts
+++ b/src/extensions/extension-discovery/extension-discovery.test.ts
@@ -17,6 +17,8 @@ import installExtensionInjectable
 import directoryForUserDataInjectable
   from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
 import mockFs from "mock-fs";
+import { delay } from "../../renderer/utils";
+import { observable, when } from "mobx";
 
 jest.setTimeout(60_000);
 
@@ -64,7 +66,8 @@ describe("ExtensionDiscovery", () => {
     mockFs.restore();
   });
 
-  it("emits add for added extension", async (done) => {
+  it("emits add for added extension", async () => {
+    const letTestFinish = observable.box(false);
     let addHandler!: (filePath: string) => void;
 
     mockedFse.readJson.mockImplementation((p) => {
@@ -114,13 +117,14 @@ describe("ExtensionDiscovery", () => {
         },
         manifestPath: path.normalize("some-directory-for-user-data/node_modules/my-extension/package.json"),
       });
-      done();
+      letTestFinish.set(true);
     });
 
     addHandler(path.join(extensionDiscovery.localFolderPath, "/my-extension/package.json"));
+    await when(() => letTestFinish.get());
   });
 
-  it("doesn't emit add for added file under extension", async done => {
+  it("doesn't emit add for added file under extension", async () => {
     let addHandler!: (filePath: string) => void;
 
     const mockWatchInstance = {
@@ -146,10 +150,8 @@ describe("ExtensionDiscovery", () => {
 
     addHandler(path.join(extensionDiscovery.localFolderPath, "/my-extension/node_modules/dep/package.json"));
 
-    setTimeout(() => {
-      expect(onAdd).not.toHaveBeenCalled();
-      done();
-    }, 10);
+    await delay(10);
+
+    expect(onAdd).not.toHaveBeenCalled();
   });
 });
-
diff --git a/src/extensions/extensions-store/extensions-store.ts b/src/extensions/extensions-store/extensions-store.ts
index c1345bfec9..2ec1c8fd55 100644
--- a/src/extensions/extensions-store/extensions-store.ts
+++ b/src/extensions/extensions-store/extensions-store.ts
@@ -17,6 +17,11 @@ export interface LensExtensionState {
   name: string;
 }
 
+export interface IsEnabledExtensionDescriptor {
+  id: string;
+  isBundled: boolean;
+}
+
 export class ExtensionsStore extends BaseStore {
   readonly displayName = "ExtensionsStore";
   constructor() {
@@ -36,7 +41,7 @@ export class ExtensionsStore extends BaseStore {
 
   protected state = observable.map();
 
-  isEnabled({ id, isBundled }: { id: string; isBundled: boolean }): boolean {
+  isEnabled({ id, isBundled }: IsEnabledExtensionDescriptor): boolean {
     // By default false, so that copied extensions are disabled by default.
     // If user installs the extension from the UI, the Extensions component will specifically enable it.
     return isBundled || Boolean(this.state.get(id)?.enabled);
diff --git a/src/extensions/lens-extension-set-dependencies.ts b/src/extensions/lens-extension-set-dependencies.ts
index 42848f7859..0f06103af2 100644
--- a/src/extensions/lens-extension-set-dependencies.ts
+++ b/src/extensions/lens-extension-set-dependencies.ts
@@ -6,7 +6,7 @@
 import type { IComputedValue } from "mobx";
 import type { CatalogCategoryRegistry } from "../common/catalog";
 import type { NavigateToRoute } from "../common/front-end-routing/navigate-to-route-injection-token";
-import type { Route } from "../common/front-end-routing/route-injection-token";
+import type { Route } from "../common/front-end-routing/front-end-route-injection-token";
 import type { CatalogEntityRegistry as MainCatalogEntityRegistry } from "../main/catalog";
 import type { CatalogEntityRegistry as RendererCatalogEntityRegistry } from "../renderer/api/catalog/entity/registry";
 import type { GetExtensionPageParameters } from "../renderer/routes/get-extension-page-parameters.injectable";
diff --git a/src/extensions/npm/extensions/package.json b/src/extensions/npm/extensions/package.json
index 0086825b22..9f145fed97 100644
--- a/src/extensions/npm/extensions/package.json
+++ b/src/extensions/npm/extensions/package.json
@@ -3,7 +3,7 @@
   "productName": "OpenLens extensions",
   "description": "OpenLens - Open Source Kubernetes IDE: extensions",
   "version": "0.0.1",
-  "copyright": "© 2021 OpenLens Authors",
+  "copyright": "© 2022 OpenLens Authors",
   "license": "MIT",
   "main": "dist/src/extensions/extension-api.js",
   "types": "dist/src/extensions/extension-api.d.ts",
diff --git a/src/jest-28-resolver.js b/src/jest-28-resolver.js
new file mode 100644
index 0000000000..46a94a5288
--- /dev/null
+++ b/src/jest-28-resolver.js
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+module.exports = (path, options) => {
+  // Call the defaultResolver, so we leverage its cache, error handling, etc.
+  return options.defaultResolver(path, {
+    ...options,
+    // Use packageFilter to process parsed `package.json` before the resolution (see https://www.npmjs.com/package/resolve#resolveid-opts-cb)
+    packageFilter: pkg => {
+      // This is a workaround for https://github.com/uuidjs/uuid/pull/616
+      //
+      // jest-environment-jsdom 28+ tries to use browser exports instead of default exports,
+      // but uuid only offers an ESM browser export and not a CommonJS one. Jest does not yet
+      // support ESM modules natively, so this causes a Jest error related to trying to parse
+      // "export" syntax.
+      //
+      // This workaround prevents Jest from considering uuid's module-based exports at all;
+      // it falls back to uuid's CommonJS+node "main" property.
+      //
+      // Once we're able to migrate our Jest config to ESM and a browser crypto
+      // implementation is available for the browser+ESM version of uuid to use (eg, via
+      // https://github.com/jsdom/jsdom/pull/3352 or a similar polyfill), this can go away.
+      if (pkg.name === "uuid") {
+        delete pkg["exports"];
+        delete pkg["module"];
+      }
+
+      return pkg;
+    },
+  });
+};
diff --git a/src/jest.setup.ts b/src/jest.setup.ts
index da68884b19..2ab9b1b52d 100644
--- a/src/jest.setup.ts
+++ b/src/jest.setup.ts
@@ -6,6 +6,7 @@
 import fetchMock from "jest-fetch-mock";
 import configurePackages from "./common/configure-packages";
 import { configure } from "mobx";
+import { setImmediate } from "timers";
 
 // setup default configuration for external npm-packages
 configurePackages();
@@ -22,6 +23,12 @@ fetchMock.enableMocks();
 // Mock __non_webpack_require__ for tests
 globalThis.__non_webpack_require__ = jest.fn();
 
+global.setImmediate = setImmediate;
+
+global.fail = ((error = "Test failed without explicit error") => {
+  console.error(error);
+}) as any;
+
 process.on("unhandledRejection", (err: any) => {
-  fail(err);
+  global.fail(err);
 });
diff --git a/src/main/__test__/kube-auth-proxy.test.ts b/src/main/__test__/kube-auth-proxy.test.ts
index 16cebb813a..9737c3925d 100644
--- a/src/main/__test__/kube-auth-proxy.test.ts
+++ b/src/main/__test__/kube-auth-proxy.test.ts
@@ -41,8 +41,8 @@ import { broadcastMessage } from "../../common/ipc";
 import type { ChildProcess } from "child_process";
 import { spawn } from "child_process";
 import { Kubectl } from "../kubectl/kubectl";
-import type { MockProxy } from "jest-mock-extended";
-import { mock } from "jest-mock-extended";
+import type { DeepMockProxy } from "jest-mock-extended";
+import { mockDeep, mock } from "jest-mock-extended";
 import { waitUntilUsed } from "tcp-port-used";
 import type { Readable } from "stream";
 import { EventEmitter } from "stream";
@@ -140,12 +140,12 @@ describe("kube auth proxy tests", () => {
   });
 
   describe("spawn tests", () => {
-    let mockedCP: MockProxy;
+    let mockedCP: DeepMockProxy;
     let listeners: EventEmitter;
     let proxy: KubeAuthProxy;
 
     beforeEach(async () => {
-      mockedCP = mock();
+      mockedCP = mockDeep();
       listeners = new EventEmitter();
       const stderr = mockedCP.stderr = mock();
       const stdout = mockedCP.stdout = mock();
diff --git a/src/main/application-update/check-for-updates-tray-item.injectable.ts b/src/main/application-update/check-for-updates-tray-item.injectable.ts
index 5ff4be731a..29f39fa9d5 100644
--- a/src/main/application-update/check-for-updates-tray-item.injectable.ts
+++ b/src/main/application-update/check-for-updates-tray-item.injectable.ts
@@ -59,7 +59,7 @@ const checkForUpdatesTrayItemInjectable = getInjectable({
 
       click: pipeline(
         async () => {
-          await processCheckingForUpdates();
+          await processCheckingForUpdates("tray");
 
           await showApplicationWindow();
         },
diff --git a/src/main/application-update/check-for-updates/process-checking-for-updates.injectable.ts b/src/main/application-update/check-for-updates/process-checking-for-updates.injectable.ts
index 2688d00d4a..a7066468da 100644
--- a/src/main/application-update/check-for-updates/process-checking-for-updates.injectable.ts
+++ b/src/main/application-update/check-for-updates/process-checking-for-updates.injectable.ts
@@ -8,11 +8,13 @@ import updatesAreBeingDiscoveredInjectable from "../../../common/application-upd
 import discoveredUpdateVersionInjectable from "../../../common/application-update/discovered-update-version/discovered-update-version.injectable";
 import { runInAction } from "mobx";
 import askBooleanInjectable from "../../ask-boolean/ask-boolean.injectable";
-import quitAndInstallUpdateInjectable from "../../electron-app/features/quit-and-install-update.injectable";
 import downloadUpdateInjectable from "../download-update/download-update.injectable";
 import broadcastChangeInUpdatingStatusInjectable from "./broadcast-change-in-updating-status.injectable";
 import checkForUpdatesStartingFromChannelInjectable from "./check-for-updates-starting-from-channel.injectable";
 import withOrphanPromiseInjectable from "../../../common/utils/with-orphan-promise/with-orphan-promise.injectable";
+import emitEventInjectable from "../../../common/app-event-bus/emit-event.injectable";
+import { getCurrentDateTime } from "../../../common/utils/date/get-current-date-time";
+import quitAndInstallUpdateInjectable from "../quit-and-install-update.injectable";
 
 const processCheckingForUpdatesInjectable = getInjectable({
   id: "process-checking-for-updates",
@@ -27,8 +29,15 @@ const processCheckingForUpdatesInjectable = getInjectable({
     const discoveredVersionState = di.inject(discoveredUpdateVersionInjectable);
     const checkForUpdatesStartingFromChannel = di.inject(checkForUpdatesStartingFromChannelInjectable);
     const withOrphanPromise = di.inject(withOrphanPromiseInjectable);
+    const emitEvent = di.inject(emitEventInjectable);
+
+    return async (source: string) => {
+      emitEvent({
+        name: "app",
+        action: "checking-for-updates",
+        params: { currentDateTime: getCurrentDateTime(), source },
+      });
 
-    return async () => {
       broadcastChangeInUpdatingStatus({ eventId: "checking-for-updates" });
 
       runInAction(() => {
@@ -50,6 +59,12 @@ const processCheckingForUpdatesInjectable = getInjectable({
 
       const { version, actualUpdateChannel } = result;
 
+      emitEvent({
+        name: "app",
+        action: "update-was-discovered",
+        params: { version, currentDateTime: getCurrentDateTime() },
+      });
+
       broadcastChangeInUpdatingStatus({
         eventId: "download-for-update-started",
         version,
diff --git a/src/main/application-update/emit-current-version-to-analytics.injectable.ts b/src/main/application-update/emit-current-version-to-analytics.injectable.ts
new file mode 100644
index 0000000000..fd190ebf72
--- /dev/null
+++ b/src/main/application-update/emit-current-version-to-analytics.injectable.ts
@@ -0,0 +1,36 @@
+/**
+ * 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 { afterApplicationIsLoadedInjectionToken } from "../start-main-application/runnable-tokens/after-application-is-loaded-injection-token";
+import emitEventInjectable from "../../common/app-event-bus/emit-event.injectable";
+import { getCurrentDateTime } from "../../common/utils/date/get-current-date-time";
+import appVersionInjectable from "../../common/get-configuration-file-model/app-version/app-version.injectable";
+
+const emitCurrentVersionToAnalyticsInjectable = getInjectable({
+  id: "emit-current-version-to-analytics",
+
+  instantiate: (di) => {
+    const emitEvent = di.inject(emitEventInjectable);
+    const appVersion = di.inject(appVersionInjectable);
+
+    return {
+      run: () => {
+        emitEvent({
+          name: "app",
+          action: "current-version",
+
+          params: {
+            version: appVersion,
+            currentDateTime: getCurrentDateTime(),
+          },
+        });
+      },
+    };
+  },
+
+  injectionToken: afterApplicationIsLoadedInjectionToken,
+});
+
+export default emitCurrentVersionToAnalyticsInjectable;
diff --git a/src/main/application-update/install-application-update-tray-item.injectable.ts b/src/main/application-update/install-application-update-tray-item.injectable.ts
index 2f938964f8..a7a63d1a1b 100644
--- a/src/main/application-update/install-application-update-tray-item.injectable.ts
+++ b/src/main/application-update/install-application-update-tray-item.injectable.ts
@@ -5,12 +5,12 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { computed } from "mobx";
 import { trayMenuItemInjectionToken } from "../tray/tray-menu-item/tray-menu-item-injection-token";
-import quitAndInstallUpdateInjectable from "../electron-app/features/quit-and-install-update.injectable";
 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";
 
 const installApplicationUpdateTrayItemInjectable = getInjectable({
   id: "install-update-tray-item",
diff --git a/src/main/application-update/periodical-check-for-updates/periodical-check-for-updates.injectable.ts b/src/main/application-update/periodical-check-for-updates/periodical-check-for-updates.injectable.ts
index 394383ee65..b6b5f7b852 100644
--- a/src/main/application-update/periodical-check-for-updates/periodical-check-for-updates.injectable.ts
+++ b/src/main/application-update/periodical-check-for-updates/periodical-check-for-updates.injectable.ts
@@ -5,22 +5,23 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { getStartableStoppable } from "../../../common/utils/get-startable-stoppable";
 import processCheckingForUpdatesInjectable from "../check-for-updates/process-checking-for-updates.injectable";
+import withOrphanPromiseInjectable from "../../../common/utils/with-orphan-promise/with-orphan-promise.injectable";
 
 const periodicalCheckForUpdatesInjectable = getInjectable({
   id: "periodical-check-for-updates",
 
   instantiate: (di) => {
-    const processCheckingForUpdates = di.inject(processCheckingForUpdatesInjectable);
+    const withOrphanPromise = di.inject(withOrphanPromiseInjectable);
+    const processCheckingForUpdates = withOrphanPromise(di.inject(processCheckingForUpdatesInjectable));
 
     return getStartableStoppable("periodical-check-for-updates", () => {
       const TWO_HOURS = 1000 * 60 * 60 * 2;
 
-      // Note: intentional orphan promise to make checking for updates happen in the background
-      processCheckingForUpdates();
+      processCheckingForUpdates("periodic");
 
       const intervalId = setInterval(() => {
-        // Note: intentional orphan promise to make checking for updates happen in the background
-        processCheckingForUpdates();
+
+        processCheckingForUpdates("periodic");
       }, TWO_HOURS);
 
       return () => {
diff --git a/src/main/application-update/quit-and-install-update.injectable.ts b/src/main/application-update/quit-and-install-update.injectable.ts
new file mode 100644
index 0000000000..0ba82feac2
--- /dev/null
+++ b/src/main/application-update/quit-and-install-update.injectable.ts
@@ -0,0 +1,45 @@
+/**
+ * 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 electronQuitAndInstallUpdateInjectable from "../electron-app/features/electron-quit-and-install-update.injectable";
+import { getCurrentDateTime } from "../../common/utils/date/get-current-date-time";
+import emitEventInjectable from "../../common/app-event-bus/emit-event.injectable";
+import discoveredUpdateVersionInjectable from "../../common/application-update/discovered-update-version/discovered-update-version.injectable";
+
+const quitAndInstallUpdateInjectable = getInjectable({
+  id: "quit-and-install-update",
+
+  instantiate: (di) => {
+    const electronQuitAndInstallUpdate = di.inject(
+      electronQuitAndInstallUpdateInjectable,
+    );
+
+    const emitEvent = di.inject(emitEventInjectable);
+    const discoveredUpdateVersion = di.inject(discoveredUpdateVersionInjectable);
+
+    return () => {
+      const discoveredVersion = discoveredUpdateVersion.value.get();
+
+      if (!discoveredVersion) {
+        throw new Error("Tried to install update but no update was discovered.");
+      }
+
+      emitEvent({
+        name: "app",
+        action: "start-installing-update",
+
+        params: {
+          version: discoveredVersion.version,
+          updateChannel: discoveredVersion.updateChannel.id,
+          currentDateTime: getCurrentDateTime(),
+        },
+      });
+
+      electronQuitAndInstallUpdate();
+    };
+  },
+});
+
+export default quitAndInstallUpdateInjectable;
diff --git a/src/main/ask-boolean/__snapshots__/ask-boolean.test.ts.snap b/src/main/ask-boolean/__snapshots__/ask-boolean.test.ts.snap
index 8176698168..fca2c12cb9 100644
--- a/src/main/ask-boolean/__snapshots__/ask-boolean.test.ts.snap
+++ b/src/main/ask-boolean/__snapshots__/ask-boolean.test.ts.snap
@@ -3,6 +3,16 @@
 exports[`ask-boolean given started when asking multiple questions renders 1`] = `
 
   
        
+    
        
+      
        
+      
        
+    
        
     
        
@@ -150,6 +160,16 @@ exports[`ask-boolean given started when asking multiple questions renders 1`] =
 exports[`ask-boolean given started when asking multiple questions when answering to first question renders 1`] = `
 
   
        
+    
        
+      
        
+      
        
+    
        
     
        
@@ -229,6 +249,16 @@ exports[`ask-boolean given started when asking multiple questions when answering
 exports[`ask-boolean given started when asking question renders 1`] = `
 
   
        
+    
        
+      
        
+      
        
+    
        
     
        
@@ -308,6 +338,16 @@ exports[`ask-boolean given started when asking question renders 1`] = `
 exports[`ask-boolean given started when asking question when user answers "no" renders 1`] = `
 
   
        
+    
        
+      
        
+      
        
+    
        
     
        
@@ -318,6 +358,16 @@ exports[`ask-boolean given started when asking question when user answers "no" r
 exports[`ask-boolean given started when asking question when user answers "yes" renders 1`] = `
 
   
        
+    
        
+      
        
+      
        
+    
        
     
        
@@ -328,6 +378,16 @@ exports[`ask-boolean given started when asking question when user answers "yes"
 exports[`ask-boolean given started when asking question when user closes notification without answering the question renders 1`] = `
 
   
        
+    
        
+      
        
+      
        
+    
        
     
        
diff --git a/src/main/create-cluster/allowed-resources.injectable.ts b/src/main/create-cluster/allowed-resources.injectable.ts
new file mode 100644
index 0000000000..d614ca3d17
--- /dev/null
+++ b/src/main/create-cluster/allowed-resources.injectable.ts
@@ -0,0 +1,16 @@
+/**
+ * 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 { allowedResourcesInjectionToken } from "../../common/cluster-store/allowed-resources-injection-token";
+
+// TODO: Figure out implementation for this later.
+const allowedResourcesInjectable = getInjectable({
+  id: "allowed-resources",
+  instantiate: () => computed(() => new Set()),
+  injectionToken: allowedResourcesInjectionToken,
+});
+
+export default allowedResourcesInjectable;
diff --git a/src/main/electron-app/features/quit-and-install-update.injectable.ts b/src/main/electron-app/features/electron-quit-and-install-update.injectable.ts
similarity index 73%
rename from src/main/electron-app/features/quit-and-install-update.injectable.ts
rename to src/main/electron-app/features/electron-quit-and-install-update.injectable.ts
index 6b313e21b0..fb7f2fb994 100644
--- a/src/main/electron-app/features/quit-and-install-update.injectable.ts
+++ b/src/main/electron-app/features/electron-quit-and-install-update.injectable.ts
@@ -5,8 +5,8 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import electronUpdaterInjectable from "./electron-updater.injectable";
 
-const quitAndInstallUpdateInjectable = getInjectable({
-  id: "quit-and-install-update",
+const electronQuitAndInstallUpdateInjectable = getInjectable({
+  id: "electron-quit-and-install-update",
 
   instantiate: (di) => {
     const electronUpdater = di.inject(electronUpdaterInjectable);
@@ -17,4 +17,4 @@ const quitAndInstallUpdateInjectable = getInjectable({
   },
 });
 
-export default quitAndInstallUpdateInjectable;
+export default electronQuitAndInstallUpdateInjectable;
diff --git a/src/main/electron-app/runnables/dock-visibility/hide-dock-for-last-closed-window.injectable.ts b/src/main/electron-app/runnables/dock-visibility/hide-dock-for-last-closed-window.injectable.ts
index de4b2b357d..315b2a5689 100644
--- a/src/main/electron-app/runnables/dock-visibility/hide-dock-for-last-closed-window.injectable.ts
+++ b/src/main/electron-app/runnables/dock-visibility/hide-dock-for-last-closed-window.injectable.ts
@@ -5,23 +5,19 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { beforeQuitOfFrontEndInjectionToken } from "../../../start-main-application/runnable-tokens/before-quit-of-front-end-injection-token";
 import electronAppInjectable from "../../electron-app.injectable";
-import { lensWindowInjectionToken } from "../../../start-main-application/lens-window/application-window/lens-window-injection-token";
-import { pipeline } from "@ogre-tools/fp";
-import { filter, isEmpty } from "lodash/fp";
+import { isEmpty } from "lodash/fp";
+import getVisibleWindowsInjectable from "../../../start-main-application/lens-window/get-visible-windows.injectable";
 
 const hideDockForLastClosedWindowInjectable = getInjectable({
   id: "hide-dock-when-there-are-no-windows",
 
   instantiate: (di) => {
     const app = di.inject(electronAppInjectable);
-    const getLensWindows = () => di.injectMany(lensWindowInjectionToken);
+    const getVisibleWindows = di.inject(getVisibleWindowsInjectable);
 
     return {
       run: () => {
-        const visibleWindows = pipeline(
-          getLensWindows(),
-          filter(window => !!window.visible),
-        );
+        const visibleWindows = getVisibleWindows();
 
         if (isEmpty(visibleWindows)) {
           app.dock?.hide();
diff --git a/src/main/getDiForUnitTesting.ts b/src/main/getDiForUnitTesting.ts
index 2cc78ec528..a022bf15ba 100644
--- a/src/main/getDiForUnitTesting.ts
+++ b/src/main/getDiForUnitTesting.ts
@@ -5,7 +5,7 @@
 
 import glob from "glob";
 import { kebabCase, memoize, noop } from "lodash/fp";
-import type { DiContainer } from "@ogre-tools/injectable";
+import type { DiContainer, Injectable } from "@ogre-tools/injectable";
 import { createContainer } from "@ogre-tools/injectable";
 import { Environments, setLegacyGlobalDiForExtensionApi } from "../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
 import appNameInjectable from "./app-paths/app-name/app-name.injectable";
@@ -64,7 +64,7 @@ import { observable } from "mobx";
 import waitForElectronToBeReadyInjectable from "./electron-app/features/wait-for-electron-to-be-ready.injectable";
 import setupListenerForCurrentClusterFrameInjectable from "./start-main-application/lens-window/current-cluster-frame/setup-listener-for-current-cluster-frame.injectable";
 import ipcMainInjectable from "./utils/channel/ipc-main/ipc-main.injectable";
-import createElectronWindowForInjectable from "./start-main-application/lens-window/application-window/create-electron-window-for.injectable";
+import createElectronWindowForInjectable from "./start-main-application/lens-window/application-window/create-electron-window.injectable";
 import setupRunnablesAfterWindowIsOpenedInjectable from "./electron-app/runnables/setup-runnables-after-window-is-opened.injectable";
 import sendToChannelInElectronBrowserWindowInjectable from "./start-main-application/lens-window/application-window/send-to-channel-in-electron-browser-window.injectable";
 import broadcastMessageInjectable from "../common/ipc/broadcast-message.injectable";
@@ -72,11 +72,11 @@ import getElectronThemeInjectable from "./electron-app/features/get-electron-the
 import syncThemeFromOperatingSystemInjectable from "./electron-app/features/sync-theme-from-operating-system.injectable";
 import platformInjectable from "../common/vars/platform.injectable";
 import productNameInjectable from "./app-paths/app-name/product-name.injectable";
-import quitAndInstallUpdateInjectable from "./electron-app/features/quit-and-install-update.injectable";
+import electronQuitAndInstallUpdateInjectable from "./electron-app/features/electron-quit-and-install-update.injectable";
 import electronUpdaterIsActiveInjectable from "./electron-app/features/electron-updater-is-active.injectable";
 import publishIsConfiguredInjectable from "./application-update/publish-is-configured.injectable";
 import checkForPlatformUpdatesInjectable from "./application-update/check-for-platform-updates/check-for-platform-updates.injectable";
-import baseBundeledBinariesDirectoryInjectable from "../common/vars/base-bundled-binaries-dir.injectable";
+import baseBundledBinariesDirectoryInjectable from "../common/vars/base-bundled-binaries-dir.injectable";
 import setUpdateOnQuitInjectable from "./electron-app/features/set-update-on-quit.injectable";
 import downloadPlatformUpdateInjectable from "./application-update/download-platform-update/download-platform-update.injectable";
 import startCatalogSyncInjectable from "./catalog-sync-to-renderer/start-catalog-sync.injectable";
@@ -84,6 +84,20 @@ import startKubeConfigSyncInjectable from "./start-main-application/runnables/ku
 import appVersionInjectable from "../common/get-configuration-file-model/app-version/app-version.injectable";
 import getRandomIdInjectable from "../common/utils/get-random-id.injectable";
 import periodicalCheckForUpdatesInjectable from "./application-update/periodical-check-for-updates/periodical-check-for-updates.injectable";
+import execFileInjectable from "../common/fs/exec-file.injectable";
+import normalizedPlatformArchitectureInjectable from "../common/vars/normalized-platform-architecture.injectable";
+import getHelmChartInjectable from "./helm/helm-service/get-helm-chart.injectable";
+import getHelmChartValuesInjectable from "./helm/helm-service/get-helm-chart-values.injectable";
+import listHelmChartsInjectable from "./helm/helm-service/list-helm-charts.injectable";
+import deleteHelmReleaseInjectable from "./helm/helm-service/delete-helm-release.injectable";
+import getHelmReleaseHistoryInjectable from "./helm/helm-service/get-helm-release-history.injectable";
+import getHelmReleaseInjectable from "./helm/helm-service/get-helm-release.injectable";
+import getHelmReleaseValuesInjectable from "./helm/helm-service/get-helm-release-values.injectable";
+import installHelmChartInjectable from "./helm/helm-service/install-helm-chart.injectable";
+import listHelmReleasesInjectable from "./helm/helm-service/list-helm-releases.injectable";
+import rollbackHelmReleaseInjectable from "./helm/helm-service/rollback-helm-release.injectable";
+import updateHelmReleaseInjectable from "./helm/helm-service/update-helm-release.injectable";
+import waitUntilBundledExtensionsAreLoadedInjectable from "./start-main-application/lens-window/application-window/wait-until-bundled-extensions-are-loaded.injectable";
 
 export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {}) {
   const {
@@ -107,6 +121,7 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {})
   di.preventSideEffects();
 
   if (doGeneralOverrides) {
+    di.override(waitUntilBundledExtensionsAreLoadedInjectable, () => async () => {});
     di.override(getRandomIdInjectable, () => () => "some-irrelevant-random-id");
     di.override(hotbarStoreInjectable, () => ({ load: () => {} }));
     di.override(userStoreInjectable, () => ({ startMainReactions: () => {}, extensionRegistryUrl: { customUrl: "some-custom-url" }}) as UserStore);
@@ -134,6 +149,24 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {})
 
     di.override(periodicalCheckForUpdatesInjectable, () => ({ start: () => {}, stop: () => {}, started: false }));
 
+    overrideFunctionalInjectables(di, [
+      getHelmChartInjectable,
+      getHelmChartValuesInjectable,
+      listHelmChartsInjectable,
+      deleteHelmReleaseInjectable,
+      getHelmReleaseHistoryInjectable,
+      getHelmReleaseInjectable,
+      getHelmReleaseValuesInjectable,
+      installHelmChartInjectable,
+      listHelmReleasesInjectable,
+      rollbackHelmReleaseInjectable,
+      updateHelmReleaseInjectable,
+      writeJsonFileInjectable,
+      readJsonFileInjectable,
+      readFileInjectable,
+      execFileInjectable,
+    ]);
+
     // TODO: Remove usages of globally exported appEventBus to get rid of this
     di.override(appEventBusInjectable, () => new EventEmitter<[AppEvent]>());
 
@@ -141,7 +174,7 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {})
     di.override(broadcastMessageInjectable, () => (channel) => {
       throw new Error(`Tried to broadcast message to channel "${channel}" over IPC without explicit override.`);
     });
-    di.override(baseBundeledBinariesDirectoryInjectable, () => "some-bin-directory");
+    di.override(baseBundledBinariesDirectoryInjectable, () => "some-bin-directory");
     di.override(spawnInjectable, () => () => {
       return {
         stderr: { on: jest.fn(), removeAllListeners: jest.fn() },
@@ -150,18 +183,6 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {})
       } as never;
     });
 
-    di.override(writeJsonFileInjectable, () => () => {
-      throw new Error("Tried to write JSON file to file system without specifying explicit override.");
-    });
-
-    di.override(readJsonFileInjectable, () => () => {
-      throw new Error("Tried to read JSON file from file system without specifying explicit override.");
-    });
-
-    di.override(readFileInjectable, () => () => {
-      throw new Error("Tried to read file from file system without specifying explicit override.");
-    });
-
     di.override(loggerInjectable, () => ({
       warn: noop,
       debug: noop,
@@ -204,6 +225,7 @@ const overrideOperatingSystem = (di: DiContainer) => {
   di.override(platformInjectable, () => "darwin");
   di.override(getAbsolutePathInjectable, () => getAbsolutePathFake);
   di.override(joinPathsInjectable, () => joinPathsFake);
+  di.override(normalizedPlatformArchitectureInjectable, () => "arm64");
 };
 
 const overrideElectronFeatures = (di: DiContainer) => {
@@ -222,13 +244,13 @@ const overrideElectronFeatures = (di: DiContainer) => {
   di.override(getCommandLineSwitchInjectable, () => () => "irrelevant");
   di.override(requestSingleInstanceLockInjectable, () => () => true);
   di.override(disableHardwareAccelerationInjectable, () => () => {});
-  di.override(shouldStartHiddenInjectable, () => true);
+  di.override(shouldStartHiddenInjectable, () => false);
   di.override(showMessagePopupInjectable, () => () => {});
   di.override(waitForElectronToBeReadyInjectable, () => () => Promise.resolve());
   di.override(ipcMainInjectable, () => ({}));
   di.override(getElectronThemeInjectable, () => () => "dark");
   di.override(syncThemeFromOperatingSystemInjectable, () => ({ start: () => {}, stop: () => {} }));
-  di.override(quitAndInstallUpdateInjectable, () => () => {});
+  di.override(electronQuitAndInstallUpdateInjectable, () => () => {});
   di.override(setUpdateOnQuitInjectable, () => () => {});
   di.override(downloadPlatformUpdateInjectable, () => async () => ({ downloadWasSuccessful: true }));
 
@@ -236,7 +258,7 @@ const overrideElectronFeatures = (di: DiContainer) => {
     throw new Error("Tried to check for platform updates without explicit override.");
   });
 
-  di.override(createElectronWindowForInjectable, () => () => async () => ({
+  di.override(createElectronWindowForInjectable, () => () => ({
     show: () => {},
 
     close: () => {},
@@ -246,6 +268,9 @@ const overrideElectronFeatures = (di: DiContainer) => {
 
       sendFake(null, arg);
     },
+
+    loadFile: async () => {},
+    loadUrl: async () => {},
   }));
 
   di.override(
@@ -257,3 +282,11 @@ const overrideElectronFeatures = (di: DiContainer) => {
   di.override(publishIsConfiguredInjectable, () => false);
   di.override(electronUpdaterIsActiveInjectable, () => false);
 };
+
+const overrideFunctionalInjectables = (di: DiContainer, injectables: Injectable[]) => {
+  injectables.forEach(injectable => {
+    di.override(injectable, () => () => {
+      throw new Error(`Tried to run "${injectable.id}" without explicit override.`);
+    });
+  });
+};
diff --git a/src/main/helm/__mocks__/helm-chart-manager.ts b/src/main/helm/__mocks__/helm-chart-manager.ts
index 858d6c24a4..62c4ce4508 100644
--- a/src/main/helm/__mocks__/helm-chart-manager.ts
+++ b/src/main/helm/__mocks__/helm-chart-manager.ts
@@ -4,7 +4,7 @@
  */
 
 import { sortCharts } from "../../../common/utils";
-import type { HelmRepo } from "../helm-repo-manager";
+import type { HelmRepo } from "../../../common/helm/helm-repo";
 
 const charts = new Map([
   ["stable", {
diff --git a/src/main/helm/__tests__/helm-service.test.ts b/src/main/helm/__tests__/helm-service.test.ts
index d9e6532e5c..fab93bf1e5 100644
--- a/src/main/helm/__tests__/helm-service.test.ts
+++ b/src/main/helm/__tests__/helm-service.test.ts
@@ -3,27 +3,48 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import { helmService } from "../helm-service";
-import { HelmRepoManager } from "../helm-repo-manager";
-
-const mockHelmRepoManager = jest.spyOn(HelmRepoManager, "getInstance").mockImplementation();
+import { getDiForUnitTesting } from "../../getDiForUnitTesting";
+import listHelmChartsInjectable from "../helm-service/list-helm-charts.injectable";
+import getActiveHelmRepositoriesInjectable from "../repositories/get-active-helm-repositories/get-active-helm-repositories.injectable";
+import type { AsyncResult } from "../../../common/utils/async-result";
+import type { HelmRepo } from "../../../common/helm/helm-repo";
 
 jest.mock("../helm-chart-manager");
 
 describe("Helm Service tests", () => {
+  let listHelmCharts: () => Promise;
+  let getActiveHelmRepositoriesMock: jest.Mock>>;
+
+  beforeEach(() => {
+    const di = getDiForUnitTesting({ doGeneralOverrides: true });
+
+    getActiveHelmRepositoriesMock = jest.fn();
+
+    di.override(getActiveHelmRepositoriesInjectable, () => getActiveHelmRepositoriesMock);
+
+    di.unoverride(listHelmChartsInjectable);
+    di.permitSideEffects(listHelmChartsInjectable);
+
+    listHelmCharts = di.inject(listHelmChartsInjectable);
+  });
+
   afterEach(() => {
     jest.resetAllMocks();
   });
 
   it("list charts with deprecated entries", async () => {
-    mockHelmRepoManager.mockReturnValue({
-      repositories: jest.fn().mockImplementation(async () => [
-        { name: "stable", url: "stableurl" },
-        { name: "experiment", url: "experimenturl" },
-      ]),
-    } as any);
+    getActiveHelmRepositoriesMock.mockReturnValue(
+      Promise.resolve({
+        callWasSuccessful: true,
 
-    const charts = await helmService.listCharts();
+        response: [
+          { name: "stable", url: "stableurl" },
+          { name: "experiment", url: "experimenturl" },
+        ],
+      }),
+    );
+
+    const charts = await listHelmCharts();
 
     expect(charts).toEqual({
       stable: {
@@ -123,15 +144,14 @@ describe("Helm Service tests", () => {
   });
 
   it("list charts sorted by version in descending order", async () => {
-    mockHelmRepoManager.mockReturnValue({
-      repositories: jest.fn().mockImplementation(async () => {
-        return [
-          { name: "bitnami", url: "bitnamiurl" },
-        ];
+    getActiveHelmRepositoriesMock.mockReturnValue(
+      Promise.resolve({
+        callWasSuccessful: true,
+        response: [{ name: "bitnami", url: "bitnamiurl" }],
       }),
-    } as any);
+    );
 
-    const charts = await helmService.listCharts();
+    const charts = await listHelmCharts();
 
     expect(charts).toEqual({
       bitnami: {
diff --git a/src/main/helm/exec-helm/exec-helm.injectable.ts b/src/main/helm/exec-helm/exec-helm.injectable.ts
new file mode 100644
index 0000000000..a97953706d
--- /dev/null
+++ b/src/main/helm/exec-helm/exec-helm.injectable.ts
@@ -0,0 +1,31 @@
+/**
+ * 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 execFileInjectable from "../../../common/fs/exec-file.injectable";
+import helmBinaryPathInjectable from "../helm-binary-path.injectable";
+import type { AsyncResult } from "../../../common/utils/async-result";
+import { getErrorMessage } from "../../../common/utils/get-error-message";
+
+const execHelmInjectable = getInjectable({
+  id: "exec-helm",
+
+  instantiate: (di) => {
+    const execFile = di.inject(execFileInjectable);
+    const helmBinaryPath = di.inject(helmBinaryPathInjectable);
+
+    return async (...args: string[]): Promise> => {
+      try {
+        const response = await execFile(helmBinaryPath, args);
+
+        return { callWasSuccessful: true, response };
+      } catch (error) {
+        return { callWasSuccessful: false, error: getErrorMessage(error) };
+      }
+    };
+  },
+});
+
+
+export default execHelmInjectable;
diff --git a/src/main/helm/get-helm-env/get-helm-env.injectable.ts b/src/main/helm/get-helm-env/get-helm-env.injectable.ts
new file mode 100644
index 0000000000..f4bf4cf739
--- /dev/null
+++ b/src/main/helm/get-helm-env/get-helm-env.injectable.ts
@@ -0,0 +1,43 @@
+/**
+ * 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 execHelmInjectable from "../exec-helm/exec-helm.injectable";
+import type { AsyncResult } from "../../../common/utils/async-result";
+
+export type HelmEnv = Record & {
+  HELM_REPOSITORY_CACHE?: string;
+  HELM_REPOSITORY_CONFIG?: string;
+};
+
+const getHelmEnvInjectable = getInjectable({
+  id: "get-helm-env",
+
+  instantiate: (di) => {
+    const execHelm = di.inject(execHelmInjectable);
+
+    return async (): Promise> => {
+      const result = await execHelm("env");
+
+      if (!result.callWasSuccessful) {
+        return { callWasSuccessful: false, error: result.error };
+      }
+
+      const lines = result.response.split(/\r?\n/); // split by new line feed
+      const env: HelmEnv = {};
+
+      lines.forEach((line: string) => {
+        const [key, value] = line.split("=");
+
+        if (key && value) {
+          env[key] = value.replace(/"/g, ""); // strip quotas
+        }
+      });
+
+      return { callWasSuccessful: true, response: env };
+    };
+  },
+});
+
+export default getHelmEnvInjectable;
diff --git a/src/main/helm/helm-binary-path.injectable.ts b/src/main/helm/helm-binary-path.injectable.ts
new file mode 100644
index 0000000000..d5983572c7
--- /dev/null
+++ b/src/main/helm/helm-binary-path.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 { getBinaryName } from "../../common/vars";
+import getAbsolutePathInjectable from "../../common/path/get-absolute-path.injectable";
+import normalizedPlatformInjectable from "../../common/vars/normalized-platform.injectable";
+import baseBundledBinariesDirectoryInjectable from "../../common/vars/base-bundled-binaries-dir.injectable";
+
+const helmBinaryPathInjectable = getInjectable({
+  id: "helm-binary-path",
+
+  instantiate: (di) => {
+    const getAbsolutePath = di.inject(getAbsolutePathInjectable);
+    const normalizedPlatform = di.inject(normalizedPlatformInjectable);
+    const baseBundledBinariesDirectory = di.inject(baseBundledBinariesDirectoryInjectable);
+
+    const helmBinaryName = getBinaryName("helm", { forPlatform: normalizedPlatform });
+
+    return getAbsolutePath(baseBundledBinariesDirectory, helmBinaryName);
+  },
+});
+
+export default helmBinaryPathInjectable;
diff --git a/src/main/helm/helm-chart-manager.ts b/src/main/helm/helm-chart-manager.ts
index 981c8602e8..8ba7a83101 100644
--- a/src/main/helm/helm-chart-manager.ts
+++ b/src/main/helm/helm-chart-manager.ts
@@ -5,13 +5,13 @@
 
 import fs from "fs";
 import * as yaml from "js-yaml";
-import type { HelmRepo } from "./helm-repo-manager";
 import logger from "../logger";
 import type { RepoHelmChartList } from "../../common/k8s-api/endpoints/helm-charts.api";
 import { iter, put, sortCharts } from "../../common/utils";
 import { execHelm } from "./exec";
 import type { SetRequired } from "type-fest";
 import { assert } from "console";
+import type { HelmRepo } from "../../common/helm/helm-repo";
 
 interface ChartCacheEntry {
   data: string; // serialized JSON
diff --git a/src/main/helm/helm-repo-manager.injectable.ts b/src/main/helm/helm-repo-manager.injectable.ts
deleted file mode 100644
index 9a12a3ca71..0000000000
--- a/src/main/helm/helm-repo-manager.injectable.ts
+++ /dev/null
@@ -1,172 +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 yaml from "js-yaml";
-import { readFile } from "fs-extra";
-import { customRequestPromise } from "../../common/request";
-import orderBy from "lodash/orderBy";
-import logger from "../logger";
-import { execHelm } from "./exec";
-import type { HelmEnv, HelmRepo, HelmRepoConfig } from "./helm-repo-manager";
-
-interface EnsuredHelmRepoManagerData {
-  helmEnv: HelmEnv;
-  didUpdateOnce: boolean;
-}
-
-export class HelmRepoManager {
-  protected helmEnv?: HelmEnv;
-  protected didUpdateOnce?: boolean;
-
-  public async loadAvailableRepos(): Promise {
-    const res = await customRequestPromise({
-      uri: "https://github.com/lensapp/artifact-hub-repositories/releases/download/latest/repositories.json",
-      json: true,
-      resolveWithFullResponse: true,
-      timeout: 10000,
-    });
-
-    return orderBy(res.body as HelmRepo[], repo => repo.name);
-  }
-
-  private async ensureInitialized(): Promise {
-    this.helmEnv ??= await this.parseHelmEnv();
-
-    const repos = await this.list(this.helmEnv);
-
-    if (repos.length === 0) {
-      await this.addRepo({
-        name: "bitnami",
-        url: "https://charts.bitnami.com/bitnami",
-      });
-    }
-
-    if (!this.didUpdateOnce) {
-      await this.update();
-      this.didUpdateOnce = true;
-    }
-
-    return {
-      didUpdateOnce: this.didUpdateOnce,
-      helmEnv: this.helmEnv,
-    };
-  }
-
-  protected async parseHelmEnv() {
-    const output = await execHelm(["env"]);
-    const lines = output.split(/\r?\n/); // split by new line feed
-    const env: Partial> = {};
-
-    lines.forEach((line: string) => {
-      const [key, value] = line.split("=");
-
-      if (key && value) {
-        env[key] = value.replace(/"/g, ""); // strip quotas
-      }
-    });
-
-    return env as HelmEnv;
-  }
-
-  public async repo(name: string): Promise {
-    const repos = await this.repositories();
-
-    return repos.find(repo => repo.name === name);
-  }
-
-  private async list(helmEnv: HelmEnv): Promise {
-    try {
-      const rawConfig = await readFile(helmEnv.HELM_REPOSITORY_CONFIG, "utf8");
-      const parsedConfig = yaml.load(rawConfig) as HelmRepoConfig;
-
-      if (typeof parsedConfig === "object" && parsedConfig) {
-        return parsedConfig.repositories;
-      }
-    } catch {
-      // ignore error
-    }
-
-    return [];
-  }
-
-  public async repositories(): Promise {
-    try {
-      const { helmEnv } = await this.ensureInitialized();
-
-      const repos = await this.list(helmEnv);
-
-      return repos.map(repo => ({
-        ...repo,
-        cacheFilePath: `${helmEnv.HELM_REPOSITORY_CACHE}/${repo.name}-index.yaml`,
-      }));
-    } catch (error) {
-      logger.error(`[HELM]: repositories listing error`, error);
-
-      return [];
-    }
-  }
-
-  public async update() {
-    return execHelm([
-      "repo",
-      "update",
-    ]);
-  }
-
-  public async addRepo({ name, url, insecureSkipTlsVerify, username, password, caFile, keyFile, certFile }: HelmRepo) {
-    logger.info(`[HELM]: adding repo ${name} from ${url}`);
-    const args = [
-      "repo",
-      "add",
-      name,
-      url,
-    ];
-
-    if (insecureSkipTlsVerify) {
-      args.push("--insecure-skip-tls-verify");
-    }
-
-    if (username) {
-      args.push("--username", username);
-    }
-
-    if (password) {
-      args.push("--password", password);
-    }
-
-    if (caFile) {
-      args.push("--ca-file", caFile);
-    }
-
-    if (keyFile) {
-      args.push("--key-file", keyFile);
-    }
-
-    if (certFile) {
-      args.push("--cert-file", certFile);
-    }
-
-    return execHelm(args);
-  }
-
-  public async removeRepo({ name, url }: HelmRepo): Promise {
-    logger.info(`[HELM]: removing repo ${name} (${url})`);
-
-    return execHelm([
-      "repo",
-      "remove",
-      name,
-    ]);
-  }
-}
-
-const helmRepoManagerInjectable = getInjectable({
-  id: "helm-repo-manager",
-
-  instantiate: () => new HelmRepoManager(),
-});
-
-export default helmRepoManagerInjectable;
diff --git a/src/main/helm/helm-repo-manager.ts b/src/main/helm/helm-repo-manager.ts
deleted file mode 100644
index 5726bafe16..0000000000
--- a/src/main/helm/helm-repo-manager.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import {
-  asLegacyGlobalSingletonForExtensionApi,
-} from "../../extensions/as-legacy-globals-for-extension-api/as-legacy-global-singleton-object-for-extension-api";
-
-import helmRepoManagerInjectable from "./helm-repo-manager.injectable";
-
-export type HelmEnv = Partial> & {
-  HELM_REPOSITORY_CACHE: string;
-  HELM_REPOSITORY_CONFIG: string;
-};
-
-export interface HelmRepoConfig {
-  repositories: HelmRepo[];
-}
-
-export interface HelmRepo {
-  name: string;
-  url: string;
-  cacheFilePath?: string;
-  caFile?: string;
-  certFile?: string;
-  insecureSkipTlsVerify?: boolean;
-  keyFile?: string;
-  username?: string;
-  password?: string;
-}
-
-export const HelmRepoManager = asLegacyGlobalSingletonForExtensionApi(helmRepoManagerInjectable);
diff --git a/src/main/helm/helm-service.ts b/src/main/helm/helm-service.ts
deleted file mode 100644
index adc9ea30a5..0000000000
--- a/src/main/helm/helm-service.ts
+++ /dev/null
@@ -1,134 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import type { Cluster } from "../../common/cluster/cluster";
-import logger from "../logger";
-import { HelmRepoManager } from "./helm-repo-manager";
-import { HelmChartManager } from "./helm-chart-manager";
-import { deleteRelease, getHistory, getRelease, getValues, installChart, listReleases, rollback, upgradeRelease } from "./helm-release-manager";
-import type { JsonObject } from "type-fest";
-import { object } from "../../common/utils";
-
-interface GetReleaseValuesArgs {
-  cluster: Cluster;
-  namespace: string;
-  all: boolean;
-}
-
-export interface InstallChartArgs {
-  chart: string;
-  values: JsonObject;
-  name: string;
-  namespace: string;
-  version: string;
-}
-
-export interface UpdateChartArgs {
-  chart: string;
-  values: JsonObject;
-  version: string;
-}
-
-class HelmService {
-  public async installChart(cluster: Cluster, data: InstallChartArgs) {
-    const proxyKubeconfig = await cluster.getProxyKubeconfigPath();
-
-    return installChart(data.chart, data.values, data.name, data.namespace, data.version, proxyKubeconfig);
-  }
-
-  public async listCharts() {
-    const repositories = await HelmRepoManager.getInstance().repositories();
-
-    return object.fromEntries(
-      await Promise.all(repositories.map(async repo => [repo.name, await HelmChartManager.forRepo(repo).charts()] as const)),
-    );
-  }
-
-  public async getChart(repoName: string, chartName: string, version = "") {
-    const repo = await HelmRepoManager.getInstance().repo(repoName);
-
-    if (!repo) {
-      return undefined;
-    }
-
-    const chartManager = HelmChartManager.forRepo(repo);
-
-    return {
-      readme: await chartManager.getReadme(chartName, version),
-      versions: await chartManager.chartVersions(chartName),
-    };
-  }
-
-  public async getChartValues(repoName: string, chartName: string, version = "") {
-    const repo = await HelmRepoManager.getInstance().repo(repoName);
-
-    if (!repo) {
-      return undefined;
-    }
-
-    return HelmChartManager.forRepo(repo).getValues(chartName, version);
-  }
-
-  public async listReleases(cluster: Cluster, namespace?: string) {
-    const proxyKubeconfig = await cluster.getProxyKubeconfigPath();
-
-    logger.debug("list releases");
-
-    return listReleases(proxyKubeconfig, namespace);
-  }
-
-  public async getRelease(cluster: Cluster, releaseName: string, namespace: string) {
-    const kubeconfigPath = await cluster.getProxyKubeconfigPath();
-    const kubectl = await cluster.ensureKubectl();
-    const kubectlPath = await kubectl.getPath();
-
-    logger.debug("Fetch release");
-
-    return getRelease(releaseName, namespace, kubeconfigPath, kubectlPath);
-  }
-
-  public async getReleaseValues(releaseName: string, { cluster, namespace, all }: GetReleaseValuesArgs) {
-    const pathToKubeconfig = await cluster.getProxyKubeconfigPath();
-
-    logger.debug("Fetch release values");
-
-    return getValues(releaseName, { namespace, all, kubeconfigPath: pathToKubeconfig });
-  }
-
-  public async getReleaseHistory(cluster: Cluster, releaseName: string, namespace: string) {
-    const proxyKubeconfig = await cluster.getProxyKubeconfigPath();
-
-    logger.debug("Fetch release history");
-
-    return getHistory(releaseName, namespace, proxyKubeconfig);
-  }
-
-  public async deleteRelease(cluster: Cluster, releaseName: string, namespace: string) {
-    const proxyKubeconfig = await cluster.getProxyKubeconfigPath();
-
-    logger.debug("Delete release");
-
-    return deleteRelease(releaseName, namespace, proxyKubeconfig);
-  }
-
-  public async updateRelease(cluster: Cluster, releaseName: string, namespace: string, data: UpdateChartArgs) {
-    const proxyKubeconfig = await cluster.getProxyKubeconfigPath();
-    const kubectl = await cluster.ensureKubectl();
-    const kubectlPath = await kubectl.getPath();
-
-    logger.debug("Upgrade release");
-
-    return upgradeRelease(releaseName, data.chart, data.values, namespace, data.version, proxyKubeconfig, kubectlPath);
-  }
-
-  public async rollback(cluster: Cluster, releaseName: string, namespace: string, revision: number) {
-    const proxyKubeconfig = await cluster.getProxyKubeconfigPath();
-
-    logger.debug("Rollback release");
-    await rollback(releaseName, namespace, revision, proxyKubeconfig);
-  }
-}
-
-export const helmService = new HelmService();
diff --git a/src/main/helm/helm-service/delete-helm-release.injectable.ts b/src/main/helm/helm-service/delete-helm-release.injectable.ts
new file mode 100644
index 0000000000..d03cd480dc
--- /dev/null
+++ b/src/main/helm/helm-service/delete-helm-release.injectable.ts
@@ -0,0 +1,28 @@
+/**
+ * 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 { Cluster } from "../../../common/cluster/cluster";
+import { deleteRelease } from "../helm-release-manager";
+import loggerInjectable from "../../../common/logger.injectable";
+
+const deleteHelmReleaseInjectable = getInjectable({
+  id: "delete-helm-release",
+
+  instantiate: (di) => {
+    const logger = di.inject(loggerInjectable);
+
+    return async (cluster: Cluster, releaseName: string, namespace: string) => {
+      const proxyKubeconfig = await cluster.getProxyKubeconfigPath();
+
+      logger.debug("Delete release");
+
+      return deleteRelease(releaseName, namespace, proxyKubeconfig);
+    };
+  },
+
+  causesSideEffects: true,
+});
+
+export default deleteHelmReleaseInjectable;
diff --git a/src/main/helm/helm-service/get-helm-chart-values.injectable.ts b/src/main/helm/helm-service/get-helm-chart-values.injectable.ts
new file mode 100644
index 0000000000..2394a591f0
--- /dev/null
+++ b/src/main/helm/helm-service/get-helm-chart-values.injectable.ts
@@ -0,0 +1,29 @@
+/**
+ * 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 { HelmChartManager } from "../helm-chart-manager";
+import getActiveHelmRepositoryInjectable from "../repositories/get-active-helm-repository.injectable";
+
+const getHelmChartValuesInjectable = getInjectable({
+  id: "get-helm-chart-values",
+
+  instantiate: (di) => {
+    const getActiveHelmRepository = di.inject(getActiveHelmRepositoryInjectable);
+
+    return async (repoName: string, chartName: string, version = "") => {
+      const repo = await getActiveHelmRepository(repoName);
+
+      if (!repo) {
+        return undefined;
+      }
+
+      return HelmChartManager.forRepo(repo).getValues(chartName, version);
+    };
+  },
+
+  causesSideEffects: true,
+});
+
+export default getHelmChartValuesInjectable;
diff --git a/src/main/helm/helm-service/get-helm-chart.injectable.ts b/src/main/helm/helm-service/get-helm-chart.injectable.ts
new file mode 100644
index 0000000000..1a5a43da36
--- /dev/null
+++ b/src/main/helm/helm-service/get-helm-chart.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 { HelmChartManager } from "../helm-chart-manager";
+import getActiveHelmRepositoryInjectable from "../repositories/get-active-helm-repository.injectable";
+
+const getHelmChartInjectable = getInjectable({
+  id: "get-helm-chart",
+
+  instantiate: (di) => {
+    const getActiveHelmRepository = di.inject(getActiveHelmRepositoryInjectable);
+
+    return async (repoName: string, chartName: string, version = "") => {
+      const repo = await getActiveHelmRepository(repoName);
+
+      if (!repo) {
+        return undefined;
+      }
+
+      const chartManager = HelmChartManager.forRepo(repo);
+
+      return {
+        readme: await chartManager.getReadme(chartName, version),
+        versions: await chartManager.chartVersions(chartName),
+      };
+    };
+  },
+
+  causesSideEffects: true,
+});
+
+export default getHelmChartInjectable;
diff --git a/src/main/helm/helm-service/get-helm-release-history.injectable.ts b/src/main/helm/helm-service/get-helm-release-history.injectable.ts
new file mode 100644
index 0000000000..a642c2e265
--- /dev/null
+++ b/src/main/helm/helm-service/get-helm-release-history.injectable.ts
@@ -0,0 +1,28 @@
+/**
+ * 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 { Cluster } from "../../../common/cluster/cluster";
+import { getHistory } from "../helm-release-manager";
+import loggerInjectable from "../../../common/logger.injectable";
+
+const getHelmReleaseHistoryInjectable = getInjectable({
+  id: "get-helm-release-history",
+
+  instantiate: (di) => {
+    const logger = di.inject(loggerInjectable);
+
+    return async (cluster: Cluster, releaseName: string, namespace: string) => {
+      const proxyKubeconfig = await cluster.getProxyKubeconfigPath();
+
+      logger.debug("Fetch release history");
+
+      return getHistory(releaseName, namespace, proxyKubeconfig);
+    };
+  },
+
+  causesSideEffects: true,
+});
+
+export default getHelmReleaseHistoryInjectable;
diff --git a/src/main/helm/helm-service/get-helm-release-values.injectable.ts b/src/main/helm/helm-service/get-helm-release-values.injectable.ts
new file mode 100644
index 0000000000..5bca2d5723
--- /dev/null
+++ b/src/main/helm/helm-service/get-helm-release-values.injectable.ts
@@ -0,0 +1,41 @@
+/**
+ * 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 { getValues } from "../helm-release-manager";
+import loggerInjectable from "../../../common/logger.injectable";
+import type { Cluster } from "../../../common/cluster/cluster";
+
+interface GetReleaseValuesArgs {
+  cluster: Cluster;
+  namespace: string;
+  all: boolean;
+}
+
+const getHelmReleaseValuesInjectable = getInjectable({
+  id: "get-helm-release-values",
+
+  instantiate: (di) => {
+    const logger = di.inject(loggerInjectable);
+
+    return async (
+      releaseName: string,
+      { cluster, namespace, all }: GetReleaseValuesArgs,
+    ) => {
+      const pathToKubeconfig = await cluster.getProxyKubeconfigPath();
+
+      logger.debug("Fetch release values");
+
+      return getValues(releaseName, {
+        namespace,
+        all,
+        kubeconfigPath: pathToKubeconfig,
+      });
+    };
+  },
+
+  causesSideEffects: true,
+});
+
+export default getHelmReleaseValuesInjectable;
diff --git a/src/main/helm/helm-service/get-helm-release.injectable.ts b/src/main/helm/helm-service/get-helm-release.injectable.ts
new file mode 100644
index 0000000000..130d94af52
--- /dev/null
+++ b/src/main/helm/helm-service/get-helm-release.injectable.ts
@@ -0,0 +1,30 @@
+/**
+ * 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 { Cluster } from "../../../common/cluster/cluster";
+import { getRelease } from "../helm-release-manager";
+import loggerInjectable from "../../../common/logger.injectable";
+
+const getHelmReleaseInjectable = getInjectable({
+  id: "get-helm-release",
+
+  instantiate: (di) => {
+    const logger = di.inject(loggerInjectable);
+
+    return async (cluster: Cluster, releaseName: string, namespace: string) => {
+      const kubeconfigPath = await cluster.getProxyKubeconfigPath();
+      const kubectl = await cluster.ensureKubectl();
+      const kubectlPath = await kubectl.getPath();
+
+      logger.debug("Fetch release");
+
+      return getRelease(releaseName, namespace, kubeconfigPath, kubectlPath);
+    };
+  },
+
+  causesSideEffects: true,
+});
+
+export default getHelmReleaseInjectable;
diff --git a/src/main/helm/helm-service/install-helm-chart.injectable.ts b/src/main/helm/helm-service/install-helm-chart.injectable.ts
new file mode 100644
index 0000000000..9ddb4fa599
--- /dev/null
+++ b/src/main/helm/helm-service/install-helm-chart.injectable.ts
@@ -0,0 +1,30 @@
+/**
+ * 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 { JsonObject } from "type-fest";
+import type { Cluster } from "../../../common/cluster/cluster";
+import { installChart } from "../helm-release-manager";
+
+export interface InstallChartArgs {
+  chart: string;
+  values: JsonObject;
+  name: string;
+  namespace: string;
+  version: string;
+}
+
+const installHelmChartInjectable = getInjectable({
+  id: "install-helm-chart",
+
+  instantiate: () => async (cluster: Cluster, data: InstallChartArgs) => {
+    const proxyKubeconfig = await cluster.getProxyKubeconfigPath();
+
+    return installChart(data.chart, data.values, data.name, data.namespace, data.version, proxyKubeconfig);
+  },
+
+  causesSideEffects: true,
+});
+
+export default installHelmChartInjectable;
diff --git a/src/main/helm/helm-service/list-helm-charts.injectable.ts b/src/main/helm/helm-service/list-helm-charts.injectable.ts
new file mode 100644
index 0000000000..b537021f0f
--- /dev/null
+++ b/src/main/helm/helm-service/list-helm-charts.injectable.ts
@@ -0,0 +1,41 @@
+/**
+ * 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 assert from "assert";
+import { object } from "../../../common/utils";
+import { HelmChartManager } from "../helm-chart-manager";
+import getActiveHelmRepositoriesInjectable from "../repositories/get-active-helm-repositories/get-active-helm-repositories.injectable";
+
+const listHelmChartsInjectable = getInjectable({
+  id: "list-helm-charts",
+
+  instantiate: (di) => {
+    const getActiveHelmRepositories = di.inject(getActiveHelmRepositoriesInjectable);
+
+    return async () => {
+      const result = await getActiveHelmRepositories();
+
+      assert(result.callWasSuccessful);
+
+      const repositories = result.response;
+
+      return object.fromEntries(
+        await Promise.all(
+          repositories.map(
+            async (repo) =>
+              [
+                repo.name,
+                await HelmChartManager.forRepo(repo).charts(),
+              ] as const,
+          ),
+        ),
+      );
+    };
+  },
+
+  causesSideEffects: true,
+});
+
+export default listHelmChartsInjectable;
diff --git a/src/main/helm/helm-service/list-helm-releases.injectable.ts b/src/main/helm/helm-service/list-helm-releases.injectable.ts
new file mode 100644
index 0000000000..f6250f768d
--- /dev/null
+++ b/src/main/helm/helm-service/list-helm-releases.injectable.ts
@@ -0,0 +1,28 @@
+/**
+ * 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 { Cluster } from "../../../common/cluster/cluster";
+import loggerInjectable from "../../../common/logger.injectable";
+import { listReleases } from "../helm-release-manager";
+
+const listHelmReleasesInjectable = getInjectable({
+  id: "list-helm-releases",
+
+  instantiate: (di) => {
+    const logger = di.inject(loggerInjectable);
+
+    return async (cluster: Cluster, namespace?: string) => {
+      const proxyKubeconfig = await cluster.getProxyKubeconfigPath();
+
+      logger.debug("list releases");
+
+      return listReleases(proxyKubeconfig, namespace);
+    };
+  },
+
+  causesSideEffects: true,
+});
+
+export default listHelmReleasesInjectable;
diff --git a/src/main/helm/helm-service/rollback-helm-release.injectable.ts b/src/main/helm/helm-service/rollback-helm-release.injectable.ts
new file mode 100644
index 0000000000..62ee05463d
--- /dev/null
+++ b/src/main/helm/helm-service/rollback-helm-release.injectable.ts
@@ -0,0 +1,32 @@
+/**
+ * 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 { Cluster } from "../../../common/cluster/cluster";
+import loggerInjectable from "../../../common/logger.injectable";
+import { rollback } from "../helm-release-manager";
+
+const rollbackHelmReleaseInjectable = getInjectable({
+  id: "rollback-helm-release",
+
+  instantiate: (di) => {
+    const logger = di.inject(loggerInjectable);
+
+    return async (
+      cluster: Cluster,
+      releaseName: string,
+      namespace: string,
+      revision: number,
+    ) => {
+      const proxyKubeconfig = await cluster.getProxyKubeconfigPath();
+
+      logger.debug("Rollback release");
+      await rollback(releaseName, namespace, revision, proxyKubeconfig);
+    };
+  },
+
+  causesSideEffects: true,
+});
+
+export default rollbackHelmReleaseInjectable;
diff --git a/src/main/helm/helm-service/update-helm-release.injectable.ts b/src/main/helm/helm-service/update-helm-release.injectable.ts
new file mode 100644
index 0000000000..96e0e0050b
--- /dev/null
+++ b/src/main/helm/helm-service/update-helm-release.injectable.ts
@@ -0,0 +1,45 @@
+/**
+ * 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 { Cluster } from "../../../common/cluster/cluster";
+import { upgradeRelease } from "../helm-release-manager";
+import loggerInjectable from "../../../common/logger.injectable";
+import type { JsonObject } from "type-fest";
+
+export interface UpdateChartArgs {
+  chart: string;
+  values: JsonObject;
+  version: string;
+}
+
+const updateHelmReleaseInjectable = getInjectable({
+  id: "update-helm-release",
+
+  instantiate: (di) => {
+    const logger = di.inject(loggerInjectable);
+
+    return async (cluster: Cluster, releaseName: string, namespace: string, data: UpdateChartArgs) => {
+      const proxyKubeconfig = await cluster.getProxyKubeconfigPath();
+      const kubectl = await cluster.ensureKubectl();
+      const kubectlPath = await kubectl.getPath();
+
+      logger.debug("Upgrade release");
+
+      return upgradeRelease(
+        releaseName,
+        data.chart,
+        data.values,
+        namespace,
+        data.version,
+        proxyKubeconfig,
+        kubectlPath,
+      );
+    };
+  },
+
+  causesSideEffects: true,
+});
+
+export default updateHelmReleaseInjectable;
diff --git a/src/main/helm/repositories/add-helm-repository/add-helm-repository-channel-listener.injectable.ts b/src/main/helm/repositories/add-helm-repository/add-helm-repository-channel-listener.injectable.ts
new file mode 100644
index 0000000000..f4effd1a62
--- /dev/null
+++ b/src/main/helm/repositories/add-helm-repository/add-helm-repository-channel-listener.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 addHelmRepositoryChannelInjectable from "../../../../common/helm/add-helm-repository-channel.injectable";
+import addHelmRepositoryInjectable from "./add-helm-repository.injectable";
+import { requestChannelListenerInjectionToken } from "../../../../common/utils/channel/request-channel-listener-injection-token";
+
+const addHelmRepositoryChannelListenerInjectable = getInjectable({
+  id: "add-helm-repository-channel-listener",
+
+  instantiate: (di) => {
+    const addHelmRepository = di.inject(addHelmRepositoryInjectable);
+    const channel = di.inject(addHelmRepositoryChannelInjectable);
+
+    return {
+      channel,
+      handler: addHelmRepository,
+    };
+  },
+
+  injectionToken: requestChannelListenerInjectionToken,
+});
+
+export default addHelmRepositoryChannelListenerInjectable;
diff --git a/src/main/helm/repositories/add-helm-repository/add-helm-repository.injectable.ts b/src/main/helm/repositories/add-helm-repository/add-helm-repository.injectable.ts
new file mode 100644
index 0000000000..aa898eb099
--- /dev/null
+++ b/src/main/helm/repositories/add-helm-repository/add-helm-repository.injectable.ts
@@ -0,0 +1,62 @@
+/**
+ * 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 execHelmInjectable from "../../exec-helm/exec-helm.injectable";
+import type { HelmRepo } from "../../../../common/helm/helm-repo";
+import loggerInjectable from "../../../../common/logger.injectable";
+
+const addHelmRepositoryInjectable = getInjectable({
+  id: "add-helm-repository",
+
+  instantiate: (di) => {
+    const execHelm = di.inject(execHelmInjectable);
+    const logger = di.inject(loggerInjectable);
+
+    return async (repo: HelmRepo) => {
+      const {
+        name,
+        url,
+        insecureSkipTlsVerify,
+        username,
+        password,
+        caFile,
+        keyFile,
+        certFile,
+      } = repo;
+
+      logger.info(`[HELM]: adding repo ${name} from ${url}`);
+
+      const args = ["repo", "add", name, url];
+
+      if (insecureSkipTlsVerify) {
+        args.push("--insecure-skip-tls-verify");
+      }
+
+      if (username) {
+        args.push("--username", username);
+      }
+
+      if (password) {
+        args.push("--password", password);
+      }
+
+      if (caFile) {
+        args.push("--ca-file", caFile);
+      }
+
+      if (keyFile) {
+        args.push("--key-file", keyFile);
+      }
+
+      if (certFile) {
+        args.push("--cert-file", certFile);
+      }
+
+      return await execHelm(...args);
+    };
+  },
+});
+
+export default addHelmRepositoryInjectable;
diff --git a/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories-channel-listener.injectable.ts b/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories-channel-listener.injectable.ts
new file mode 100644
index 0000000000..e48ec7665e
--- /dev/null
+++ b/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories-channel-listener.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 { requestChannelListenerInjectionToken } from "../../../../common/utils/channel/request-channel-listener-injection-token";
+import getActiveHelmRepositoriesChannelInjectable from "../../../../common/helm/get-active-helm-repositories-channel.injectable";
+import getActiveHelmRepositoriesInjectable from "./get-active-helm-repositories.injectable";
+
+const getActiveHelmRepositoriesChannelListenerInjectable = getInjectable({
+  id: "get-active-helm-repositories-channel-listener",
+
+  instantiate: (di) => {
+    const getActiveHelmRepositories = di.inject(getActiveHelmRepositoriesInjectable);
+
+    return {
+      channel: di.inject(getActiveHelmRepositoriesChannelInjectable),
+
+      handler: getActiveHelmRepositories,
+    };
+  },
+
+  injectionToken: requestChannelListenerInjectionToken,
+});
+
+export default getActiveHelmRepositoriesChannelListenerInjectable;
diff --git a/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable.ts b/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable.ts
new file mode 100644
index 0000000000..d1b0c64311
--- /dev/null
+++ b/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable.ts
@@ -0,0 +1,131 @@
+/**
+ * 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 { HelmRepo } from "../../../../common/helm/helm-repo";
+import type { ReadYamlFile } from "../../../../common/fs/read-yaml-file.injectable";
+import readYamlFileInjectable from "../../../../common/fs/read-yaml-file.injectable";
+import getHelmEnvInjectable from "../../get-helm-env/get-helm-env.injectable";
+import execHelmInjectable from "../../exec-helm/exec-helm.injectable";
+import loggerInjectable from "../../../../common/logger.injectable";
+import type { AsyncResult } from "../../../../common/utils/async-result";
+
+interface HelmRepositoryFromYaml {
+  name: string;
+  url: string;
+  caFile: string;
+  certFile: string;
+  insecure_skip_tls_verify: boolean;
+  keyFile: string;
+  pass_credentials_all: boolean;
+  password: string;
+  username: string;
+}
+
+export interface HelmRepositoriesFromYaml {
+  repositories: HelmRepositoryFromYaml[];
+}
+
+const getActiveHelmRepositoriesInjectable = getInjectable({
+  id: "get-helm-repositories",
+
+  instantiate: (di) => {
+    const readYamlFile = di.inject(readYamlFileInjectable);
+    const execHelm = di.inject(execHelmInjectable);
+    const getHelmEnv = di.inject(getHelmEnvInjectable);
+    const logger = di.inject(loggerInjectable);
+
+    const getRepositories = getRepositoriesFor(readYamlFile);
+
+    return async (): Promise> => {
+      const envResult = await getHelmEnv();
+
+      if (!envResult.callWasSuccessful) {
+        return {
+          callWasSuccessful: false,
+          error: `Error getting Helm configuration: ${envResult.error}`,
+        };
+      }
+
+      const {
+        HELM_REPOSITORY_CONFIG: repositoryConfigFilePath,
+        HELM_REPOSITORY_CACHE: helmRepositoryCacheDirPath,
+      } = envResult.response;
+
+      if (!repositoryConfigFilePath) {
+        const errorMessage = "Tried to get Helm repositories, but HELM_REPOSITORY_CONFIG was not present in `$ helm env`.";
+
+        logger.error(errorMessage);
+
+        return {
+          callWasSuccessful: false,
+          error: `Error getting Helm configuration: ${errorMessage}`,
+        };
+      }
+
+      if (!helmRepositoryCacheDirPath) {
+        const errorMessage = "Tried to get Helm repositories, but HELM_REPOSITORY_CACHE was not present in `$ helm env`.";
+
+        logger.error(errorMessage);
+
+        return {
+          callWasSuccessful: false,
+          error: `Error getting Helm configuration: ${errorMessage}`,
+        };
+      }
+
+      const updateResult = await execHelm("repo", "update");
+
+      if (!updateResult.callWasSuccessful) {
+        if (!updateResult.error.includes(internalHelmErrorForNoRepositoriesFound)) {
+          return {
+            callWasSuccessful: false,
+            error: `Error updating Helm repositories: ${updateResult.error}`,
+          };
+        }
+        const resultOfAddingDefaultRepository = await execHelm("repo", "add", "bitnami", "https://charts.bitnami.com/bitnami");
+
+        if (!resultOfAddingDefaultRepository.callWasSuccessful) {
+          return {
+            callWasSuccessful: false,
+            error: `Error when adding default Helm repository: ${resultOfAddingDefaultRepository.error}`,
+          };
+        }
+      }
+
+      return {
+        callWasSuccessful: true,
+
+        response: await getRepositories(
+          repositoryConfigFilePath,
+          helmRepositoryCacheDirPath,
+        ),
+      };
+    };
+  },
+});
+
+export default getActiveHelmRepositoriesInjectable;
+
+const getRepositoriesFor =
+  (readYamlFile: ReadYamlFile) =>
+    async (repositoryConfigFilePath: string, helmRepositoryCacheDirPath: string): Promise => {
+      const { repositories } = (await readYamlFile(
+        repositoryConfigFilePath,
+      )) as HelmRepositoriesFromYaml;
+
+      return repositories.map((repository) => ({
+        name: repository.name,
+        url: repository.url,
+        caFile: repository.caFile,
+        certFile: repository.certFile,
+        insecureSkipTlsVerify: repository.insecure_skip_tls_verify,
+        keyFile: repository.keyFile,
+        username: repository.username,
+        password: repository.password,
+        cacheFilePath: `${helmRepositoryCacheDirPath}/${repository.name}-index.yaml`,
+      }));
+    };
+
+const internalHelmErrorForNoRepositoriesFound = "no repositories found. You must add one before updating";
diff --git a/src/main/helm/repositories/get-active-helm-repository.injectable.ts b/src/main/helm/repositories/get-active-helm-repository.injectable.ts
new file mode 100644
index 0000000000..548e04b2ec
--- /dev/null
+++ b/src/main/helm/repositories/get-active-helm-repository.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 assert from "assert";
+import getActiveHelmRepositoriesInjectable from "./get-active-helm-repositories/get-active-helm-repositories.injectable";
+
+const getActiveHelmRepositoryInjectable = getInjectable({
+  id: "get-active-helm-repository",
+
+  instantiate: (di) => {
+    const getActiveHelmRepositories = di.inject(getActiveHelmRepositoriesInjectable);
+
+    return async (name: string) => {
+      const activeHelmRepositories = await getActiveHelmRepositories();
+
+      assert(activeHelmRepositories.callWasSuccessful);
+
+      return activeHelmRepositories.response.find(
+        (repository) => repository.name === name,
+      );
+    };
+  },
+});
+
+export default getActiveHelmRepositoryInjectable;
diff --git a/src/main/helm/repositories/remove-helm-repository/remove-helm-repository-channel-listener.injectable.ts b/src/main/helm/repositories/remove-helm-repository/remove-helm-repository-channel-listener.injectable.ts
new file mode 100644
index 0000000000..b9b2f11777
--- /dev/null
+++ b/src/main/helm/repositories/remove-helm-repository/remove-helm-repository-channel-listener.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 { requestChannelListenerInjectionToken } from "../../../../common/utils/channel/request-channel-listener-injection-token";
+import removeHelmRepositoryInjectable from "./remove-helm-repository.injectable";
+import removeHelmRepositoryChannelInjectable from "../../../../common/helm/remove-helm-repository-channel.injectable";
+
+const removeHelmRepositoryChannelListenerInjectable = getInjectable({
+  id: "remove-helm-repository-channel-listener",
+
+  instantiate: (di) => {
+    const removeHelmRepository = di.inject(removeHelmRepositoryInjectable);
+    const channel = di.inject(removeHelmRepositoryChannelInjectable);
+
+    return {
+      channel,
+      handler: removeHelmRepository,
+    };
+  },
+
+  injectionToken: requestChannelListenerInjectionToken,
+});
+
+export default removeHelmRepositoryChannelListenerInjectable;
diff --git a/src/main/helm/repositories/remove-helm-repository/remove-helm-repository.injectable.ts b/src/main/helm/repositories/remove-helm-repository/remove-helm-repository.injectable.ts
new file mode 100644
index 0000000000..21f37490bc
--- /dev/null
+++ b/src/main/helm/repositories/remove-helm-repository/remove-helm-repository.injectable.ts
@@ -0,0 +1,29 @@
+/**
+ * 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 execHelmInjectable from "../../exec-helm/exec-helm.injectable";
+import type { HelmRepo } from "../../../../common/helm/helm-repo";
+import loggerInjectable from "../../../../common/logger.injectable";
+
+const removeHelmRepositoryInjectable = getInjectable({
+  id: "remove-helm-repository",
+
+  instantiate: (di) => {
+    const execHelm = di.inject(execHelmInjectable);
+    const logger = di.inject(loggerInjectable);
+
+    return async (repo: HelmRepo) => {
+      logger.info(`[HELM]: removing repo ${repo.name} (${repo.url})`);
+
+      return execHelm(
+        "repo",
+        "remove",
+        repo.name,
+      );
+    };
+  },
+});
+
+export default removeHelmRepositoryInjectable;
diff --git a/src/main/index.ts b/src/main/index.ts
index 3752c5a8c2..dcb8c60f8b 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -15,9 +15,7 @@ const di = getDi();
 
 const startApplication = di.inject(startMainApplicationInjectable);
 
-(async () => {
-  await startApplication();
-})();
+void startApplication();
 
 /**
  * Exports for virtual package "@k8slens/extensions" for main-process.
diff --git a/src/main/kube-auth-proxy/create-kube-auth-proxy.injectable.ts b/src/main/kube-auth-proxy/create-kube-auth-proxy.injectable.ts
index 07bb87bd63..8546adb4fb 100644
--- a/src/main/kube-auth-proxy/create-kube-auth-proxy.injectable.ts
+++ b/src/main/kube-auth-proxy/create-kube-auth-proxy.injectable.ts
@@ -12,7 +12,7 @@ import { getBinaryName } from "../../common/vars";
 import spawnInjectable from "../child-process/spawn.injectable";
 import { getKubeAuthProxyCertificate } from "./get-kube-auth-proxy-certificate";
 import loggerInjectable from "../../common/logger.injectable";
-import baseBundeledBinariesDirectoryInjectable from "../../common/vars/base-bundled-binaries-dir.injectable";
+import baseBundledBinariesDirectoryInjectable from "../../common/vars/base-bundled-binaries-dir.injectable";
 
 export type CreateKubeAuthProxy = (cluster: Cluster, environmentVariables: NodeJS.ProcessEnv) => KubeAuthProxy;
 
@@ -25,7 +25,7 @@ const createKubeAuthProxyInjectable = getInjectable({
     return (cluster: Cluster, environmentVariables: NodeJS.ProcessEnv) => {
       const clusterUrl = new URL(cluster.apiUrl);
       const dependencies: KubeAuthProxyDependencies = {
-        proxyBinPath: path.join(di.inject(baseBundeledBinariesDirectoryInjectable), binaryName),
+        proxyBinPath: path.join(di.inject(baseBundledBinariesDirectoryInjectable), binaryName),
         proxyCert: getKubeAuthProxyCertificate(clusterUrl.hostname, selfsigned.generate),
         spawn: di.inject(spawnInjectable),
         logger: di.inject(loggerInjectable),
diff --git a/src/main/kubectl/bundled-binary-path.injectable.ts b/src/main/kubectl/bundled-binary-path.injectable.ts
index 99cb7f2e7e..df5ee63c04 100644
--- a/src/main/kubectl/bundled-binary-path.injectable.ts
+++ b/src/main/kubectl/bundled-binary-path.injectable.ts
@@ -4,13 +4,13 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import path from "path";
-import baseBundeledBinariesDirectoryInjectable from "../../common/vars/base-bundled-binaries-dir.injectable";
+import baseBundledBinariesDirectoryInjectable from "../../common/vars/base-bundled-binaries-dir.injectable";
 import kubectlBinaryNameInjectable from "./binary-name.injectable";
 
 const bundledKubectlBinaryPathInjectable = getInjectable({
   id: "bundled-kubectl-binary-path",
   instantiate: (di) => path.join(
-    di.inject(baseBundeledBinariesDirectoryInjectable),
+    di.inject(baseBundledBinariesDirectoryInjectable),
     di.inject(kubectlBinaryNameInjectable),
   ),
 });
diff --git a/src/main/kubectl/create-kubectl.injectable.ts b/src/main/kubectl/create-kubectl.injectable.ts
index d670e8e665..1e13b7d02c 100644
--- a/src/main/kubectl/create-kubectl.injectable.ts
+++ b/src/main/kubectl/create-kubectl.injectable.ts
@@ -11,7 +11,7 @@ import kubectlDownloadingNormalizedArchInjectable from "./normalized-arch.inject
 import normalizedPlatformInjectable from "../../common/vars/normalized-platform.injectable";
 import kubectlBinaryNameInjectable from "./binary-name.injectable";
 import bundledKubectlBinaryPathInjectable from "./bundled-binary-path.injectable";
-import baseBundeledBinariesDirectoryInjectable from "../../common/vars/base-bundled-binaries-dir.injectable";
+import baseBundledBinariesDirectoryInjectable from "../../common/vars/base-bundled-binaries-dir.injectable";
 
 const createKubectlInjectable = getInjectable({
   id: "create-kubectl",
@@ -24,7 +24,7 @@ const createKubectlInjectable = getInjectable({
       normalizedDownloadPlatform: di.inject(normalizedPlatformInjectable),
       kubectlBinaryName: di.inject(kubectlBinaryNameInjectable),
       bundledKubectlBinaryPath: di.inject(bundledKubectlBinaryPathInjectable),
-      baseBundeledBinariesDirectory: di.inject(baseBundeledBinariesDirectoryInjectable),
+      baseBundeledBinariesDirectory: di.inject(baseBundledBinariesDirectoryInjectable),
     };
 
     return (clusterVersion: string) => new Kubectl(dependencies, clusterVersion);
diff --git a/src/main/menu/application-menu-items.injectable.ts b/src/main/menu/application-menu-items.injectable.ts
index 4ea447f675..f223c539c6 100644
--- a/src/main/menu/application-menu-items.injectable.ts
+++ b/src/main/menu/application-menu-items.injectable.ts
@@ -71,9 +71,10 @@ const applicationMenuItemsInjectable = getInjectable({
           },
           ...ignoreIf(!updatingIsEnabled, [
             {
+              id: "check-for-updates",
               label: "Check for updates",
               click() {
-                processCheckingForUpdates().then(() => showApplicationWindow());
+                processCheckingForUpdates("application-menu").then(() => showApplicationWindow());
               },
             },
           ]),
@@ -285,7 +286,7 @@ const applicationMenuItemsInjectable = getInjectable({
               {
                 label: "Check for updates",
                 click() {
-                  processCheckingForUpdates().then(() =>
+                  processCheckingForUpdates("periodic").then(() =>
                     showApplicationWindow(),
                   );
                 },
diff --git a/src/main/protocol-handler/__test__/router.test.ts b/src/main/protocol-handler/__test__/router.test.ts
index 1fd6797038..868aaee7dc 100644
--- a/src/main/protocol-handler/__test__/router.test.ts
+++ b/src/main/protocol-handler/__test__/router.test.ts
@@ -6,11 +6,10 @@
 import * as uuid from "uuid";
 
 import { broadcastMessage } from "../../../common/ipc";
-import { ProtocolHandlerExtension, ProtocolHandlerInternal } from "../../../common/protocol-handler";
+import { ProtocolHandlerExtension, ProtocolHandlerInternal, ProtocolHandlerInvalid } from "../../../common/protocol-handler";
 import { delay, noop } from "../../../common/utils";
-import { ExtensionsStore } from "../../../extensions/extensions-store/extensions-store";
+import type { ExtensionsStore, IsEnabledExtensionDescriptor } from "../../../extensions/extensions-store/extensions-store";
 import type { LensProtocolRouterMain } from "../lens-protocol-router-main/lens-protocol-router-main";
-import mockFs from "mock-fs";
 import { getDiForUnitTesting } from "../../getDiForUnitTesting";
 import lensProtocolRouterMainInjectable from "../lens-protocol-router-main/lens-protocol-router-main.injectable";
 import extensionsStoreInjectable from "../../../extensions/extensions-store/extensions-store.injectable";
@@ -33,16 +32,16 @@ function throwIfDefined(val: any): void {
 describe("protocol router tests", () => {
   let extensionInstances: ObservableMap;
   let lpr: LensProtocolRouterMain;
-  let extensionsStore: ExtensionsStore;
+  let enabledExtensions: Set;
 
   beforeEach(async () => {
     const di = getDiForUnitTesting({ doGeneralOverrides: true });
 
-    mockFs({
-      "tmp": {},
-    });
+    enabledExtensions = new Set();
 
-    di.override(extensionsStoreInjectable, () => ExtensionsStore.createInstance());
+    di.override(extensionsStoreInjectable, () => ({
+      isEnabled: ({ id, isBundled }: IsEnabledExtensionDescriptor) => isBundled || enabledExtensions.has(id),
+    } as unknown as ExtensionsStore));
 
     di.permitSideEffects(getConfigurationFileModelInjectable);
     di.permitSideEffects(appVersionInjectable);
@@ -50,32 +49,19 @@ describe("protocol router tests", () => {
     di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data");
 
     extensionInstances = di.inject(extensionInstancesInjectable);
-    extensionsStore = di.inject(extensionsStoreInjectable);
     lpr = di.inject(lensProtocolRouterMainInjectable);
 
     lpr.rendererLoaded = true;
   });
 
-  afterEach(() => {
-    jest.clearAllMocks();
-
-    mockFs.restore();
+  it("should broadcast invalid protocol on non-lens URLs", async () => {
+    await lpr.route("https://google.ca");
+    expect(broadcastMessage).toBeCalledWith(ProtocolHandlerInvalid, "invalid protocol", "https://google.ca");
   });
 
-  it("should throw on non-lens URLS", async () => {
-    try {
-      expect(await lpr.route("https://google.ca")).toBeUndefined();
-    } catch (error) {
-      expect(error).toBeInstanceOf(Error);
-    }
-  });
-
-  it("should throw when host not internal or extension", async () => {
-    try {
-      expect(await lpr.route("lens://foobar")).toBeUndefined();
-    } catch (error) {
-      expect(error).toBeInstanceOf(Error);
-    }
+  it("should broadcast invalid host on non internal or non extension URLs", async () => {
+    await lpr.route("lens://foobar");
+    expect(broadcastMessage).toBeCalledWith(ProtocolHandlerInvalid, "invalid host", "lens://foobar");
   });
 
   it("should not throw when has valid host", async () => {
@@ -100,7 +86,7 @@ describe("protocol router tests", () => {
     });
 
     extensionInstances.set(extId, ext);
-    extensionsStore.mergeState([[extId, { enabled: true, name: "@mirantis/minikube" }]]);
+    enabledExtensions.add(extId);
 
     lpr.addInternalHandler("/", noop);
 
@@ -180,7 +166,7 @@ describe("protocol router tests", () => {
       });
 
     extensionInstances.set(extId, ext);
-    extensionsStore.mergeState([[extId, { enabled: true, name: "@foobar/icecream" }]]);
+    enabledExtensions.add(extId);
 
     try {
       expect(await lpr.route("lens://extension/@foobar/icecream/page/foob")).toBeUndefined();
@@ -219,7 +205,7 @@ describe("protocol router tests", () => {
         });
 
       extensionInstances.set(extId, ext);
-      extensionsStore.mergeState([[extId, { enabled: true, name: "@foobar/icecream" }]]);
+      enabledExtensions.add(extId);
     }
 
     {
@@ -245,13 +231,11 @@ describe("protocol router tests", () => {
         });
 
       extensionInstances.set(extId, ext);
-      extensionsStore.mergeState([[extId, { enabled: true, name: "icecream" }]]);
+      enabledExtensions.add(extId);
     }
 
-    extensionsStore.mergeState([
-      ["@foobar/icecream", { enabled: true, name: "@foobar/icecream" }],
-      ["icecream", { enabled: true, name: "icecream" }],
-    ]);
+    enabledExtensions.add("@foobar/icecream");
+    enabledExtensions.add("icecream");
 
     try {
       expect(await lpr.route("lens://extension/icecream/page")).toBeUndefined();
diff --git a/src/main/protocol-handler/lens-protocol-router-main/lens-protocol-router-main.ts b/src/main/protocol-handler/lens-protocol-router-main/lens-protocol-router-main.ts
index 56270ac6b2..14b8fa3347 100644
--- a/src/main/protocol-handler/lens-protocol-router-main/lens-protocol-router-main.ts
+++ b/src/main/protocol-handler/lens-protocol-router-main/lens-protocol-router-main.ts
@@ -9,11 +9,9 @@ import URLParse from "url-parse";
 import type { LensExtension } from "../../../extensions/lens-extension";
 import { broadcastMessage } from "../../../common/ipc";
 import { observable, when, makeObservable } from "mobx";
-import type { RouteAttempt } from "../../../common/protocol-handler";
+import type { LensProtocolRouterDependencies, RouteAttempt } from "../../../common/protocol-handler";
 import { ProtocolHandlerInvalid } from "../../../common/protocol-handler";
 import { disposer, noop } from "../../../common/utils";
-import type { ExtensionLoader } from "../../../extensions/extension-loader";
-import type { ExtensionsStore } from "../../../extensions/extensions-store/extensions-store";
 
 export interface FallbackHandler {
   (name: string): Promise;
@@ -36,9 +34,7 @@ function checkHost(url: URLParse): boolean {
   }
 }
 
-interface Dependencies {
-  extensionLoader: ExtensionLoader;
-  extensionsStore: ExtensionsStore;
+export interface LensProtocolRouterMainDependencies extends LensProtocolRouterDependencies {
   showApplicationWindow: () => Promise;
 }
 
@@ -50,7 +46,7 @@ export class LensProtocolRouterMain extends proto.LensProtocolRouter {
 
   protected disposers = disposer();
 
-  constructor(protected dependencies: Dependencies) {
+  constructor(protected readonly dependencies: LensProtocolRouterMainDependencies) {
     super(dependencies);
 
     makeObservable(this);
diff --git a/src/main/router/parse-request.injectable.ts b/src/main/router/parse-request.injectable.ts
index ee623769ad..93095a0d0e 100644
--- a/src/main/router/parse-request.injectable.ts
+++ b/src/main/router/parse-request.injectable.ts
@@ -5,6 +5,8 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import Subtext from "@hapi/subtext";
 
+export type ParseRequest = typeof Subtext.parse;
+
 const parseRequestInjectable = getInjectable({
   id: "parse-http-request",
   instantiate: () => Subtext.parse,
diff --git a/src/main/router/router.test.ts b/src/main/router/router.test.ts
index 20d5f4f526..a8467df3f2 100644
--- a/src/main/router/router.test.ts
+++ b/src/main/router/router.test.ts
@@ -32,7 +32,10 @@ describe("router", () => {
 
     mockFs();
 
-    di.override(parseRequestInjectable, () => () => Promise.resolve({ payload: "some-payload" }));
+    di.override(parseRequestInjectable, () => () => Promise.resolve({
+      payload: "some-payload",
+      mime: "some-mime",
+    }));
     di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data");
     di.override(kubectlBinaryNameInjectable, () => "kubectl");
     di.override(kubectlDownloadingNormalizedArchInjectable, () => "amd64");
diff --git a/src/main/router/router.ts b/src/main/router/router.ts
index 98ce50bac3..5b07822142 100644
--- a/src/main/router/router.ts
+++ b/src/main/router/router.ts
@@ -10,21 +10,22 @@ import type { Cluster } from "../../common/cluster/cluster";
 import { contentTypes } from "./router-content-types";
 import type { LensApiRequest, LensApiResult, Route } from "./route";
 import type { ServerIncomingMessage } from "../lens-proxy/lens-proxy";
+import type { ParseRequest } from "./parse-request.injectable";
 
 export interface RouterRequestOpts {
   req: http.IncomingMessage;
   res: http.ServerResponse;
   cluster: Cluster | undefined;
-  params: any;
+  params: Partial>;
   url: URL;
 }
 
 interface Dependencies {
-  parseRequest: (request: http.IncomingMessage, _: null, options: { parse: boolean; output: string }) => Promise<{ payload: any }>;
+  parseRequest: ParseRequest;
 }
 
 export class Router {
-  protected router = new Call.Router();
+  protected router = new Call.Router>();
 
   constructor(routes: Route[], private dependencies: Dependencies) {
     routes.forEach(route => {
@@ -37,17 +38,16 @@ export class Router {
     const path = url.pathname;
     const method = req.method.toLowerCase();
     const matchingRoute = this.router.route(method, path);
-    const routeFound = !matchingRoute.isBoom;
 
-    if (routeFound) {
-      const request = await this.getRequest({ req, res, cluster, url, params: matchingRoute.params });
-
-      await matchingRoute.route(request, res);
-
-      return true;
+    if (matchingRoute instanceof Error) {
+      return false;
     }
 
-    return false;
+    const request = await this.getRequest({ req, res, cluster, url, params: matchingRoute.params });
+
+    await matchingRoute.route(request, res);
+
+    return true;
   }
 
   protected async getRequest(opts: RouterRequestOpts): Promise> {
@@ -64,7 +64,7 @@ export class Router {
       raw: {
         req, res,
       },
-      query: url.searchParams as never,
+      query: url.searchParams,
       payload,
       params,
     };
diff --git a/src/main/routes/helm/charts/get-chart-route.injectable.ts b/src/main/routes/helm/charts/get-chart-route.injectable.ts
index cc711be5d5..012584dbfc 100644
--- a/src/main/routes/helm/charts/get-chart-route.injectable.ts
+++ b/src/main/routes/helm/charts/get-chart-route.injectable.ts
@@ -5,25 +5,29 @@
 import { getRouteInjectable } from "../../../router/router.injectable";
 import { apiPrefix } from "../../../../common/vars";
 import { route } from "../../../router/route";
-import { helmService } from "../../../helm/helm-service";
+import getHelmChartInjectable from "../../../helm/helm-service/get-helm-chart.injectable";
 
 const getChartRouteInjectable = getRouteInjectable({
   id: "get-chart-route",
 
-  instantiate: () => route({
-    method: "get",
-    path: `${apiPrefix}/v2/charts/{repo}/{chart}`,
-  })(async ({ params, query }) => {
-    const { repo, chart } = params;
+  instantiate: (di) => {
+    const getHelmChart = di.inject(getHelmChartInjectable);
 
-    return {
-      response: await helmService.getChart(
-        repo,
-        chart,
-        query.get("version") ?? undefined,
-      ),
-    };
-  }),
+    return route({
+      method: "get",
+      path: `${apiPrefix}/v2/charts/{repo}/{chart}`,
+    })(async ({ params, query }) => {
+      const { repo, chart } = params;
+
+      return {
+        response: await getHelmChart(
+          repo,
+          chart,
+          query.get("version") ?? undefined,
+        ),
+      };
+    });
+  },
 });
 
 export default getChartRouteInjectable;
diff --git a/src/main/routes/helm/charts/get-chart-values-route.injectable.ts b/src/main/routes/helm/charts/get-chart-values-route.injectable.ts
index 57fd067ed5..3cb7fd8f46 100644
--- a/src/main/routes/helm/charts/get-chart-values-route.injectable.ts
+++ b/src/main/routes/helm/charts/get-chart-values-route.injectable.ts
@@ -3,23 +3,27 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getRouteInjectable } from "../../../router/router.injectable";
-import { helmService } from "../../../helm/helm-service";
 import { apiPrefix } from "../../../../common/vars";
 import { route } from "../../../router/route";
+import getHelmChartValuesInjectable from "../../../helm/helm-service/get-helm-chart-values.injectable";
 
 const getChartRouteValuesInjectable = getRouteInjectable({
   id: "get-chart-route-values",
 
-  instantiate: () => route({
-    method: "get",
-    path: `${apiPrefix}/v2/charts/{repo}/{chart}/values`,
-  })(async ({ params, query }) => ({
-    response: await helmService.getChartValues(
-      params.repo,
-      params.chart,
-      query.get("version") ?? undefined,
-    ),
-  })),
+  instantiate: (di) => {
+    const getHelmChartValues = di.inject(getHelmChartValuesInjectable);
+
+    return route({
+      method: "get",
+      path: `${apiPrefix}/v2/charts/{repo}/{chart}/values`,
+    })(async ({ params, query }) => ({
+      response: await getHelmChartValues(
+        params.repo,
+        params.chart,
+        query.get("version") ?? undefined,
+      ),
+    }));
+  },
 });
 
 export default getChartRouteValuesInjectable;
diff --git a/src/main/routes/helm/charts/list-charts-route.injectable.ts b/src/main/routes/helm/charts/list-charts-route.injectable.ts
index 670cc9b889..946b7fe022 100644
--- a/src/main/routes/helm/charts/list-charts-route.injectable.ts
+++ b/src/main/routes/helm/charts/list-charts-route.injectable.ts
@@ -3,19 +3,23 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getRouteInjectable } from "../../../router/router.injectable";
-import { helmService } from "../../../helm/helm-service";
 import { apiPrefix } from "../../../../common/vars";
 import { route } from "../../../router/route";
+import listHelmChartsInjectable from "../../../helm/helm-service/list-helm-charts.injectable";
 
 const listChartsRouteInjectable = getRouteInjectable({
   id: "list-charts-route",
 
-  instantiate: () => route({
-    method: "get",
-    path: `${apiPrefix}/v2/charts`,
-  })(async () => ({
-    response: await helmService.listCharts(),
-  })),
+  instantiate: (di) => {
+    const listHelmCharts = di.inject(listHelmChartsInjectable);
+
+    return route({
+      method: "get",
+      path: `${apiPrefix}/v2/charts`,
+    })(async () => ({
+      response: await listHelmCharts(),
+    }));
+  },
 });
 
 export default listChartsRouteInjectable;
diff --git a/src/main/routes/helm/releases/delete-release-route.injectable.ts b/src/main/routes/helm/releases/delete-release-route.injectable.ts
index b17a8ea5c3..2da28fd591 100644
--- a/src/main/routes/helm/releases/delete-release-route.injectable.ts
+++ b/src/main/routes/helm/releases/delete-release-route.injectable.ts
@@ -3,23 +3,23 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { apiPrefix } from "../../../../common/vars";
-import { helmService } from "../../../helm/helm-service";
 import { getRouteInjectable } from "../../../router/router.injectable";
 import { clusterRoute } from "../../../router/route";
+import deleteHelmReleaseInjectable from "../../../helm/helm-service/delete-helm-release.injectable";
 
 const deleteReleaseRouteInjectable = getRouteInjectable({
   id: "delete-release-route",
 
-  instantiate: () => clusterRoute({
-    method: "delete",
-    path: `${apiPrefix}/v2/releases/{namespace}/{release}`,
-  })(async ({ cluster, params: { release, namespace }}) => ({
-    response: await helmService.deleteRelease(
-      cluster,
-      release,
-      namespace,
-    ),
-  })),
+  instantiate: (di) => {
+    const deleteHelmRelease = di.inject(deleteHelmReleaseInjectable);
+
+    return clusterRoute({
+      method: "delete",
+      path: `${apiPrefix}/v2/releases/{namespace}/{release}`,
+    })(async ({ cluster, params: { release, namespace }}) => ({
+      response: await deleteHelmRelease(cluster, release, namespace),
+    }));
+  },
 });
 
 export default deleteReleaseRouteInjectable;
diff --git a/src/main/routes/helm/releases/get-release-history-route.injectable.ts b/src/main/routes/helm/releases/get-release-history-route.injectable.ts
index a58f125a97..142adfc0d5 100644
--- a/src/main/routes/helm/releases/get-release-history-route.injectable.ts
+++ b/src/main/routes/helm/releases/get-release-history-route.injectable.ts
@@ -3,23 +3,27 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { apiPrefix } from "../../../../common/vars";
-import { helmService } from "../../../helm/helm-service";
 import { getRouteInjectable } from "../../../router/router.injectable";
 import { clusterRoute } from "../../../router/route";
+import getHelmReleaseHistoryInjectable from "../../../helm/helm-service/get-helm-release-history.injectable";
 
 const getReleaseRouteHistoryInjectable = getRouteInjectable({
   id: "get-release-history-route",
 
-  instantiate: () => clusterRoute({
-    method: "get",
-    path: `${apiPrefix}/v2/releases/{namespace}/{release}/history`,
-  })(async ({ cluster, params }) => ({
-    response: await helmService.getReleaseHistory(
-      cluster,
-      params.release,
-      params.namespace,
-    ),
-  })),
+  instantiate: (di) => {
+    const getHelmReleaseHistory = di.inject(getHelmReleaseHistoryInjectable);
+
+    return clusterRoute({
+      method: "get",
+      path: `${apiPrefix}/v2/releases/{namespace}/{release}/history`,
+    })(async ({ cluster, params }) => ({
+      response: await getHelmReleaseHistory(
+        cluster,
+        params.release,
+        params.namespace,
+      ),
+    }));
+  },
 });
 
 export default getReleaseRouteHistoryInjectable;
diff --git a/src/main/routes/helm/releases/get-release-route.injectable.ts b/src/main/routes/helm/releases/get-release-route.injectable.ts
index f2e8917ebf..7b264b4fe9 100644
--- a/src/main/routes/helm/releases/get-release-route.injectable.ts
+++ b/src/main/routes/helm/releases/get-release-route.injectable.ts
@@ -3,23 +3,27 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { apiPrefix } from "../../../../common/vars";
-import { helmService } from "../../../helm/helm-service";
 import { getRouteInjectable } from "../../../router/router.injectable";
 import { clusterRoute } from "../../../router/route";
+import getHelmReleaseInjectable from "../../../helm/helm-service/get-helm-release.injectable";
 
 const getReleaseRouteInjectable = getRouteInjectable({
   id: "get-release-route",
 
-  instantiate: () => clusterRoute({
-    method: "get",
-    path: `${apiPrefix}/v2/releases/{namespace}/{release}`,
-  })(async ({ cluster, params }) => ({
-    response: await helmService.getRelease(
-      cluster,
-      params.release,
-      params.namespace,
-    ),
-  })),
+  instantiate: (di) => {
+    const getHelmRelease = di.inject(getHelmReleaseInjectable);
+
+    return clusterRoute({
+      method: "get",
+      path: `${apiPrefix}/v2/releases/{namespace}/{release}`,
+    })(async ({ cluster, params }) => ({
+      response: await getHelmRelease(
+        cluster,
+        params.release,
+        params.namespace,
+      ),
+    }));
+  },
 });
 
 export default getReleaseRouteInjectable;
diff --git a/src/main/routes/helm/releases/get-release-values-route.injectable.ts b/src/main/routes/helm/releases/get-release-values-route.injectable.ts
index 6908257f5b..d68e5c53d1 100644
--- a/src/main/routes/helm/releases/get-release-values-route.injectable.ts
+++ b/src/main/routes/helm/releases/get-release-values-route.injectable.ts
@@ -3,27 +3,31 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { apiPrefix } from "../../../../common/vars";
-import { helmService } from "../../../helm/helm-service";
 import { getRouteInjectable } from "../../../router/router.injectable";
 import { getBoolean } from "../../../utils/parse-query";
 import { contentTypes } from "../../../router/router-content-types";
 import { clusterRoute } from "../../../router/route";
+import getHelmReleaseValuesInjectable from "../../../helm/helm-service/get-helm-release-values.injectable";
 
 const getReleaseRouteValuesInjectable = getRouteInjectable({
   id: "get-release-values-route",
 
-  instantiate: () => clusterRoute({
-    method: "get",
-    path: `${apiPrefix}/v2/releases/{namespace}/{release}/values`,
-  })(async ({ cluster, params: { namespace, release }, query }) => ({
-    response: await helmService.getReleaseValues(release, {
-      cluster,
-      namespace,
-      all: getBoolean(query, "all"),
-    }),
+  instantiate: (di) => {
+    const getHelmReleaseValues = di.inject(getHelmReleaseValuesInjectable);
 
-    contentType: contentTypes.txt,
-  })),
+    return clusterRoute({
+      method: "get",
+      path: `${apiPrefix}/v2/releases/{namespace}/{release}/values`,
+    })(async ({ cluster, params: { namespace, release }, query }) => ({
+      response: await getHelmReleaseValues(release, {
+        cluster,
+        namespace,
+        all: getBoolean(query, "all"),
+      }),
+
+      contentType: contentTypes.txt,
+    }));
+  },
 });
 
 export default getReleaseRouteValuesInjectable;
diff --git a/src/main/routes/helm/releases/install-chart-route.injectable.ts b/src/main/routes/helm/releases/install-chart-route.injectable.ts
index bb1d0c923c..a585443193 100644
--- a/src/main/routes/helm/releases/install-chart-route.injectable.ts
+++ b/src/main/routes/helm/releases/install-chart-route.injectable.ts
@@ -3,11 +3,11 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { apiPrefix } from "../../../../common/vars";
-import type { InstallChartArgs } from "../../../helm/helm-service";
-import { helmService } from "../../../helm/helm-service";
 import { getRouteInjectable } from "../../../router/router.injectable";
 import Joi from "joi";
 import { payloadValidatedClusterRoute } from "../../../router/route";
+import type { InstallChartArgs } from "../../../helm/helm-service/install-helm-chart.injectable";
+import installHelmChartInjectable from "../../../helm/helm-service/install-helm-chart.injectable";
 
 const installChartArgsValidator = Joi.object({
   chart: Joi
@@ -31,14 +31,18 @@ const installChartArgsValidator = Joi.object payloadValidatedClusterRoute({
-    method: "post",
-    path: `${apiPrefix}/v2/releases`,
-    payloadValidator: installChartArgsValidator,
-  })(async ({ payload, cluster }) => ({
-    response: await helmService.installChart(cluster, payload),
-    statusCode: 201,
-  })),
+  instantiate: (di) => {
+    const installHelmChart = di.inject(installHelmChartInjectable);
+
+    return payloadValidatedClusterRoute({
+      method: "post",
+      path: `${apiPrefix}/v2/releases`,
+      payloadValidator: installChartArgsValidator,
+    })(async ({ payload, cluster }) => ({
+      response: await installHelmChart(cluster, payload),
+      statusCode: 201,
+    }));
+  },
 });
 
 export default installChartRouteInjectable;
diff --git a/src/main/routes/helm/releases/list-releases-route.injectable.ts b/src/main/routes/helm/releases/list-releases-route.injectable.ts
index b57d646526..8e9ea1e305 100644
--- a/src/main/routes/helm/releases/list-releases-route.injectable.ts
+++ b/src/main/routes/helm/releases/list-releases-route.injectable.ts
@@ -3,19 +3,23 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { apiPrefix } from "../../../../common/vars";
-import { helmService } from "../../../helm/helm-service";
 import { getRouteInjectable } from "../../../router/router.injectable";
 import { clusterRoute } from "../../../router/route";
+import listHelmReleasesInjectable from "../../../helm/helm-service/list-helm-releases.injectable";
 
 const listReleasesRouteInjectable = getRouteInjectable({
   id: "list-releases-route",
 
-  instantiate: () => clusterRoute({
-    method: "get",
-    path: `${apiPrefix}/v2/releases/{namespace?}`,
-  })(async ({ cluster, params }) => ({
-    response: await helmService.listReleases(cluster, params.namespace),
-  })),
+  instantiate: (di) => {
+    const listHelmReleases = di.inject(listHelmReleasesInjectable);
+
+    return clusterRoute({
+      method: "get",
+      path: `${apiPrefix}/v2/releases/{namespace?}`,
+    })(async ({ cluster, params }) => ({
+      response: await listHelmReleases(cluster, params.namespace),
+    }));
+  },
 });
 
 export default listReleasesRouteInjectable;
diff --git a/src/main/routes/helm/releases/rollback-release-route.injectable.ts b/src/main/routes/helm/releases/rollback-release-route.injectable.ts
index 36a92c2820..eb27b675c4 100644
--- a/src/main/routes/helm/releases/rollback-release-route.injectable.ts
+++ b/src/main/routes/helm/releases/rollback-release-route.injectable.ts
@@ -3,10 +3,10 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { apiPrefix } from "../../../../common/vars";
-import { helmService } from "../../../helm/helm-service";
 import { getRouteInjectable } from "../../../router/router.injectable";
 import Joi from "joi";
 import { payloadValidatedClusterRoute } from "../../../router/route";
+import rollbackHelmReleaseInjectable from "../../../helm/helm-service/rollback-helm-release.injectable";
 
 interface RollbackReleasePayload {
   revision: number;
@@ -21,13 +21,17 @@ const rollbackReleasePayloadValidator = Joi.object payloadValidatedClusterRoute({
-    method: "put",
-    path: `${apiPrefix}/v2/releases/{namespace}/{release}/rollback`,
-    payloadValidator: rollbackReleasePayloadValidator,
-  })(async ({ cluster, params: { release, namespace }, payload }) => {
-    await helmService.rollback(cluster, release, namespace, payload.revision);
-  }),
+  instantiate: (di) => {
+    const rollbackRelease = di.inject(rollbackHelmReleaseInjectable);
+
+    return payloadValidatedClusterRoute({
+      method: "put",
+      path: `${apiPrefix}/v2/releases/{namespace}/{release}/rollback`,
+      payloadValidator: rollbackReleasePayloadValidator,
+    })(async ({ cluster, params: { release, namespace }, payload }) => {
+      await rollbackRelease(cluster, release, namespace, payload.revision);
+    });
+  },
 });
 
 export default rollbackReleaseRouteInjectable;
diff --git a/src/main/routes/helm/releases/update-release-route.injectable.ts b/src/main/routes/helm/releases/update-release-route.injectable.ts
index 0d3602f505..573c85d962 100644
--- a/src/main/routes/helm/releases/update-release-route.injectable.ts
+++ b/src/main/routes/helm/releases/update-release-route.injectable.ts
@@ -3,11 +3,11 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { apiPrefix } from "../../../../common/vars";
-import type { UpdateChartArgs } from "../../../helm/helm-service";
-import { helmService } from "../../../helm/helm-service";
 import { getRouteInjectable } from "../../../router/router.injectable";
 import { payloadValidatedClusterRoute } from "../../../router/route";
 import Joi from "joi";
+import type { UpdateChartArgs } from "../../../helm/helm-service/update-helm-release.injectable";
+import updateHelmReleaseInjectable from "../../../helm/helm-service/update-helm-release.injectable";
 
 const updateChartArgsValidator = Joi.object({
   chart: Joi
@@ -24,18 +24,22 @@ const updateChartArgsValidator = Joi.object payloadValidatedClusterRoute({
-    method: "put",
-    path: `${apiPrefix}/v2/releases/{namespace}/{release}`,
-    payloadValidator: updateChartArgsValidator,
-  })(async ({ cluster, params, payload }) => ({
-    response: await helmService.updateRelease(
-      cluster,
-      params.release,
-      params.namespace,
-      payload,
-    ),
-  })),
+  instantiate: (di) => {
+    const updateRelease = di.inject(updateHelmReleaseInjectable);
+
+    return payloadValidatedClusterRoute({
+      method: "put",
+      path: `${apiPrefix}/v2/releases/{namespace}/{release}`,
+      payloadValidator: updateChartArgsValidator,
+    })(async ({ cluster, params, payload }) => ({
+      response: await updateRelease(
+        cluster,
+        params.release,
+        params.namespace,
+        payload,
+      ),
+    }));
+  },
 });
 
 export default updateReleaseRouteInjectable;
diff --git a/src/main/start-main-application/lens-window/application-window/application-window.injectable.ts b/src/main/start-main-application/lens-window/application-window/application-window.injectable.ts
index c63191c71c..45d7631415 100644
--- a/src/main/start-main-application/lens-window/application-window/application-window.injectable.ts
+++ b/src/main/start-main-application/lens-window/application-window/application-window.injectable.ts
@@ -9,9 +9,7 @@ import lensProxyPortInjectable from "../../../lens-proxy/lens-proxy-port.injecta
 import isMacInjectable from "../../../../common/vars/is-mac.injectable";
 import appNameInjectable from "../../../app-paths/app-name/app-name.injectable";
 import appEventBusInjectable from "../../../../common/app-event-bus/app-event-bus.injectable";
-import { delay } from "../../../../common/utils";
-import { bundledExtensionsLoaded } from "../../../../common/ipc/extension-handling";
-import ipcMainInjectable from "../../../utils/channel/ipc-main/ipc-main.injectable";
+import waitUntilBundledExtensionsAreLoadedInjectable from "./wait-until-bundled-extensions-are-loaded.injectable";
 
 const applicationWindowInjectable = getInjectable({
   id: "application-window",
@@ -21,7 +19,7 @@ const applicationWindowInjectable = getInjectable({
     const isMac = di.inject(isMacInjectable);
     const applicationName = di.inject(appNameInjectable);
     const appEventBus = di.inject(appEventBusInjectable);
-    const ipcMain = di.inject(ipcMainInjectable);
+    const waitUntilBundledExtensionsAreLoaded = di.inject(waitUntilBundledExtensionsAreLoadedInjectable);
     const lensProxyPort = di.inject(lensProxyPortInjectable);
 
     return createLensWindow({
@@ -45,14 +43,7 @@ const applicationWindowInjectable = getInjectable({
       onDomReady: () => {
         appEventBus.emit({ name: "app", action: "dom-ready" });
       },
-      beforeOpen: async () => {
-        const viewHasLoaded = new Promise((resolve) => {
-          ipcMain.once(bundledExtensionsLoaded, () => resolve());
-        });
-
-        await viewHasLoaded;
-        await delay(50); // wait just a bit longer to let the first round of rendering happen
-      },
+      beforeOpen: waitUntilBundledExtensionsAreLoaded,
     });
   },
 
diff --git a/src/main/start-main-application/lens-window/application-window/create-electron-window-for.injectable.ts b/src/main/start-main-application/lens-window/application-window/create-electron-window.injectable.ts
similarity index 83%
rename from src/main/start-main-application/lens-window/application-window/create-electron-window-for.injectable.ts
rename to src/main/start-main-application/lens-window/application-window/create-electron-window.injectable.ts
index 5279bff30f..00fcdb6231 100644
--- a/src/main/start-main-application/lens-window/application-window/create-electron-window-for.injectable.ts
+++ b/src/main/start-main-application/lens-window/application-window/create-electron-window.injectable.ts
@@ -8,7 +8,7 @@ import applicationWindowStateInjectable from "./application-window-state.injecta
 import { BrowserWindow } from "electron";
 import { openBrowser } from "../../../../common/utils";
 import sendToChannelInElectronBrowserWindowInjectable from "./send-to-channel-in-electron-browser-window.injectable";
-import type { LensWindow } from "./create-lens-window.injectable";
+import type { ElectronWindow } from "./create-lens-window.injectable";
 import type { RequireExactlyOne } from "type-fest";
 
 export type ElectronWindowTitleBarStyle = "hiddenInset" | "hidden" | "default" | "customButtonsOnHover";
@@ -38,21 +38,16 @@ export interface ElectronWindowConfiguration {
   onDomReady?: () => void;
 }
 
-export type CreateElectronWindow = () => Promise;
-export type CreateElectronWindowFor = (config: ElectronWindowConfiguration) => CreateElectronWindow;
+export type CreateElectronWindow = (config: ElectronWindowConfiguration) => ElectronWindow;
 
-function isFileSource(src: ContentSource): src is FileSource {
-  return typeof (src as FileSource).file === "string";
-}
+const createElectronWindowInjectable = getInjectable({
+  id: "create-electron-window",
 
-const createElectronWindowFor = getInjectable({
-  id: "create-electron-window-for",
-
-  instantiate: (di): CreateElectronWindowFor => {
+  instantiate: (di): CreateElectronWindow => {
     const logger = di.inject(loggerInjectable);
     const sendToChannelInLensWindow = di.inject(sendToChannelInElectronBrowserWindowInjectable);
 
-    return (configuration) => async () => {
+    return (configuration) => {
       const applicationWindowState = di.inject(
         applicationWindowStateInjectable,
         {
@@ -172,19 +167,23 @@ const createElectronWindowFor = getInjectable({
           return { action: "deny" };
         });
 
-      const contentSource = configuration.getContentSource();
-
-      if (isFileSource(contentSource)) {
-        logger.info(`[CREATE-ELECTRON-WINDOW]: Loading content for window "${configuration.id}" from file: ${contentSource.file}...`);
-        await browserWindow.loadFile(contentSource.file);
-      } else {
-        logger.info(`[CREATE-ELECTRON-WINDOW]: Loading content for window "${configuration.id}" from url: ${contentSource.url}...`);
-        await browserWindow.loadURL(contentSource.url);
-      }
-
-      await configuration.beforeOpen?.();
-
       return {
+        loadFile: async (filePath) => {
+          logger.info(
+            `[CREATE-ELECTRON-WINDOW]: Loading content for window "${configuration.id}" from file: ${filePath}...`,
+          );
+
+          await browserWindow.loadFile(filePath);
+        },
+
+        loadUrl: async (url) => {
+          logger.info(
+            `[CREATE-ELECTRON-WINDOW]: Loading content for window "${configuration.id}" from url: ${url}...`,
+          );
+
+          await browserWindow.loadURL(url);
+        },
+
         show: () => browserWindow.show(),
         close: () => browserWindow.close(),
         send: (args) => sendToChannelInLensWindow(browserWindow, args),
@@ -195,4 +194,4 @@ const createElectronWindowFor = getInjectable({
   causesSideEffects: true,
 });
 
-export default createElectronWindowFor;
+export default createElectronWindowInjectable;
diff --git a/src/main/start-main-application/lens-window/application-window/create-lens-window.injectable.ts b/src/main/start-main-application/lens-window/application-window/create-lens-window.injectable.ts
index a44b0ebd4c..fe43f2e41e 100644
--- a/src/main/start-main-application/lens-window/application-window/create-lens-window.injectable.ts
+++ b/src/main/start-main-application/lens-window/application-window/create-lens-window.injectable.ts
@@ -3,14 +3,17 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import type { SendToViewArgs } from "./lens-window-injection-token";
-import type { ContentSource, ElectronWindowTitleBarStyle } from "./create-electron-window-for.injectable";
-import createElectronWindowForInjectable from "./create-electron-window-for.injectable";
+import type { LensWindow, SendToViewArgs } from "./lens-window-injection-token";
+import type { ContentSource, ElectronWindowTitleBarStyle } from "./create-electron-window.injectable";
+import createElectronWindowForInjectable from "./create-electron-window.injectable";
+import assert from "assert";
 
-export interface LensWindow {
+export interface ElectronWindow {
   show: () => void;
   close: () => void;
   send: (args: SendToViewArgs) => void;
+  loadFile: (filePath: string) => Promise;
+  loadUrl: (url: string) => Promise;
 }
 
 export interface LensWindowConfiguration {
@@ -33,31 +36,69 @@ const createLensWindowInjectable = getInjectable({
   id: "create-lens-window",
 
   instantiate: (di) => {
-    const createElectronWindowFor = di.inject(createElectronWindowForInjectable);
+    const createElectronWindow = di.inject(createElectronWindowForInjectable);
 
-    return (configuration: LensWindowConfiguration) => {
-      let browserWindow: LensWindow | undefined;
+    return (configuration: LensWindowConfiguration): LensWindow => {
+      let browserWindow: ElectronWindow | undefined;
 
-      const createElectronWindow = createElectronWindowFor({
-        ...configuration,
-        onClose: () => browserWindow = undefined,
-      });
+      let windowIsShown = false;
+      let windowIsStarting = false;
+
+      const showWindow = () => {
+        assert(browserWindow);
+
+        browserWindow.show();
+        windowIsShown = true;
+      };
 
       return {
-        get visible() {
-          return !!browserWindow;
+        id: configuration.id,
+
+        get isVisible() {
+          return windowIsShown;
         },
-        show: async () => {
+
+        get isStarting() {
+          return windowIsStarting;
+        },
+
+        start: async () => {
           if (!browserWindow) {
-            browserWindow = await createElectronWindow();
+            windowIsStarting = true;
+
+            browserWindow = createElectronWindow({
+              ...configuration,
+              onClose: () => {
+                browserWindow = undefined;
+                windowIsShown = false;
+              },
+            });
+
+            const { file: filePathForContent, url: urlForContent } =
+              configuration.getContentSource();
+
+            if (filePathForContent) {
+              await browserWindow.loadFile(filePathForContent);
+            } else if (urlForContent) {
+              await browserWindow.loadUrl(urlForContent);
+            }
+
+            await configuration.beforeOpen?.();
           }
 
-          browserWindow.show();
+          showWindow();
+
+          windowIsStarting = false;
         },
+
+        show: showWindow,
+
         close: () => {
           browserWindow?.close();
           browserWindow = undefined;
+          windowIsShown = false;
         },
+
         send: (args: SendToViewArgs) => {
           if (!browserWindow) {
             throw new Error(`Tried to send message to window "${configuration.id}" but the window was closed`);
diff --git a/src/main/start-main-application/lens-window/application-window/lens-window-injection-token.ts b/src/main/start-main-application/lens-window/application-window/lens-window-injection-token.ts
index 3e62b0894b..04c0939a6a 100644
--- a/src/main/start-main-application/lens-window/application-window/lens-window-injection-token.ts
+++ b/src/main/start-main-application/lens-window/application-window/lens-window-injection-token.ts
@@ -12,10 +12,13 @@ export interface SendToViewArgs {
 }
 
 export interface LensWindow {
-  show: () => Promise;
+  id: string;
+  start: () => Promise;
   close: () => void;
+  show: () => void;
   send: (args: SendToViewArgs) => void;
-  visible: boolean;
+  isVisible: boolean;
+  isStarting: boolean;
 }
 
 export const lensWindowInjectionToken = getInjectionToken({
diff --git a/src/main/start-main-application/lens-window/application-window/wait-until-bundled-extensions-are-loaded.injectable.ts b/src/main/start-main-application/lens-window/application-window/wait-until-bundled-extensions-are-loaded.injectable.ts
new file mode 100644
index 0000000000..2c0f30b83b
--- /dev/null
+++ b/src/main/start-main-application/lens-window/application-window/wait-until-bundled-extensions-are-loaded.injectable.ts
@@ -0,0 +1,29 @@
+/**
+ * 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 { bundledExtensionsLoaded } from "../../../../common/ipc/extension-handling";
+import { delay } from "../../../../common/utils";
+import ipcMainInjectable from "../../../utils/channel/ipc-main/ipc-main.injectable";
+
+const waitUntilBundledExtensionsAreLoadedInjectable = getInjectable({
+  id: "wait-until-bundled-extensions-are-loaded",
+
+  instantiate: (di) => {
+    const ipcMain = di.inject(ipcMainInjectable);
+
+    return async () => {
+      const viewHasLoaded = new Promise((resolve) => {
+        ipcMain.once(bundledExtensionsLoaded, () => resolve());
+      });
+
+      await viewHasLoaded;
+      await delay(50); // wait just a bit longer to let the first round of rendering happen
+    };
+  },
+
+  causesSideEffects: true,
+});
+
+export default waitUntilBundledExtensionsAreLoadedInjectable;
diff --git a/src/main/start-main-application/lens-window/current-cluster-frame/current-cluster-frame.injectable.ts b/src/main/start-main-application/lens-window/current-cluster-frame/current-cluster-frame.injectable.ts
index 2749b23253..e364b8cb0e 100644
--- a/src/main/start-main-application/lens-window/current-cluster-frame/current-cluster-frame.injectable.ts
+++ b/src/main/start-main-application/lens-window/current-cluster-frame/current-cluster-frame.injectable.ts
@@ -17,6 +17,10 @@ const currentClusterFrameInjectable = getInjectable({
     return computed(() => {
       const clusterId = currentClusterFrameState.get();
 
+      if (!clusterId) {
+        return undefined;
+      }
+
       return clusterFrames.get(clusterId);
     });
   },
diff --git a/src/main/start-main-application/lens-window/get-visible-windows.injectable.ts b/src/main/start-main-application/lens-window/get-visible-windows.injectable.ts
new file mode 100644
index 0000000000..0179bdb377
--- /dev/null
+++ b/src/main/start-main-application/lens-window/get-visible-windows.injectable.ts
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { pipeline } from "@ogre-tools/fp";
+import { getInjectable } from "@ogre-tools/injectable";
+import { filter } from "lodash/fp";
+import { lensWindowInjectionToken } from "./application-window/lens-window-injection-token";
+
+const getVisibleWindowsInjectable = getInjectable({
+  id: "get-visible-windows",
+
+  instantiate: (di) => {
+    const getAllLensWindows = () => di.injectMany(lensWindowInjectionToken);
+
+    return () =>
+      pipeline(
+        getAllLensWindows(),
+        filter((lensWindow) => !!lensWindow.isVisible),
+      );
+  },
+});
+
+export default getVisibleWindowsInjectable;
diff --git a/src/main/start-main-application/lens-window/show-application-window.injectable.ts b/src/main/start-main-application/lens-window/show-application-window.injectable.ts
index b514c41891..6fa6fca62c 100644
--- a/src/main/start-main-application/lens-window/show-application-window.injectable.ts
+++ b/src/main/start-main-application/lens-window/show-application-window.injectable.ts
@@ -5,25 +5,36 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import splashWindowInjectable from "./splash-window/splash-window.injectable";
 import applicationWindowInjectable from "./application-window/application-window.injectable";
+import { identity, some } from "lodash/fp";
+const someIsTruthy = some(identity);
 
 const showApplicationWindowInjectable = getInjectable({
   id: "show-application-window",
 
   instantiate: (di) => {
     const applicationWindow = di.inject(applicationWindowInjectable);
-
-    const splashWindow = di.inject(
-      splashWindowInjectable,
-    );
+    const splashWindow = di.inject(splashWindowInjectable);
 
     return async () => {
-      if (applicationWindow.visible) {
+      if (applicationWindow.isStarting) {
+        applicationWindow.show();
+        splashWindow.close();
+
         return;
       }
 
-      await splashWindow.show();
+      const windowIsAlreadyBeingShown = someIsTruthy([
+        applicationWindow.isVisible,
+        splashWindow.isStarting,
+      ]);
 
-      await applicationWindow.show();
+      if (windowIsAlreadyBeingShown) {
+        return;
+      }
+
+      await splashWindow.start();
+
+      await applicationWindow.start();
 
       splashWindow.close();
     };
diff --git a/src/main/start-main-application/runnables/setup-sentry.injectable.ts b/src/main/start-main-application/runnables/setup-sentry.injectable.ts
index d100b93cc6..4ba3763a16 100644
--- a/src/main/start-main-application/runnables/setup-sentry.injectable.ts
+++ b/src/main/start-main-application/runnables/setup-sentry.injectable.ts
@@ -5,7 +5,7 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { initializeSentryReporting } from "../../../common/sentry";
 import { init } from "@sentry/electron/main";
-import { beforeApplicationIsLoadingInjectionToken } from "../runnable-tokens/before-application-is-loading-injection-token";
+import { beforeElectronIsReadyInjectionToken } from "../runnable-tokens/before-electron-is-ready-injection-token";
 
 const setupSentryInjectable = getInjectable({
   id: "setup-sentry",
@@ -18,7 +18,7 @@ const setupSentryInjectable = getInjectable({
 
   causesSideEffects: true,
 
-  injectionToken: beforeApplicationIsLoadingInjectionToken,
+  injectionToken: beforeElectronIsReadyInjectionToken,
 });
 
 export default setupSentryInjectable;
diff --git a/src/main/start-main-application/start-main-application.injectable.ts b/src/main/start-main-application/start-main-application.injectable.ts
index c818d0308b..fa85d9f029 100644
--- a/src/main/start-main-application/start-main-application.injectable.ts
+++ b/src/main/start-main-application/start-main-application.injectable.ts
@@ -38,34 +38,36 @@ const startMainApplicationInjectable = getInjectable({
     const onLoadOfApplication = runMany(onLoadOfApplicationInjectionToken);
     const afterApplicationIsLoaded = runMany(afterApplicationIsLoadedInjectionToken);
 
-    return async () => {
+    return () => {
       // Stuff happening before application is ready needs to be synchronous because of
       // https://github.com/electron/electron/issues/21370
       beforeElectronIsReady();
 
-      await waitForElectronToBeReady();
+      return (async () => {
+        await waitForElectronToBeReady();
 
-      await beforeApplicationIsLoading();
+        await beforeApplicationIsLoading();
 
-      if (!shouldStartHidden) {
-        await splashWindow.show();
-      }
-
-      await onLoadOfApplication();
-
-      if (!shouldStartHidden) {
-        const deepLinkUrl = getDeepLinkUrl(commandLineArguments);
-
-        if (deepLinkUrl) {
-          await openDeepLink(deepLinkUrl);
-        } else {
-          await applicationWindow.show();
+        if (!shouldStartHidden) {
+          await splashWindow.start();
         }
 
-        splashWindow.close();
-      }
+        await onLoadOfApplication();
 
-      await afterApplicationIsLoaded();
+        if (!shouldStartHidden) {
+          const deepLinkUrl = getDeepLinkUrl(commandLineArguments);
+
+          if (deepLinkUrl) {
+            await openDeepLink(deepLinkUrl);
+          } else {
+            await applicationWindow.start();
+          }
+
+          splashWindow.close();
+        }
+
+        await afterApplicationIsLoaded();
+      })();
     };
   },
 });
diff --git a/src/main/utils/channel/message-to-channel.injectable.ts b/src/main/utils/channel/message-to-channel.injectable.ts
index 00e588a16a..cbcdc2badd 100644
--- a/src/main/utils/channel/message-to-channel.injectable.ts
+++ b/src/main/utils/channel/message-to-channel.injectable.ts
@@ -2,32 +2,24 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { lensWindowInjectionToken } from "../../start-main-application/lens-window/application-window/lens-window-injection-token";
-import { pipeline } from "@ogre-tools/fp";
 import { getInjectable } from "@ogre-tools/injectable";
-import { filter } from "lodash/fp";
 import { messageToChannelInjectionToken } from "../../../common/utils/channel/message-to-channel-injection-token";
 import type { MessageChannel } from "../../../common/utils/channel/message-channel-injection-token";
 import { tentativeStringifyJson } from "../../../common/utils/tentative-stringify-json";
+import getVisibleWindowsInjectable from "../../start-main-application/lens-window/get-visible-windows.injectable";
 
 const messageToChannelInjectable = getInjectable({
   id: "message-to-channel",
 
   instantiate: (di) => {
-    const getAllLensWindows = () => di.injectMany(lensWindowInjectionToken);
+    const getVisibleWindows = di.inject(getVisibleWindowsInjectable);
 
     // TODO: Figure out way to improve typing in internals
     // Notice that this should be injected using "messageToChannelInjectionToken" which is typed correctly.
     return (channel: MessageChannel, message?: unknown) => {
       const stringifiedMessage = tentativeStringifyJson(message);
 
-
-      const visibleWindows = pipeline(
-        getAllLensWindows(),
-        filter((lensWindow) => !!lensWindow.visible),
-      );
-
-      visibleWindows.forEach((lensWindow) =>
+      getVisibleWindows().forEach((lensWindow) =>
         lensWindow.send({ channel: channel.id, data: stringifiedMessage ? [stringifiedMessage] : [] }),
       );
     };
diff --git a/src/main/utils/channel/message-to-channel.test.ts b/src/main/utils/channel/message-to-channel.test.ts
index cf2fc46549..67a407de55 100644
--- a/src/main/utils/channel/message-to-channel.test.ts
+++ b/src/main/utils/channel/message-to-channel.test.ts
@@ -43,9 +43,9 @@ describe("message to channel from main", () => {
     expect(sendToChannelInBrowserMock).not.toHaveBeenCalled();
   });
 
-  describe("given visible window", () => {
+  describe("given started window", () => {
     beforeEach(async () => {
-      await someTestWindow.show();
+      await someTestWindow.start();
     });
 
     it("when messaging to channel, messages to window", () => {
@@ -109,9 +109,9 @@ describe("message to channel from main", () => {
     });
   });
 
-  it("given multiple visible windows, when messaging to channel, messages to window", async () => {
-    await someTestWindow.show();
-    await someOtherTestWindow.show();
+  it("given multiple started windows, when messaging to channel, messages to window", async () => {
+    await someTestWindow.start();
+    await someOtherTestWindow.start();
 
     messageToChannel(someChannel, "some-message");
 
diff --git a/src/renderer/api/create-terminal-api.injectable.ts b/src/renderer/api/create-terminal-api.injectable.ts
index f9f151dace..255fa396f3 100644
--- a/src/renderer/api/create-terminal-api.injectable.ts
+++ b/src/renderer/api/create-terminal-api.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import assert from "assert";
-import hostedClusterIdInjectable from "../../common/cluster-store/hosted-cluster-id.injectable";
+import hostedClusterIdInjectable from "../cluster-frame-context/hosted-cluster-id.injectable";
 import type { TerminalApiQuery } from "./terminal-api";
 import { TerminalApi } from "./terminal-api";
 
diff --git a/src/renderer/bootstrap.tsx b/src/renderer/bootstrap.tsx
index fabb17cb5a..d0f671d20a 100644
--- a/src/renderer/bootstrap.tsx
+++ b/src/renderer/bootstrap.tsx
@@ -15,7 +15,6 @@ import * as LensExtensionsCommonApi from "../extensions/common-api";
 import * as LensExtensionsRendererApi from "../extensions/renderer-api";
 import { delay } from "../common/utils";
 import { isMac, isDevelopment } from "../common/vars";
-import { HelmRepoManager } from "../main/helm/helm-repo-manager";
 import { DefaultProps } from "./mui-base-theme";
 import configurePackages from "../common/configure-packages";
 import * as initializers from "./initializers";
@@ -151,8 +150,6 @@ export async function bootstrap(di: DiContainer) {
 
   extensionInstallationStateStore.bindIpcListeners();
 
-  HelmRepoManager.createInstance(); // initialize the manager
-
   // Register additional store listeners
   clusterStore.registerIpcListener();
 
diff --git a/src/common/cluster-store/allowed-resources.injectable.ts b/src/renderer/cluster-frame-context/allowed-resources.injectable.ts
similarity index 82%
rename from src/common/cluster-store/allowed-resources.injectable.ts
rename to src/renderer/cluster-frame-context/allowed-resources.injectable.ts
index 27ce2d510f..646d931367 100644
--- a/src/common/cluster-store/allowed-resources.injectable.ts
+++ b/src/renderer/cluster-frame-context/allowed-resources.injectable.ts
@@ -5,6 +5,7 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { comparer, computed } from "mobx";
 import hostedClusterInjectable from "./hosted-cluster.injectable";
+import { allowedResourcesInjectionToken } from "../../common/cluster-store/allowed-resources-injection-token";
 
 const allowedResourcesInjectable = getInjectable({
   id: "allowed-resources",
@@ -17,6 +18,8 @@ const allowedResourcesInjectable = getInjectable({
       equals: (cur, prev) => comparer.structural(cur, prev),
     });
   },
+
+  injectionToken: allowedResourcesInjectionToken,
 });
 
 export default allowedResourcesInjectable;
diff --git a/src/renderer/cluster-frame-context/cluster-frame-context.injectable.ts b/src/renderer/cluster-frame-context/cluster-frame-context.injectable.ts
index 08a921a87e..a353a30b40 100644
--- a/src/renderer/cluster-frame-context/cluster-frame-context.injectable.ts
+++ b/src/renderer/cluster-frame-context/cluster-frame-context.injectable.ts
@@ -5,7 +5,7 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { ClusterFrameContext } from "./cluster-frame-context";
 import namespaceStoreInjectable from "../components/+namespaces/store.injectable";
-import hostedClusterInjectable from "../../common/cluster-store/hosted-cluster.injectable";
+import hostedClusterInjectable from "./hosted-cluster.injectable";
 import assert from "assert";
 
 const clusterFrameContextInjectable = getInjectable({
diff --git a/src/common/cluster-store/hosted-cluster-id.injectable.ts b/src/renderer/cluster-frame-context/hosted-cluster-id.injectable.ts
similarity index 87%
rename from src/common/cluster-store/hosted-cluster-id.injectable.ts
rename to src/renderer/cluster-frame-context/hosted-cluster-id.injectable.ts
index 5a5c99c580..854e004796 100644
--- a/src/common/cluster-store/hosted-cluster-id.injectable.ts
+++ b/src/renderer/cluster-frame-context/hosted-cluster-id.injectable.ts
@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { getClusterIdFromHost } from "../utils";
+import { getClusterIdFromHost } from "../../common/utils";
 
 const hostedClusterIdInjectable = getInjectable({
   id: "hosted-cluster-id",
diff --git a/src/common/cluster-store/hosted-cluster.injectable.ts b/src/renderer/cluster-frame-context/hosted-cluster.injectable.ts
similarity index 86%
rename from src/common/cluster-store/hosted-cluster.injectable.ts
rename to src/renderer/cluster-frame-context/hosted-cluster.injectable.ts
index fa49cbca48..a466984952 100644
--- a/src/common/cluster-store/hosted-cluster.injectable.ts
+++ b/src/renderer/cluster-frame-context/hosted-cluster.injectable.ts
@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import hostedClusterIdInjectable from "./hosted-cluster-id.injectable";
-import clusterStoreInjectable from "./cluster-store.injectable";
+import clusterStoreInjectable from "../../common/cluster-store/cluster-store.injectable";
 
 const hostedClusterInjectable = getInjectable({
   id: "hosted-cluster",
diff --git a/src/renderer/components/+add-cluster/add-cluster.tsx b/src/renderer/components/+add-cluster/add-cluster.tsx
index 069846c0ac..c27f3f05a1 100644
--- a/src/renderer/components/+add-cluster/add-cluster.tsx
+++ b/src/renderer/components/+add-cluster/add-cluster.tsx
@@ -134,7 +134,7 @@ class NonInjectedAddCluster extends React.Component {
         {this.allErrors.length > 0 && (
           <>
             
        KubeConfig Yaml Validation Errors:
        
-            {...this.allErrors.map(error => 
        {error}
        )}
+            {this.allErrors.map(error => 
        {error}
        )}
           
         )}
         
        
diff --git a/src/renderer/components/+catalog/catalog-menu.module.scss b/src/renderer/components/+catalog/catalog-menu.module.scss
index de79bb22d2..cafed28964 100644
--- a/src/renderer/components/+catalog/catalog-menu.module.scss
+++ b/src/renderer/components/+catalog/catalog-menu.module.scss
@@ -8,12 +8,15 @@
 }
 
 .parent {
-  @apply uppercase font-bold;
   color: var(--textColorAccent);
   font-size: small;
+  text-transform: uppercase;
+  font-weight: bold;
 }
 
 .catalog {
-  @apply p-5 font-bold text-2xl;
+  font-size: medium;
+  padding: var(--padding) calc(var(--padding) * 1.5);
+  font-weight: bold;
   color: var(--textColorAccent);
 }
diff --git a/src/renderer/components/+catalog/catalog.module.scss b/src/renderer/components/+catalog/catalog.module.scss
index e285fb3ced..74e4bcc80f 100644
--- a/src/renderer/components/+catalog/catalog.module.scss
+++ b/src/renderer/components/+catalog/catalog.module.scss
@@ -48,6 +48,7 @@
     transition: none;
     opacity: 0;
     margin-left: var(--padding);
+    width: calc(var(--unit) * 2);
 
     &:hover {
       /* Drop styles defined for   */
diff --git a/src/renderer/components/+cluster/cluster-no-metrics.tsx b/src/renderer/components/+cluster/cluster-no-metrics.tsx
index 5c981008be..ec039835fc 100644
--- a/src/renderer/components/+cluster/cluster-no-metrics.tsx
+++ b/src/renderer/components/+cluster/cluster-no-metrics.tsx
@@ -11,7 +11,7 @@ import { cssNames } from "../../utils";
 import type { NavigateToEntitySettings } from "../../../common/front-end-routing/routes/entity-settings/navigate-to-entity-settings.injectable";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import navigateToEntitySettingsInjectable from "../../../common/front-end-routing/routes/entity-settings/navigate-to-entity-settings.injectable";
-import hostedClusterInjectable from "../../../common/cluster-store/hosted-cluster.injectable";
+import hostedClusterInjectable from "../../cluster-frame-context/hosted-cluster.injectable";
 
 export interface ClusterNoMetricsProps {
   className: string;
diff --git a/src/renderer/components/+cluster/cluster-overview.tsx b/src/renderer/components/+cluster/cluster-overview.tsx
index f17579e843..1ba8df8401 100644
--- a/src/renderer/components/+cluster/cluster-overview.tsx
+++ b/src/renderer/components/+cluster/cluster-overview.tsx
@@ -24,7 +24,7 @@ import { withInjectables } from "@ogre-tools/injectable-react";
 import clusterOverviewStoreInjectable from "./cluster-overview-store/cluster-overview-store.injectable";
 import type { SubscribeStores } from "../../kube-watch-api/kube-watch-api";
 import type { Cluster } from "../../../common/cluster/cluster";
-import hostedClusterInjectable from "../../../common/cluster-store/hosted-cluster.injectable";
+import hostedClusterInjectable from "../../cluster-frame-context/hosted-cluster.injectable";
 import assert from "assert";
 import subscribeStoresInjectable from "../../kube-watch-api/subscribe-stores.injectable";
 import podStoreInjectable from "../+workloads-pods/store.injectable";
diff --git a/src/renderer/components/+extensions/install-from-input/install-from-input.tsx b/src/renderer/components/+extensions/install-from-input/install-from-input.tsx
index ab85221421..eb5d6febe4 100644
--- a/src/renderer/components/+extensions/install-from-input/install-from-input.tsx
+++ b/src/renderer/components/+extensions/install-from-input/install-from-input.tsx
@@ -14,7 +14,6 @@ import { readFileNotify } from "../read-file-notify/read-file-notify";
 import type { InstallRequest } from "../attempt-install/install-request";
 import type { ExtensionInfo } from "../attempt-install-by-info.injectable";
 import type { ExtensionInstallationStateStore } from "../../../../extensions/extension-installation-state-store/extension-installation-state-store";
-import { AsyncInputValidationError } from "../../input/input_validators";
 
 export type InstallFromInput = (input: string) => Promise;
 
@@ -34,7 +33,7 @@ export const installFromInput = ({
 
     try {
       // fixme: improve error messages for non-tar-file URLs
-      if (InputValidators.isUrl.validate(input, {})) {
+      if (InputValidators.isUrl.validate(input)) {
         // install via url
         disposer = extensionInstallationStateStore.startPreInstall();
         const { promise } = downloadFile({ url: input, timeout: 10 * 60 * 1000 });
@@ -44,23 +43,19 @@ export const installFromInput = ({
       }
 
       try {
-        await InputValidators.isPath.validate(input, {});
+        await InputValidators.isPath.validate(input);
 
         // install from system path
         const fileName = path.basename(input);
 
         return await attemptInstall({ fileName, dataP: readFileNotify(input) });
       } catch (error) {
-        if (error instanceof AsyncInputValidationError) {
-          const extNameCaptures = InputValidators.isExtensionNameInstallRegex.captures(input);
+        const extNameCaptures = InputValidators.isExtensionNameInstallRegex.captures(input);
 
-          if (extNameCaptures) {
-            const { name, version } = extNameCaptures;
+        if (extNameCaptures) {
+          const { name, version } = extNameCaptures;
 
-            return await attemptInstallByInfo({ name, version });
-          }
-        } else {
-          throw error;
+          return await attemptInstallByInfo({ name, version });
         }
       }
 
diff --git a/src/renderer/components/+extensions/install.tsx b/src/renderer/components/+extensions/install.tsx
index 52c0bd8906..7fa192e3a2 100644
--- a/src/renderer/components/+extensions/install.tsx
+++ b/src/renderer/components/+extensions/install.tsx
@@ -13,10 +13,9 @@ import { Input, InputValidators } from "../input";
 import { SubTitle } from "../layout/sub-title";
 import { TooltipPosition } from "../tooltip";
 import type { ExtensionInstallationStateStore } from "../../../extensions/extension-installation-state-store/extension-installation-state-store";
-import extensionInstallationStateStoreInjectable
-  from "../../../extensions/extension-installation-state-store/extension-installation-state-store.injectable";
+import extensionInstallationStateStoreInjectable from "../../../extensions/extension-installation-state-store/extension-installation-state-store.injectable";
 import { withInjectables } from "@ogre-tools/injectable-react";
-import { inputValidator } from "../input/input_validators";
+import { unionInputValidatorsAsync } from "../input/input_validators";
 
 export interface InstallProps {
   installPath: string;
@@ -30,18 +29,14 @@ interface Dependencies {
   extensionInstallationStateStore: ExtensionInstallationStateStore;
 }
 
-const installInputValidators = [
+const installInputValidator = unionInputValidatorsAsync(
+  {
+    message: "Invalid URL, absolute path, or extension name",
+  },
   InputValidators.isUrl,
-  InputValidators.isPath,
   InputValidators.isExtensionNameInstall,
-];
-
-const installInputValidator = inputValidator({
-  message: "Invalid URL, absolute path, or extension name",
-  validate: (value: string, props) => (
-    installInputValidators.some(({ validate }) => validate(value, props))
-  ),
-});
+  InputValidators.isPath,
+);
 
 const NonInjectedInstall: React.FC = ({
   installPath,
diff --git a/src/renderer/components/+extensions/notice.module.scss b/src/renderer/components/+extensions/notice.module.scss
index ec92333704..2f1963b663 100644
--- a/src/renderer/components/+extensions/notice.module.scss
+++ b/src/renderer/components/+extensions/notice.module.scss
@@ -4,8 +4,12 @@
  */
 
 .notice {
-  @apply p-8 flex flex-col gap-2 rounded-lg;
+  display: flex;
+  flex-direction: column;
+  gap: calc(var(--unit) * 2);
   background-color: var(--inputControlBackground);
   border: 1px solid var(--boxShadow);
   color: var(--textColorTertiary);
+  border-radius: 4px;
+  padding: calc(var(--padding) * 2);
 }
diff --git a/src/renderer/components/+helm-charts/helm-chart-details.tsx b/src/renderer/components/+helm-charts/helm-chart-details.tsx
index 04e000bd1f..4e0076e068 100644
--- a/src/renderer/components/+helm-charts/helm-chart-details.tsx
+++ b/src/renderer/components/+helm-charts/helm-chart-details.tsx
@@ -23,6 +23,7 @@ import createInstallChartTabInjectable from "../dock/install-chart/create-instal
 import { Notifications } from "../notifications";
 import HelmLogoPlaceholder from "./helm-placeholder.svg";
 import type { SingleValue } from "react-select";
+import { AbortController } from "abort-controller";
 
 export interface HelmChartDetailsProps {
   chart: HelmChart;
diff --git a/src/renderer/components/+namespaces/namespace-select-filter.scss b/src/renderer/components/+namespaces/namespace-select-filter.scss
index 00e067ddf5..5230fd7a84 100644
--- a/src/renderer/components/+namespaces/namespace-select-filter.scss
+++ b/src/renderer/components/+namespaces/namespace-select-filter.scss
@@ -59,6 +59,8 @@
     &__option {
       white-space: normal;
       word-break: break-all;
+      padding: 4px 8px;
+      border-radius: 3px;
     }
   }
 
diff --git a/src/renderer/components/+namespaces/namespace-select.tsx b/src/renderer/components/+namespaces/namespace-select.tsx
index bcb855d585..6c50f3f921 100644
--- a/src/renderer/components/+namespaces/namespace-select.tsx
+++ b/src/renderer/components/+namespaces/namespace-select.tsx
@@ -82,5 +82,5 @@ const InjectedNamespaceSelect = withInjectables(props: NamespaceSelectProps): JSX.Element {
-  return ;
+  return )} />;
 }
diff --git a/src/renderer/components/+namespaces/store.ts b/src/renderer/components/+namespaces/store.ts
index 1a242839fa..1b2342facf 100644
--- a/src/renderer/components/+namespaces/store.ts
+++ b/src/renderer/components/+namespaces/store.ts
@@ -114,7 +114,7 @@ export class NamespaceStore extends KubeObjectStore {
      * if user has given static list of namespaces let's not start watches
      * because watch adds stuff that's not wanted or will just fail
      */
-    if (this.context.cluster.accessibleNamespaces.length > 0) {
+    if ((this.context?.cluster.accessibleNamespaces.length ?? 0) > 0) {
       return noop;
     }
 
diff --git a/src/renderer/components/+preferences/add-helm-repo-dialog.tsx b/src/renderer/components/+preferences/add-helm-repo-dialog.tsx
deleted file mode 100644
index 60b7ba1d44..0000000000
--- a/src/renderer/components/+preferences/add-helm-repo-dialog.tsx
+++ /dev/null
@@ -1,220 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import "./add-helm-repo-dialog.scss";
-
-import React from "react";
-import type { FileFilter } from "electron";
-import { observable, makeObservable, action } from "mobx";
-import { observer } from "mobx-react";
-import type { DialogProps } from "../dialog";
-import { Dialog } from "../dialog";
-import { Wizard, WizardStep } from "../wizard";
-import { Input } from "../input";
-import { Checkbox } from "../checkbox";
-import { Button } from "../button";
-import { systemName, isUrl, isPath } from "../input/input_validators";
-import { SubTitle } from "../layout/sub-title";
-import { Icon } from "../icon";
-import { Notifications } from "../notifications";
-import { type HelmRepo, HelmRepoManager } from "../../../main/helm/helm-repo-manager";
-import { requestOpenFilePickingDialog } from "../../ipc";
-
-export interface AddHelmRepoDialogProps extends Partial {
-  onAddRepo: () => void;
-}
-
-enum FileType {
-  CaFile = "caFile",
-  KeyFile = "keyFile",
-  CertFile = "certFile",
-}
-
-const dialogState = observable.object({
-  isOpen: false,
-});
-
-function getEmptyRepo(): HelmRepo {
-  return { name: "", url: "", username: "", password: "", insecureSkipTlsVerify: false, caFile: "", keyFile: "", certFile: "" };
-}
-@observer
-export class AddHelmRepoDialog extends React.Component {
-  private static keyExtensions = ["key", "keystore", "jks", "p12", "pfx", "pem"];
-  private static certExtensions = ["crt", "cer", "ca-bundle", "p7b", "p7c", "p7s", "p12", "pfx", "pem"];
-
-  constructor(props: AddHelmRepoDialogProps) {
-    super(props);
-    makeObservable(this);
-  }
-
-  static open() {
-    dialogState.isOpen = true;
-  }
-
-  static close() {
-    dialogState.isOpen = false;
-  }
-
-  @observable helmRepo = getEmptyRepo();
-  @observable showOptions = false;
-
-  @action
-    close = () => {
-      AddHelmRepoDialog.close();
-      this.helmRepo = getEmptyRepo();
-      this.showOptions = false;
-    };
-
-  setFilepath(type: FileType, value: string) {
-    this.helmRepo[type] = value;
-  }
-
-  getFilePath(type: FileType) {
-    return this.helmRepo[type];
-  }
-
-  async selectFileDialog(type: FileType, fileFilter: FileFilter) {
-    const { canceled, filePaths } = await requestOpenFilePickingDialog({
-      defaultPath: this.getFilePath(type),
-      properties: ["openFile", "showHiddenFiles"],
-      message: `Select file`,
-      buttonLabel: `Use file`,
-      filters: [
-        fileFilter,
-        { name: "Any", extensions: ["*"] },
-      ],
-    });
-
-    if (!canceled && filePaths.length) {
-      this.setFilepath(type, filePaths[0]);
-    }
-  }
-
-  async addCustomRepo() {
-    try {
-      await HelmRepoManager.getInstance().addRepo(this.helmRepo);
-      Notifications.ok((
-        <>
-          {"Helm repository "}
-          {this.helmRepo.name}
-          {" has been added."}
-        
-      ));
-      this.props.onAddRepo();
-      this.close();
-    } catch (err) {
-      Notifications.error((
-        <>
-          {"Adding helm branch "}
-          {this.helmRepo.name}
-          {" has failed: "}
-          {String(err)}
-        
-      ));
-    }
-  }
-
-  renderFileInput(placeholder:string, fileType:FileType, fileExtensions:string[]){
-    return (
-      
        
-         this.setFilepath(fileType, v)}
-        />
-         this.selectFileDialog(fileType, { name: placeholder, extensions: fileExtensions })}
-          tooltip="Browse"
-        />
-      
        
-    );
-  }
-
-  renderOptions() {
-    return (
-      <>
-        
-         this.helmRepo.insecureSkipTlsVerify = v}
-        />
-        {this.renderFileInput("Key file", FileType.KeyFile, AddHelmRepoDialog.keyExtensions)}
-        {this.renderFileInput("Ca file", FileType.CaFile, AddHelmRepoDialog.certExtensions)}
-        {this.renderFileInput("Certificate file", FileType.CertFile, AddHelmRepoDialog.certExtensions)}
-        
-         this.helmRepo.username = v}
-        />
-         this.helmRepo.password = v}
-        />
-      
-    );
-  }
-
-  render() {
-    const { ...dialogProps } = this.props;
-
-    const header = 
        Add custom Helm Repo
        ;
-
-    return (
-      
-        
-           this.addCustomRepo()}
-          >
-            
        
-               this.helmRepo.name = v}
-              />
-               this.helmRepo.url = v}
-              />
-              
-              {this.showOptions && this.renderOptions()}
-            
        
-                  
-                
-              
-    );
-  }
-}
diff --git a/src/renderer/components/+preferences/helm-charts.tsx b/src/renderer/components/+preferences/helm-charts.tsx
deleted file mode 100644
index d4f67902a6..0000000000
--- a/src/renderer/components/+preferences/helm-charts.tsx
+++ /dev/null
@@ -1,202 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import styles from "./helm-charts.module.scss";
-
-import React from "react";
-import { observable, makeObservable, computed } from "mobx";
-
-import type { HelmRepo } from "../../../main/helm/helm-repo-manager";
-import { HelmRepoManager } from "../../../main/helm/helm-repo-manager";
-import { Button } from "../button";
-import { Icon } from "../icon";
-import { Notifications } from "../notifications";
-import type { SelectOption } from "../select";
-import { Select } from "../select";
-import { AddHelmRepoDialog } from "./add-helm-repo-dialog";
-import { observer } from "mobx-react";
-import { RemovableItem } from "./removable-item";
-import { Notice } from "../+extensions/notice";
-import { Spinner } from "../spinner";
-import { noop } from "../../utils";
-import type { SingleValue } from "react-select";
-
-@observer
-export class HelmCharts extends React.Component {
-  @observable loadingRepos = false;
-  @observable loadingAvailableRepos = false;
-  @observable repos: HelmRepo[] = [];
-  @observable addedRepos = observable.map();
-
-  constructor(props: {}) {
-    super(props);
-    makeObservable(this);
-  }
-
-  @computed get repoOptions() {
-    return this.repos.map(repo => ({
-      value: repo,
-      label: repo.name,
-      isSelected: this.addedRepos.has(repo.name),
-    }));
-  }
-
-  componentDidMount() {
-    this.loadAvailableRepos().catch(noop);
-    this.loadRepos().catch(noop);
-  }
-
-  async loadAvailableRepos() {
-    this.loadingAvailableRepos = true;
-
-    try {
-      if (!this.repos.length) {
-        this.repos = await HelmRepoManager.getInstance().loadAvailableRepos();
-      }
-    } catch (err) {
-      Notifications.error(String(err));
-    }
-
-    this.loadingAvailableRepos = false;
-  }
-
-  async loadRepos() {
-    this.loadingRepos = true;
-
-    try {
-      const repos = await HelmRepoManager.getInstance().repositories(); // via helm-cli
-
-      this.addedRepos.replace(repos.map(repo => [repo.name, repo]));
-    } catch (err) {
-      Notifications.error(String(err));
-    }
-
-    this.loadingRepos = false;
-  }
-
-  async addRepo(repo: HelmRepo) {
-    try {
-      await HelmRepoManager.getInstance().addRepo(repo);
-      this.addedRepos.set(repo.name, repo);
-    } catch (err) {
-      Notifications.error((
-        <>
-          {"Adding helm branch "}
-          {repo.name}
-          {" has failed: "}
-          {String(err)}
-        
-      ));
-    }
-  }
-
-  async removeRepo(repo: HelmRepo) {
-    try {
-      await HelmRepoManager.getInstance().removeRepo(repo);
-      this.addedRepos.delete(repo.name);
-    } catch (err) {
-      Notifications.error(
-        <>
-          {"Removing helm branch "}
-          {repo.name}
-          {" has failed: "}
-          {String(err)}
-        ,
-      );
-    }
-  }
-
-  onRepoSelect = async (option: SingleValue<{ value: HelmRepo }>): Promise => {
-    if (!option) {
-      return;
-    }
-
-    if (this.addedRepos.has(option.value.name)) {
-      return void Notifications.ok((
-        <>
-          {"Helm repo "}
-          {option.value.name}
-          {" already in use."}
-        
-      ));
-    }
-
-    await this.addRepo(option.value);
-  };
-
-  formatOptionLabel = ({ value, isSelected }: SelectOption) => (
-    
        
-      {value.name}
-      {isSelected && (
-        
-      )}
-    
        
-  );
-
-  renderRepositories() {
-    const repos = Array.from(this.addedRepos);
-
-    if (this.loadingRepos) {
-      return 
        ;
-    }
-
-    if (!repos.length) {
-      return (
-        
-          
        The repositories have not been added yet
        
-                
-      );
-    }
-
-    return repos.map(([name, repo]) => {
-      return (
-         this.removeRepo(repo)}
-          className="mt-3"
-        >
-          
        
-            
        {name}
        
-            
        {repo.url}
        
-          
        
-                
-      );
-    });
-  }
-
-  render() {
-    return (
-      
        
-        
        
-           helmRepo.name = v)}
+          data-testid="custom-helm-repository-name-input"
+        />
+         helmRepo.url = v)}
+          data-testid="custom-helm-repository-url-input"
+        />
+        
+
+        {maximalOptionsAreShown.get() && (
+          
        
+            
+
+             {
+                helmRepo.insecureSkipTlsVerify = v;
+              })}
+              data-testid="custom-helm-repository-verify-tls-input"
+            />
+
+             helmRepo.keyFile = value)}
+              fileExtensions={keyExtensions}
+              data-testid="custom-helm-repository-key-file-input"
+            />
+
+             helmRepo.caFile = value)}
+              fileExtensions={certExtensions}
+              data-testid="custom-helm-repository-ca-cert-file-input"
+            />
+
+             helmRepo.certFile = value)}
+              fileExtensions={certExtensions}
+              data-testid="custom-helm-repository-cert-file-input"
+            />
+
+            
+
+             helmRepo.username = v)}
+              data-testid="custom-helm-repository-username-input"
+            />
+             helmRepo.password = v)}
+              data-testid="custom-helm-repository-password-input"
+            />
+          
        
+        )}
+      
        
+    
+  
+));
+
+
+
+export const AddingOfCustomHelmRepositoryDialogContent = withInjectables(
+  NonInjectedActivationOfCustomHelmRepositoryDialogContent,
+
+  {
+    getProps: (di) => ({
+      helmRepo: di.inject(customHelmRepoInjectable),
+      hideDialog: di.inject(hideDialogForAddingCustomHelmRepositoryInjectable),
+      submitCustomRepository: di.inject(submitCustomHelmRepositoryInjectable),
+      maximalOptionsAreShown: di.inject(maximalCustomHelmRepoOptionsAreShownInjectable),
+    }),
+  },
+);
+
+const keyExtensions = ["key", "keystore", "jks", "p12", "pfx", "pem"];
+const certExtensions = ["crt", "cer", "ca-bundle", "p7b", "p7c", "p7s", "p12", "pfx", "pem"];
+
diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-dialog.tsx b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-dialog.tsx
new file mode 100644
index 0000000000..3c6a2da9a4
--- /dev/null
+++ b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-dialog.tsx
@@ -0,0 +1,47 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+
+import "./add-helm-repo-dialog.scss";
+
+import React from "react";
+import { Dialog } from "../../../../dialog";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import { AddingOfCustomHelmRepositoryDialogContent } from "./adding-of-custom-helm-repository-dialog-content";
+import addingOfCustomHelmRepositoryDialogIsVisibleInjectable from "./dialog-visibility/adding-of-custom-helm-repository-dialog-is-visible.injectable";
+import type { IObservableValue } from "mobx";
+import { observer } from "mobx-react";
+import hideDialogForAddingCustomHelmRepositoryInjectable from "./dialog-visibility/hide-dialog-for-adding-custom-helm-repository.injectable";
+
+interface Dependencies {
+  contentIsVisible: IObservableValue;
+  hideDialog: () => void;
+}
+
+const NonInjectedActivationOfCustomHelmRepositoryDialog = observer(({
+  contentIsVisible,
+  hideDialog,
+}: Dependencies) => (
+  
        
+    
+      {contentIsVisible.get() && }
+    
+  
        
+));
+
+
+export const AddingOfCustomHelmRepositoryDialog = withInjectables(
+  NonInjectedActivationOfCustomHelmRepositoryDialog,
+
+  {
+    getProps: (di) => ({
+      contentIsVisible: di.inject(addingOfCustomHelmRepositoryDialogIsVisibleInjectable),
+      hideDialog: di.inject(hideDialogForAddingCustomHelmRepositoryInjectable),
+    }),
+  },
+);
diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-open-button.tsx b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-open-button.tsx
new file mode 100644
index 0000000000..99f16a83ed
--- /dev/null
+++ b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-open-button.tsx
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { withInjectables } from "@ogre-tools/injectable-react";
+import React from "react";
+import { Button } from "../../../../button";
+import showDialogForAddingCustomHelmRepositoryInjectable from "./dialog-visibility/show-dialog-for-adding-custom-helm-repository.injectable";
+
+interface Dependencies {
+  showDialog: () => void;
+}
+
+const NonInjectedActivationOfCustomHelmRepositoryOpenButton = ({ showDialog }: Dependencies) => (
+