diff --git a/src/extensions/__tests__/extension-loader.test.ts b/src/extensions/__tests__/extension-loader.test.ts
index ef10b418c2..6e9c7cd0f9 100644
--- a/src/extensions/__tests__/extension-loader.test.ts
+++ b/src/extensions/__tests__/extension-loader.test.ts
@@ -15,6 +15,7 @@ import { getDiForUnitTesting } from "../../renderer/getDiForUnitTesting";
import ipcRendererInjectable from "../../renderer/utils/channel/ipc-renderer.injectable";
import type { IpcRenderer } from "electron";
import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import currentlyInClusterFrameInjectable from "../../renderer/routes/currently-in-cluster-frame.injectable";
console = new Console(stdout, stderr);
@@ -30,6 +31,7 @@ describe("ExtensionLoader", () => {
const di = getDiForUnitTesting({ doGeneralOverrides: true });
di.override(directoryForUserDataInjectable, () => "/some-directory-for-user-data");
+ di.override(currentlyInClusterFrameInjectable, () => false);
di.override(ipcRendererInjectable, () => ({
invoke: jest.fn(async (channel: string) => {
diff --git a/src/features/preferences/__snapshots__/closing-preferences.test.tsx.snap b/src/features/preferences/__snapshots__/closing-preferences.test.tsx.snap
index cbff9001ad..23530d3cb7 100644
--- a/src/features/preferences/__snapshots__/closing-preferences.test.tsx.snap
+++ b/src/features/preferences/__snapshots__/closing-preferences.test.tsx.snap
@@ -194,7 +194,7 @@ exports[`preferences - closing-preferences given accessing preferences directly
class="SubTitle"
>
Theme
-
+
Extension Install Registry
-
+
- This setting is to change the registry URL for installing extensions by name.
- If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
+ This setting is to change the registry URL for installing extensions by name.
+ If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
.npmrc
@@ -403,7 +403,7 @@ exports[`preferences - closing-preferences given accessing preferences directly
class="SubTitle"
>
Start-up
-
+
Update Channel
-
+
Locale Timezone
-
+
Theme
-
+
Extension Install Registry
-
+
- This setting is to change the registry URL for installing extensions by name.
- If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
+ This setting is to change the registry URL for installing extensions by name.
+ If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
.npmrc
@@ -1925,7 +1925,7 @@ exports[`preferences - closing-preferences given already in a page and then navi
class="SubTitle"
>
Start-up
-
+
Update Channel
-
+
Locale Timezone
-
+
Theme
-
+
Extension Install Registry
-
+
- This setting is to change the registry URL for installing extensions by name.
- If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
+ This setting is to change the registry URL for installing extensions by name.
+ If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
.npmrc
@@ -416,7 +416,7 @@ exports[`preferences: extension adding preference tabs given in preferences, whe
class="SubTitle"
>
Start-up
-
+
Update Channel
-
+
Locale Timezone
-
+
Theme
-
+
Extension Install Registry
-
+
- This setting is to change the registry URL for installing extensions by name.
- If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
+ This setting is to change the registry URL for installing extensions by name.
+ If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
.npmrc
@@ -391,7 +391,7 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
class="SubTitle"
>
Start-up
-
+
Update Channel
-
+
Locale Timezone
-
+
Theme
-
+
Extension Install Registry
-
+
- This setting is to change the registry URL for installing extensions by name.
- If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
+ This setting is to change the registry URL for installing extensions by name.
+ If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
.npmrc
@@ -1169,7 +1169,7 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
class="SubTitle"
>
Start-up
-
+
Update Channel
-
+
Locale Timezone
-
+
Theme
-
+
Extension Install Registry
-
+
- This setting is to change the registry URL for installing extensions by name.
- If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
+ This setting is to change the registry URL for installing extensions by name.
+ If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
.npmrc
@@ -1959,7 +1959,7 @@ exports[`preferences - hiding-of-empty-branches, given in preferences page given
class="SubTitle"
>
Start-up
-
+
Update Channel
-
+
Locale Timezone
-
+
Theme
-
+
Extension Install Registry
-
+
- This setting is to change the registry URL for installing extensions by name.
- If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
+ This setting is to change the registry URL for installing extensions by name.
+ If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
.npmrc
@@ -391,7 +391,7 @@ exports[`preferences - navigation to application preferences given in preference
class="SubTitle"
>
Start-up
-
+
Update Channel
-
+
Locale Timezone
-
+
Theme
-
+
Extension Install Registry
-
+
- This setting is to change the registry URL for installing extensions by name.
- If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
+ This setting is to change the registry URL for installing extensions by name.
+ If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
.npmrc
@@ -1141,7 +1141,7 @@ exports[`preferences - navigation to application preferences given in preference
class="SubTitle"
>
Start-up
-
+
Update Channel
-
+
Locale Timezone
-
+
Some application-preference item
-
+
HTTP Proxy
-
+
Certificate Trust
-
+
Theme
-
+
Extension Install Registry
-
+
- This setting is to change the registry URL for installing extensions by name.
- If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
+ This setting is to change the registry URL for installing extensions by name.
+ If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
.npmrc
@@ -2328,7 +2328,7 @@ exports[`preferences - navigation to application preferences given in some child
class="SubTitle"
>
Start-up
-
+
Update Channel
-
+
Locale Timezone
-
+
Theme
-
+
Extension Install Registry
-
+
- This setting is to change the registry URL for installing extensions by name.
- If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
+ This setting is to change the registry URL for installing extensions by name.
+ If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
.npmrc
@@ -3079,7 +3079,7 @@ exports[`preferences - navigation to application preferences given in some child
class="SubTitle"
>
Start-up
-
+
Update Channel
-
+
Locale Timezone
-
+
Theme
-
+
Extension Install Registry
-
+
- This setting is to change the registry URL for installing extensions by name.
- If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
+ This setting is to change the registry URL for installing extensions by name.
+ If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
.npmrc
@@ -391,7 +391,7 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
class="SubTitle"
>
Start-up
-
+
Update Channel
-
+
Locale Timezone
-
+
Minimap
-
+
Line numbers
-
+
Tab size
-
+
Font size
-
+
Font family
-
+
Theme
-
+
Extension Install Registry
-
+
- This setting is to change the registry URL for installing extensions by name.
- If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
+ This setting is to change the registry URL for installing extensions by name.
+ If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
.npmrc
@@ -404,7 +404,7 @@ exports[`preferences - navigation to extension specific preferences given in pre
class="SubTitle"
>
Start-up
-
+
Update Channel
-
+
Locale Timezone
-
+
License item
-
+
License item
-
+
Another metrics
-
+
Some preference item
-
+
Theme
-
+
Extension Install Registry
-
+
- This setting is to change the registry URL for installing extensions by name.
- If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
+ This setting is to change the registry URL for installing extensions by name.
+ If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
.npmrc
@@ -2733,7 +2733,7 @@ exports[`preferences - navigation to extension specific preferences given in pre
class="SubTitle"
>
Start-up
-
+
Update Channel
-
+
Locale Timezone
-
+
Theme
-
+
Extension Install Registry
-
+
- This setting is to change the registry URL for installing extensions by name.
- If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
+ This setting is to change the registry URL for installing extensions by name.
+ If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
.npmrc
@@ -3521,7 +3521,7 @@ exports[`preferences - navigation to extension specific preferences given in pre
class="SubTitle"
>
Start-up
-
+
Update Channel
-
+
Locale Timezone
-
+
Some preference item
-
+
Theme
-
+
Extension Install Registry
-
+
- This setting is to change the registry URL for installing extensions by name.
- If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
+ This setting is to change the registry URL for installing extensions by name.
+ If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
.npmrc
@@ -391,7 +391,7 @@ exports[`preferences - navigation to proxy preferences given in preferences, whe
class="SubTitle"
>
Start-up
-
+
Update Channel
-
+
Locale Timezone
-
+
HTTP Proxy
-
+
Certificate Trust
-
+
Automatic Error Reporting
-
+
Theme
-
+
Extension Install Registry
-
+
- This setting is to change the registry URL for installing extensions by name.
- If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
+ This setting is to change the registry URL for installing extensions by name.
+ If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
.npmrc
@@ -781,7 +781,7 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
class="SubTitle"
>
Start-up
-
+
Update Channel
-
+
Locale Timezone
-
+
Theme
-
+
Extension Install Registry
-
+
- This setting is to change the registry URL for installing extensions by name.
- If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
+ This setting is to change the registry URL for installing extensions by name.
+ If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
.npmrc
@@ -1543,7 +1543,7 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
class="SubTitle"
>
Start-up
-
+
Update Channel
-
+
Locale Timezone
-
+
Some telemetry-preference item
-
+
Theme
-
+
Extension Install Registry
-
+
- This setting is to change the registry URL for installing extensions by name.
- If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
+ This setting is to change the registry URL for installing extensions by name.
+ If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
.npmrc
@@ -391,7 +391,7 @@ exports[`preferences - navigation to terminal preferences given in preferences,
class="SubTitle"
>
Start-up
-
+
Update Channel
-
+
Locale Timezone
-
+
Terminal Shell Path
-
+
Terminal copy & paste
-
+
Terminal theme
-
+
Font size
-
+
Font family
-
+
To get you started we have auto-detected your clusters in your
-
+
kubeconfig file and added them to the catalog, your centralized
-
+
view for managing all your cloud-native resources.
- If you have any questions or feedback, please join our
+ If you have any questions or feedback, please join our
Theme
-
+
Extension Install Registry
-
+
- This setting is to change the registry URL for installing extensions by name.
- If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
+ This setting is to change the registry URL for installing extensions by name.
+ If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
.npmrc
@@ -674,7 +674,7 @@ exports[`preferences - navigation using application menu when navigating to pref
class="SubTitle"
>
Start-up
-
+
Update Channel
-
+
Locale Timezone
-
+
To get you started we have auto-detected your clusters in your
-
+
kubeconfig file and added them to the catalog, your centralized
-
+
view for managing all your cloud-native resources.
- If you have any questions or feedback, please join our
+ If you have any questions or feedback, please join our
Theme
-
+
Extension Install Registry
-
+
- This setting is to change the registry URL for installing extensions by name.
- If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
+ This setting is to change the registry URL for installing extensions by name.
+ If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
.npmrc
@@ -677,7 +677,7 @@ exports[`show-about-using-tray when navigating using tray renders 1`] = `
class="SubTitle"
>
Start-up
-
+
Update Channel
-
+
Locale Timezone
-
+
To get you started we have auto-detected your clusters in your
-
+
kubeconfig file and added them to the catalog, your centralized
-
+
view for managing all your cloud-native resources.
- If you have any questions or feedback, please join our
+ If you have any questions or feedback, please join our
Theme
-
+
Extension Install Registry
-
+
- This setting is to change the registry URL for installing extensions by name.
- If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
+ This setting is to change the registry URL for installing extensions by name.
+ If you are unable to access the default registry (https://registry.npmjs.org) you can change it in your
.npmrc
@@ -675,7 +675,7 @@ exports[`welcome - navigation using application menu when navigated somewhere el
class="SubTitle"
>
Start-up
-
+
Update Channel
-
+
Locale Timezone
-
+
To get you started we have auto-detected your clusters in your
-
+
kubeconfig file and added them to the catalog, your centralized
-
+
view for managing all your cloud-native resources.
- If you have any questions or feedback, please join our
+ If you have any questions or feedback, please join our
{
di = getDiForUnitTesting({ doGeneralOverrides: true });
di.override(hotbarStoreInjectable, () => ({}));
+ di.override(currentlyInClusterFrameInjectable, () => false);
+
getCategoryColumns = di.inject(getCategoryColumnsInjectable);
});
diff --git a/src/renderer/components/+catalog/catalog.test.tsx b/src/renderer/components/+catalog/catalog.test.tsx
index fca196c99f..334970e166 100644
--- a/src/renderer/components/+catalog/catalog.test.tsx
+++ b/src/renderer/components/+catalog/catalog.test.tsx
@@ -29,6 +29,7 @@ import { flushPromises } from "../../../common/test-utils/flush-promises";
import userStoreInjectable from "../../../common/user-store/user-store.injectable";
import releaseChannelInjectable from "../../../common/vars/release-channel.injectable";
import defaultUpdateChannelInjectable from "../../../features/application-update/common/selected-update-channel/default-update-channel.injectable";
+import currentlyInClusterFrameInjectable from "../../routes/currently-in-cluster-frame.injectable";
class MockCatalogEntity extends CatalogEntity {
public apiVersion = "api";
@@ -68,7 +69,7 @@ describe(" ", () => {
di = getDiForUnitTesting({ doGeneralOverrides: true });
di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data");
-
+ di.override(currentlyInClusterFrameInjectable, () => false);
di.override(broadcastMessageInjectable, () => async () => {});
di.permitSideEffects(getConfigurationFileModelInjectable);
diff --git a/src/renderer/components/+extensions/__tests__/extensions.test.tsx b/src/renderer/components/+extensions/__tests__/extensions.test.tsx
index eda87edddb..b17b6bc782 100644
--- a/src/renderer/components/+extensions/__tests__/extensions.test.tsx
+++ b/src/renderer/components/+extensions/__tests__/extensions.test.tsx
@@ -29,6 +29,7 @@ import type { DownloadJson } from "../../../../common/fetch/download-json.inject
import type { DownloadBinary } from "../../../../common/fetch/download-binary.injectable";
import downloadJsonInjectable from "../../../../common/fetch/download-json.injectable";
import downloadBinaryInjectable from "../../../../common/fetch/download-binary.injectable";
+import currentlyInClusterFrameInjectable from "../../../routes/currently-in-cluster-frame.injectable";
describe("Extensions", () => {
let extensionLoader: ExtensionLoader;
@@ -45,6 +46,7 @@ describe("Extensions", () => {
di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data");
di.override(directoryForDownloadsInjectable, () => "some-directory-for-downloads");
+ di.override(currentlyInClusterFrameInjectable, () => false);
render = renderFor(di);
diff --git a/src/renderer/components/+welcome/__test__/welcome.test.tsx b/src/renderer/components/+welcome/__test__/welcome.test.tsx
index 13f338e7d4..564b8b73f5 100644
--- a/src/renderer/components/+welcome/__test__/welcome.test.tsx
+++ b/src/renderer/components/+welcome/__test__/welcome.test.tsx
@@ -15,6 +15,7 @@ import type { DiContainer } from "@ogre-tools/injectable";
import rendererExtensionsInjectable from "../../../../extensions/renderer-extensions.injectable";
import { LensRendererExtension } from "../../../../extensions/lens-renderer-extension";
import type { WelcomeBannerRegistration } from "../welcome-banner-items/welcome-banner-registration";
+import currentlyInClusterFrameInjectable from "../../../routes/currently-in-cluster-frame.injectable";
jest.mock("electron", () => ({
ipcRenderer: {
@@ -32,6 +33,9 @@ describe(" ", () => {
beforeEach(() => {
di = getDiForUnitTesting({ doGeneralOverrides: true });
+
+ di.override(currentlyInClusterFrameInjectable, () => false);
+
render = renderFor(di);
welcomeBannersStub = [];
diff --git a/src/renderer/components/layout/top-bar/top-bar.test.tsx b/src/renderer/components/layout/top-bar/top-bar.test.tsx
index 749b3c7c26..10a1ec11d4 100644
--- a/src/renderer/components/layout/top-bar/top-bar.test.tsx
+++ b/src/renderer/components/layout/top-bar/top-bar.test.tsx
@@ -21,6 +21,7 @@ import toggleMaximizeWindowInjectable from "./toggle-maximize-window/toggle-maxi
import topBarStateInjectable from "./state.injectable";
import platformInjectable from "../../../../common/vars/platform.injectable";
import goForwardInjectable from "./top-bar-items/navigation-to-forward/go-forward/go-forward.injectable";
+import currentlyInClusterFrameInjectable from "../../../routes/currently-in-cluster-frame.injectable";
describe(" ", () => {
let di: DiContainer;
@@ -42,6 +43,7 @@ describe(" ", () => {
di.override(closeWindowInjectable, () => closeWindow = jest.fn());
di.override(maximizeWindowInjectable, () => maximizeWindow = jest.fn());
di.override(toggleMaximizeWindowInjectable, () => toggleMaximizeWindow = jest.fn());
+ di.override(currentlyInClusterFrameInjectable, () => false);
render = renderFor(di);
});
diff --git a/src/renderer/frames/cluster-frame/cluster-frame.test.tsx b/src/renderer/frames/cluster-frame/cluster-frame.test.tsx
index bee7d3a415..f95a80fee2 100644
--- a/src/renderer/frames/cluster-frame/cluster-frame.test.tsx
+++ b/src/renderer/frames/cluster-frame/cluster-frame.test.tsx
@@ -25,6 +25,7 @@ import allowedResourcesInjectable from "../../cluster-frame-context/allowed-reso
import hostedClusterIdInjectable from "../../cluster-frame-context/hosted-cluster-id.injectable";
import hostedClusterInjectable from "../../cluster-frame-context/hosted-cluster.injectable";
import { useFakeTime } from "../../../common/test-utils/use-fake-time";
+import currentlyInClusterFrameInjectable from "../../routes/currently-in-cluster-frame.injectable";
describe(" ", () => {
let render: () => RenderResult;
@@ -45,6 +46,7 @@ describe(" ", () => {
di.override(legacyOnChannelListenInjectable, () => jest.fn().mockImplementation(() => jest.fn()));
di.override(directoryForUserDataInjectable, () => "/some/irrelavent/path");
di.override(storesAndApisCanBeCreatedInjectable, () => true);
+ di.override(currentlyInClusterFrameInjectable, () => true);
useFakeTime("2000-01-01 12:00:00am");