mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
Remove a lot of usages of legacy globals (#6825)
* Remove all usages of legacy global logger Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove usages of legacy global storageClassApi Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove usages of legacy global serviceApi Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove usages of legacy global secretApi Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove usages of legacy global resourceQuotaApi Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove usages of legacy global persistentVolumeClaimApi Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove usages of legacy global nodeApi Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove usages of legacy global networkPolicyApi Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix formatting Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove usages of legacy global configMapApi Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove usages of legacy global jobApi Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove usages of legacy global cronJobApi Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove usages of legacy global podApi Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove usages of legacy global roleApi Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove exports of NonInjected components - To improve auto-complete Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove usages of legacy global catalogEntityRegistry Signed-off-by: Sebastian Malton <sebastian@malton.name> * Add lint against using legacy global works Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix lint in KubeObject file Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove usages of legacy global catalogCategoryRegistry Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove usages of legacy global navigation Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove usages of legacy global navigate Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove unneeded index file Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove usages of legacy global customResourceDefinitionStore Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove usages of legacy global eventStore Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove usages of legacy global podSecurityPolicyStore Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove usages of legacy global storageClassStore Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove usages of legacy global persistentVolumeStore Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove usages of legacy global clusterRoleBindingStore Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove usages of legacy global clusterRoleStore Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove usages of legacy global roleBindingStore Signed-off-by: Sebastian Malton <sebastian@malton.name> * Move files around Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove usages of legacy global roleStore Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove usages of legacy global serviceAccountStore Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove usages of legacy global podStore Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove final uses of asLegacyGlobalForExtensionApi in application code Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix lint rule and start fixing lint errors Signed-off-by: Sebastian Malton <sebastian@malton.name> * Make listHelmReleases injectable Signed-off-by: Sebastian Malton <sebastian@malton.name> * Make installHelmChart injectable Signed-off-by: Sebastian Malton <sebastian@malton.name> * Make deleteHelmRelease injectable Signed-off-by: Sebastian Malton <sebastian@malton.name> * Make getHelmReleaseValues injectable Signed-off-by: Sebastian Malton <sebastian@malton.name> * Make getHelmReleaseHistory injectable Signed-off-by: Sebastian Malton <sebastian@malton.name> * Make rollbackHelmRelease injectable Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove unnecessary overrides from getDiForUnitTesting Signed-off-by: Sebastian Malton <sebastian@malton.name> * Add global override for logger Signed-off-by: Sebastian Malton <sebastian@malton.name> * Add global override for history Signed-off-by: Sebastian Malton <sebastian@malton.name> * Cleanup typing around getting injectables within jest Signed-off-by: Sebastian Malton <sebastian@malton.name> * Move some more overrides to global if needed Signed-off-by: Sebastian Malton <sebastian@malton.name> * Add global override for forcusWindow Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix lint in KubeApi Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix lint in catalog/index.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove last usages of legacy global getDetailsUrl Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove last usages of legacy global showDetails Signed-off-by: Sebastian Malton <sebastian@malton.name> * Add functions back to extension API Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove all uses of legacy global Notification functions Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove no longer existing export Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove unnecessary overrides Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix injecting side effects by using more injectables Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix cluster role binding dialog Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix cluster role dialog Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix create service account dialog Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix history override Signed-off-by: Sebastian Malton <sebastian@malton.name> * Make KubeApi consume its dependencies while not breaking the extension API Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * Update snapshots Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix CephFs tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix user store tests by using override of config Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove use of mockFs in hotbar store tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * Add direct devDep of memfs Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove use of mockFs in cluster store tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove use of mockFs in router tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove use of mockFs in kube auth proxy tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove use of mockFs in log resource selector tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove use of mockFs in hotbar remove command tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove use of mockFs in the select component tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove mock-fs as a dependency Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove no longer necessary mocks Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix namespace select filter tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove use of mockFs in the extension loader tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fixing edit-namespace-from-new-tab test Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix app paths tests by making the tests run in "production" mode Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove last vestiges of isTestEnv and the is* globals Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix delete-cluster-dialog tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix install-helm-chart-from-previously-opened-tab tests - Split out storage initialization to a runnable Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove unnecessary override of non side effect injectable Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix disable-kube-object-detail-items-when-cluster-is-not-relevant tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix reactively-hide-kube-object-detail-item tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix lint Signed-off-by: Sebastian Malton <sebastian@malton.name> * Update snapshots Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix sidebar-and-tab-navigation-for-core tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove need to override lensLocalStoragePath in tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * Replace more overrides with global ones Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix typings Signed-off-by: Sebastian Malton <sebastian@malton.name> * Remove no longer needed technical test Signed-off-by: Sebastian Malton <sebastian@malton.name> * Update snapshots Signed-off-by: Sebastian Malton <sebastian@malton.name> Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
1 parent
900a8bbda3
commit
2b33d5eed6
530 files changed
+11320
-5399
No files matched your search
@@ -0,0 +1,10 @@
|
||||
/**
|
||||
* Copyright (c) OpenLens Authors. All rights reserved.
|
||||
* Licensed under MIT License. See LICENSE in root directory for more information.
|
||||
*/
|
||||
import type { KubeConfig } from "@kubernetes/client-node";
|
||||
import type { Cluster } from "../../../common/cluster/cluster";
|
||||
|
||||
export function isCurrentContext(config: KubeConfig, cluster: Cluster) {
|
||||
return config.currentContext == cluster.contextName;
|
||||
}
|
||||
@@ -2,18 +2,25 @@
|
||||
* Copyright (c) OpenLens Authors. All rights reserved.
|
||||
* Licensed under MIT License. See LICENSE in root directory for more information.
|
||||
*/
|
||||
import type { KubeConfig } from "@kubernetes/client-node";
|
||||
import { getInjectable } from "@ogre-tools/injectable";
|
||||
import type { DeleteClusterDialogState } from "./state.injectable";
|
||||
import type { Cluster } from "../../../common/cluster/cluster";
|
||||
import { isCurrentContext } from "./is-current-context";
|
||||
import deleteClusterDialogStateInjectable from "./state.injectable";
|
||||
|
||||
export type OpenDeleteClusterDialog = (props: DeleteClusterDialogState) => void;
|
||||
export type OpenDeleteClusterDialog = (config: KubeConfig, cluster: Cluster) => void;
|
||||
|
||||
const openDeleteClusterDialogInjectable = getInjectable({
|
||||
id: "open-delete-cluster-dialog",
|
||||
instantiate: (di): OpenDeleteClusterDialog => {
|
||||
const state = di.inject(deleteClusterDialogStateInjectable);
|
||||
|
||||
return (props) => state.set(props);
|
||||
return (config, cluster) => state.set({
|
||||
cluster,
|
||||
config,
|
||||
newCurrentContext: "",
|
||||
showContextSwitch: isCurrentContext(config, cluster),
|
||||
});
|
||||
},
|
||||
});
|
||||
|
||||
|
||||
@@ -10,6 +10,8 @@ import type { Cluster } from "../../../common/cluster/cluster";
|
||||
export interface DeleteClusterDialogState {
|
||||
config: KubeConfig;
|
||||
cluster: Cluster;
|
||||
showContextSwitch: boolean;
|
||||
newCurrentContext: string;
|
||||
}
|
||||
|
||||
const deleteClusterDialogStateInjectable = getInjectable({
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
import styles from "./view.module.scss";
|
||||
|
||||
import type { IObservableValue } from "mobx";
|
||||
import { action, observable } from "mobx";
|
||||
import { runInAction } from "mobx";
|
||||
import { observer } from "mobx-react";
|
||||
import React from "react";
|
||||
|
||||
@@ -29,6 +29,7 @@ import requestDeleteClusterInjectable from "../../../features/cluster/delete-dia
|
||||
import type { SaveKubeconfig } from "./save-kubeconfig.injectable";
|
||||
import saveKubeconfigInjectable from "./save-kubeconfig.injectable";
|
||||
import showErrorNotificationInjectable from "../notifications/show-error-notification.injectable";
|
||||
import { isCurrentContext } from "./is-current-context";
|
||||
|
||||
interface Dependencies {
|
||||
state: IObservableValue<DeleteClusterDialogState | undefined>;
|
||||
@@ -42,40 +43,22 @@ interface Dependencies {
|
||||
|
||||
@observer
|
||||
class NonInjectedDeleteClusterDialog extends React.Component<Dependencies> {
|
||||
private readonly showContextSwitch = observable.box(false);
|
||||
private readonly newCurrentContext = observable.box<string | undefined>();
|
||||
|
||||
@action
|
||||
onOpen(state: DeleteClusterDialogState) {
|
||||
this.newCurrentContext.set("");
|
||||
this.showContextSwitch.set(this.isCurrentContext(state));
|
||||
}
|
||||
|
||||
onClose = () => {
|
||||
this.showContextSwitch.set(false);
|
||||
};
|
||||
|
||||
removeContext(state: DeleteClusterDialogState) {
|
||||
state.config.contexts = state.config.contexts.filter(item =>
|
||||
item.name !== state.cluster.contextName,
|
||||
);
|
||||
}
|
||||
|
||||
changeCurrentContext(state: DeleteClusterDialogState) {
|
||||
const newCurrentContext = this.newCurrentContext.get();
|
||||
const showContextSwitch = this.showContextSwitch.get();
|
||||
|
||||
if (newCurrentContext && showContextSwitch) {
|
||||
state.config.currentContext = newCurrentContext;
|
||||
}
|
||||
}
|
||||
|
||||
async onDelete(state: DeleteClusterDialogState) {
|
||||
const { cluster, config } = state;
|
||||
const { cluster, config, newCurrentContext, showContextSwitch } = state;
|
||||
|
||||
await this.props.requestSetClusterAsDeleting(cluster.id);
|
||||
this.removeContext(state);
|
||||
this.changeCurrentContext(state);
|
||||
|
||||
runInAction(() => {
|
||||
this.props.state.set({
|
||||
...state,
|
||||
config: Object.assign(config, {
|
||||
contexts: config.contexts.filter(item => item.name !== state.cluster.contextName),
|
||||
currentContext: newCurrentContext && showContextSwitch
|
||||
? newCurrentContext
|
||||
: config.currentContext,
|
||||
}),
|
||||
});
|
||||
});
|
||||
|
||||
try {
|
||||
await this.props.saveKubeconfig(config, cluster.kubeConfigPath);
|
||||
@@ -85,15 +68,13 @@ class NonInjectedDeleteClusterDialog extends React.Component<Dependencies> {
|
||||
this.props.showErrorNotification(`Cannot remove cluster, failed to process config file. ${error}`);
|
||||
} finally {
|
||||
await this.props.requestClearClusterAsDeleting(cluster.id);
|
||||
this.close();
|
||||
}
|
||||
|
||||
this.onClose();
|
||||
}
|
||||
|
||||
shouldDeleteBeDisabled({ cluster, config }: DeleteClusterDialogState): boolean {
|
||||
shouldDeleteBeDisabled({ cluster, config, newCurrentContext, showContextSwitch }: DeleteClusterDialogState): boolean {
|
||||
const noContextsAvailable = config.contexts.filter(context => context.name !== cluster.contextName).length == 0;
|
||||
const newContextNotSelected = this.newCurrentContext.get() === "";
|
||||
const showContextSwitch = this.showContextSwitch.get();
|
||||
const newContextNotSelected = newCurrentContext === "";
|
||||
|
||||
if (noContextsAvailable) {
|
||||
return false;
|
||||
@@ -102,12 +83,10 @@ class NonInjectedDeleteClusterDialog extends React.Component<Dependencies> {
|
||||
return showContextSwitch && newContextNotSelected;
|
||||
}
|
||||
|
||||
isCurrentContext({ cluster, config }: DeleteClusterDialogState) {
|
||||
return config.currentContext == cluster.contextName;
|
||||
}
|
||||
renderCurrentContextSwitch(state: DeleteClusterDialogState) {
|
||||
const { cluster, config, showContextSwitch, newCurrentContext } = state;
|
||||
|
||||
renderCurrentContextSwitch({ cluster, config }: DeleteClusterDialogState) {
|
||||
if (!this.showContextSwitch.get()) {
|
||||
if (!showContextSwitch) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -124,10 +103,13 @@ class NonInjectedDeleteClusterDialog extends React.Component<Dependencies> {
|
||||
<Select
|
||||
id="delete-cluster-input"
|
||||
options={selectOptions}
|
||||
value={this.newCurrentContext.get()}
|
||||
value={newCurrentContext}
|
||||
onChange={opt => {
|
||||
if (opt) {
|
||||
this.newCurrentContext.set(opt.value);
|
||||
this.props.state.set({
|
||||
...state,
|
||||
newCurrentContext: opt.value,
|
||||
});
|
||||
}
|
||||
}}
|
||||
themeName="light"
|
||||
@@ -185,7 +167,7 @@ class NonInjectedDeleteClusterDialog extends React.Component<Dependencies> {
|
||||
);
|
||||
}
|
||||
|
||||
if (this.isCurrentContext({ cluster, config })) {
|
||||
if (isCurrentContext(config, cluster)) {
|
||||
return (
|
||||
<p data-testid="current-context-warning">
|
||||
This will remove active context in kubeconfig. Use drop down below to select a different one.
|
||||
@@ -208,8 +190,10 @@ class NonInjectedDeleteClusterDialog extends React.Component<Dependencies> {
|
||||
}
|
||||
|
||||
renderContents(state: DeleteClusterDialogState) {
|
||||
const { config, cluster, showContextSwitch } = state;
|
||||
const contexts = state.config.contexts.filter(context => context.name !== state.cluster.contextName);
|
||||
const disableDelete = this.shouldDeleteBeDisabled(state);
|
||||
const currentContext = isCurrentContext(config, cluster);
|
||||
|
||||
return (
|
||||
<>
|
||||
@@ -226,11 +210,16 @@ class NonInjectedDeleteClusterDialog extends React.Component<Dependencies> {
|
||||
<>
|
||||
<span className="font-semibold">Select current-context</span>
|
||||
{" "}
|
||||
{!this.isCurrentContext(state) && "(optional)"}
|
||||
{!currentContext && "(optional)"}
|
||||
</>
|
||||
)}
|
||||
value={this.showContextSwitch.get()}
|
||||
onChange={value => this.showContextSwitch.set(this.isCurrentContext(state) || value)}
|
||||
value={showContextSwitch}
|
||||
onChange={value => {
|
||||
this.props.state.set({
|
||||
...state,
|
||||
showContextSwitch: currentContext || value,
|
||||
});
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
{this.renderCurrentContextSwitch(state)}
|
||||
@@ -265,8 +254,6 @@ class NonInjectedDeleteClusterDialog extends React.Component<Dependencies> {
|
||||
className={styles.dialog}
|
||||
isOpen={Boolean(state)}
|
||||
close={this.close}
|
||||
onClose={this.onClose}
|
||||
onOpen={state && (() => this.onOpen(state))}
|
||||
data-testid={state ? "delete-cluster-dialog" : undefined}
|
||||
>
|
||||
{state && this.renderContents(state)}
|
||||
|
||||
Reference in new issue
Block a user