mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
Turn on strict mode in tsconfig.json, some helpful lints, and required cleanup where strictness necessitates it (#5195)
* Turn on strict mode in tsconfig.json - Add route, clusterRoute, and payloadValidatedClusterRoute helper functions to improve types with backend routes - Turn on the following new lints: - react/jsx-first-prop-new-line - react/jsx-wrap-multilines - react/jsx-one-expression-per-line - react/jsx-max-props-per-line - react/jsx-indent - react/jsx-indent-props Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix build Signed-off-by: Sebastian Malton <sebastian@malton.name> * Replace KubeObject scope strings with enum Signed-off-by: Sebastian Malton <sebastian@malton.name> * Revert package.json version changes Signed-off-by: Sebastian Malton <sebastian@malton.name> * revert move hostedCluster(Id) Signed-off-by: Sebastian Malton <sebastian@malton.name> * change some type param names to be not single letters Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove copy-extension-themes Signed-off-by: Sebastian Malton <sebastian@malton.name> * add new make clean action Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix build to not use webpack for generating types Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix kube-object-menu.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix select.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix catalog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * revert move fileNameMigration to index Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix ref logic error Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix log-resource-selector.test.tsx tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix dock-store.test.ts test by overriding createStorage to not touch file system Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix cluster.test.ts tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix kube=api.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fixed hotbar-store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix kubeconfig-manager.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix cluster-role-bindings/__tests__/dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix role-bindings/__tests__/dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix pods.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix delete-cluster-dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix daemonset.store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix replicaset.store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix statefulsets/dialog/dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix replicasets/scale-dialog/dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix deployments.store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix deployments/scale/dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix cronjob.store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix stateful-set.api.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix deployment.api.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix api-manager.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix statefulset.store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix job.store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix pods.store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix scroll-spy.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix hotbar-remove-command.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix catalog-entity-registry.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix welcome.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix verify-that-all-routes-have-route-component.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix pod-tolerations.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * better fix for previous 3 fixes, plus also select.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix kube-object-menu.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix app-paths.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix dock-tabs.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix isReactNode typing Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix sub-title.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix drawer.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix list-layout.tsx and header.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix error-boundary.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix upgrade-chart/store.ts and dock-tab.store.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix install-chart/store.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix edit-resource/store.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix create-resource/store.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix namespace-select.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix namespace-select-filter.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix crd-list.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix wrong types for extensions Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix circular dependency Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix circular dependency on catalogCategoryRegistry Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix api-kube Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix type errors, most <Select /> errors Signed-off-by: Sebastian Malton <sebastian@malton.name> * fixing more type errors Signed-off-by: Sebastian Malton <sebastian@malton.name> * some more fixing type errors Signed-off-by: Sebastian Malton <sebastian@malton.name> * convert all KubeApis to injectable with legacy global backups Signed-off-by: Sebastian Malton <sebastian@malton.name> * factor out into a common file all the exports Signed-off-by: Sebastian Malton <sebastian@malton.name> * convert all KubeObjectStores to injectable with legacy global backups Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix lint Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove unused legacy KubeApi globals Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix bad previous commit Signed-off-by: Sebastian Malton <sebastian@malton.name> * more crash fixing Signed-off-by: Sebastian Malton <sebastian@malton.name> * try and fix behavioural tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix sidebar-and-tab-navigation-for-core.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix sidebar-and-tab-navigation-for-extensions.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-using-application-menu.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix catalog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * Make ThemeStore non-singleton and fix navigation-to-terminal-preferences.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * extensions.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix catalog-entity-registry.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-using-application-menu.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix log-resource-selector.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix dock-tabs.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix delete-cluster-dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-kubernetes-preferences.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-editor-preferences.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-proxy-preferences.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-using-application-menu.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-application-preferences.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix dock-store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix select.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix role-bindings/__tests__/dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix hotbar-remove-command.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix cluster-role-bindings/__tests__/dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-extension-specific-preferences.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-telemetry-preferences.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix closing-preferences.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-editor-preferences.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-proxy-preferences.test.ts - Fix other type errors too Signed-off-by: Sebastian Malton <sebastian@malton.name> * final tweaks Signed-off-by: Sebastian Malton <sebastian@malton.name> * Add more tsconfig files, fix bug in <Catalog> - Make all of history, navigation injectable Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix type errors Signed-off-by: Sebastian Malton <sebastian@malton.name> * Convert all of kube-details-params/ and navigate/ to injectable - This fixes a runtime error that was encountered during testing Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix runtime errors on renderer - remove all static uses of `createPageParam` (and then removed the legacy global) - Made LensRendererExtension and LensMainExtension just used dependencies and not the getLegacyDi - Fixed circular dep in extension-loader Signed-off-by: Sebastian Malton <sebastian@malton.name> * Move registerStore calls to after injectMany Signed-off-by: Sebastian Malton <sebastian@malton.name> * replace all the rest of the legacy uses of apiManager Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix stack overflow and cycles in DI Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix NamespaceSelectFilter not opening Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix WizardStep and AddNamespaceDialog Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix KubeApi's not being registered Signed-off-by: Sebastian Malton <sebastian@malton.name> * cleanup WindowManager Signed-off-by: Sebastian Malton <sebastian@malton.name> * Proper fix for Wizard, fix NamespaceStore.subscribe Signed-off-by: Sebastian Malton <sebastian@malton.name> * Rewrite withTooltip to be more type correct - Fixes mobx related "too many recursive actions" error - Change all the uses of withTooltips to be functional components Signed-off-by: Sebastian Malton <sebastian@malton.name> * Add e2e test to cover kube api registration Signed-off-by: Sebastian Malton <sebastian@malton.name> * cleanup internal-commands Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove cast in <Animate> Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix command-palette e2e test Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix type error after rebase Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix test name Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix lint Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix code to help CodeQL scanner Signed-off-by: Sebastian Malton <sebastian@malton.name> * update intree extension lock files Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix build-extensions picking wrong @types/react Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix tests from rebase Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix type error Signed-off-by: Sebastian Malton <sebastian@malton.name> * Make KubeconfigSyncManager more injectable Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix crash in test mode for Dialog Signed-off-by: Sebastian Malton <sebastian@malton.name> * make Select snapshots deterministic Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix new type error Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix kube-object.store.test.ts typing Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix merge build issues Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix snapshots after merge Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix lint after merge Signed-off-by: Sebastian Malton <sebastian@malton.name> * reexport BaseKubeJsonApiObjectMetadata Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix typo in terminalSpawningPool Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove duplicate license header Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix typo to waitUntilDefined Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove iter use from getLegacyGlobalDiForExtensionApi Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove complex createStorage override Signed-off-by: Sebastian Malton <sebastian@malton.name> * override logger with mocks only when needed for tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove specialized overrideStore flags for getDiForUnitTesting Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove unnecessary | undefined types from the exactOptionalFieldTypes experiment Signed-off-by: Sebastian Malton <sebastian@malton.name> * use more descriptive name for local test mocks Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove unnecessary addition to 'make clean' target Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove oddity of KubeObjectStore.getById(undefined) being allowed Signed-off-by: Sebastian Malton <sebastian@malton.name> * rename KubeObject.getDescriptor in favour of name without fundemental JS meaning Signed-off-by: Sebastian Malton <sebastian@malton.name> * Simplify legacyRegisterApi when working in behaviour unit tests - Don't emit within main environment as there should be no auto registering there Signed-off-by: Sebastian Malton <sebastian@malton.name> * change confusing variable name in ReactiveDuration Signed-off-by: Sebastian Malton <sebastian@malton.name> * make visitor pattern more explicit for Entity contextMenuOpen Signed-off-by: Sebastian Malton <sebastian@malton.name> * toggleDetails -> toggleKubeDetailsPane is more specific Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove outdated comment Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix bug where LensExtension dependencies are not set Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix tests from the revert of react 18 Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix more tests from merge Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix typings with new is-compatible-extension tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * more type fixing Signed-off-by: Sebastian Malton <sebastian@malton.name> * Revert in-tree extension versions Signed-off-by: Sebastian Malton <sebastian@malton.name> * Improve name of guarding injectable for stores and apis - New name better implies that it is just a guard state and does not do anything Signed-off-by: Sebastian Malton <sebastian@malton.name> * Add helper for <Select>.isMulti for storing in a Set<Value> Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix is-compatible-extension.test.ts types Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Sebastian Malton authored and 
GitHub committed
1 parent
381d77c633
commit
dfcb7c3330
1062 files changed
+26512
-28689
No files matched your search
@@ -5,14 +5,22 @@
|
||||
import { getInjectable } from "@ogre-tools/injectable";
|
||||
import { aboutPortForwarding } from "./port-forward-notify";
|
||||
import navigateToPortForwardsInjectable from "../../common/front-end-routing/routes/cluster/network/port-forwards/navigate-to-port-forwards.injectable";
|
||||
import hostedClusterIdInjectable from "../../common/cluster-store/hosted-cluster-id.injectable";
|
||||
import assert from "assert";
|
||||
|
||||
const aboutPortForwardingInjectable = getInjectable({
|
||||
id: "about-port-forwarding",
|
||||
|
||||
instantiate: (di) =>
|
||||
aboutPortForwarding({
|
||||
instantiate: (di) => {
|
||||
const hostedClusterId = di.inject(hostedClusterIdInjectable);
|
||||
|
||||
assert(hostedClusterId, "Only allowed to notify about port forward errors within a cluster frame");
|
||||
|
||||
return aboutPortForwarding({
|
||||
navigateToPortForwards: di.inject(navigateToPortForwardsInjectable),
|
||||
}),
|
||||
hostedClusterId,
|
||||
});
|
||||
},
|
||||
});
|
||||
|
||||
export default aboutPortForwardingInjectable;
|
||||
@@ -5,14 +5,22 @@
|
||||
import { getInjectable } from "@ogre-tools/injectable";
|
||||
import { notifyErrorPortForwarding } from "./port-forward-notify";
|
||||
import navigateToPortForwardsInjectable from "../../common/front-end-routing/routes/cluster/network/port-forwards/navigate-to-port-forwards.injectable";
|
||||
import hostedClusterIdInjectable from "../../common/cluster-store/hosted-cluster-id.injectable";
|
||||
import assert from "assert";
|
||||
|
||||
const notifyErrorPortForwardingInjectable = getInjectable({
|
||||
id: "notify-error-port-forwarding",
|
||||
|
||||
instantiate: (di) =>
|
||||
notifyErrorPortForwarding({
|
||||
instantiate: (di) => {
|
||||
const hostedClusterId = di.inject(hostedClusterIdInjectable);
|
||||
|
||||
assert(hostedClusterId, "Only allowed to notify about port forward errors within a cluster frame");
|
||||
|
||||
return notifyErrorPortForwarding({
|
||||
navigateToPortForwards: di.inject(navigateToPortForwardsInjectable),
|
||||
}),
|
||||
hostedClusterId,
|
||||
});
|
||||
},
|
||||
});
|
||||
|
||||
export default notifyErrorPortForwardingInjectable;
|
||||
@@ -3,46 +3,34 @@
|
||||
* Licensed under MIT License. See LICENSE in root directory for more information.
|
||||
*/
|
||||
import { noop } from "lodash/fp";
|
||||
import { action, computed, observable, makeObservable } from "mobx";
|
||||
import { action, observable } from "mobx";
|
||||
import type { ForwardedPort } from "../port-forward-item";
|
||||
|
||||
interface PortForwardDialogOpenOptions {
|
||||
export interface PortForwardDialogOpenOptions {
|
||||
openInBrowser: boolean;
|
||||
onClose: () => void;
|
||||
}
|
||||
|
||||
export interface PortForwardDialogData {
|
||||
portForward: ForwardedPort;
|
||||
useHttps: boolean;
|
||||
openInBrowser: boolean;
|
||||
onClose: () => void;
|
||||
}
|
||||
|
||||
export class PortForwardDialogModel {
|
||||
portForward: ForwardedPort = null;
|
||||
useHttps = false;
|
||||
openInBrowser = false;
|
||||
onClose = noop;
|
||||
readonly data = observable.box<PortForwardDialogData | undefined>();
|
||||
|
||||
constructor() {
|
||||
makeObservable(this, {
|
||||
isOpen: computed,
|
||||
portForward: observable,
|
||||
useHttps: observable,
|
||||
openInBrowser: observable,
|
||||
|
||||
open: action,
|
||||
close: action,
|
||||
open = action((portForward: ForwardedPort, options?: PortForwardDialogOpenOptions) => {
|
||||
this.data.set({
|
||||
onClose: options?.onClose ?? noop,
|
||||
openInBrowser: options?.openInBrowser ?? false,
|
||||
portForward,
|
||||
useHttps: portForward.protocol === "https",
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
get isOpen() {
|
||||
return !!this.portForward;
|
||||
}
|
||||
|
||||
open = (portForward: ForwardedPort, options: PortForwardDialogOpenOptions = { openInBrowser: false, onClose: noop }) => {
|
||||
this.portForward = portForward;
|
||||
this.useHttps = portForward.protocol === "https";
|
||||
this.openInBrowser = options.openInBrowser;
|
||||
this.onClose = options.onClose;
|
||||
};
|
||||
|
||||
close = () => {
|
||||
this.portForward = null;
|
||||
this.useHttps = false;
|
||||
this.openInBrowser = false;
|
||||
};
|
||||
close = action(() => {
|
||||
this.data.set(undefined);
|
||||
});
|
||||
}
|
||||
@@ -17,7 +17,7 @@ import type { PortForwardStore } from "./port-forward-store/port-forward-store";
|
||||
import { openPortForward } from "./port-forward-utils";
|
||||
import { Checkbox } from "../components/checkbox";
|
||||
import { withInjectables } from "@ogre-tools/injectable-react";
|
||||
import type { PortForwardDialogModel } from "./port-forward-dialog-model/port-forward-dialog-model";
|
||||
import type { PortForwardDialogData, PortForwardDialogModel } from "./port-forward-dialog-model/port-forward-dialog-model";
|
||||
import portForwardDialogModelInjectable from "./port-forward-dialog-model/port-forward-dialog-model.injectable";
|
||||
import logger from "../../common/logger";
|
||||
import portForwardStoreInjectable from "./port-forward-store/port-forward-store.injectable";
|
||||
@@ -47,8 +47,8 @@ class NonInjectedPortForwardDialog extends Component<PortForwardDialogProps & De
|
||||
return this.props.portForwardStore;
|
||||
}
|
||||
|
||||
onOpen = async () => {
|
||||
this.currentPort = +this.props.model.portForward.forwardPort;
|
||||
onOpen = async (data: PortForwardDialogData) => {
|
||||
this.currentPort = +data.portForward.forwardPort;
|
||||
this.desiredPort = this.currentPort;
|
||||
};
|
||||
|
||||
@@ -56,15 +56,15 @@ class NonInjectedPortForwardDialog extends Component<PortForwardDialogProps & De
|
||||
this.desiredPort = Number(value);
|
||||
};
|
||||
|
||||
startPortForward = async () => {
|
||||
let { portForward } = this.props.model;
|
||||
startPortForward = async (data: PortForwardDialogData) => {
|
||||
let { portForward } = data;
|
||||
const { currentPort, desiredPort } = this;
|
||||
|
||||
try {
|
||||
// determine how many port-forwards already exist
|
||||
const { length } = this.portForwardStore.getPortForwards();
|
||||
|
||||
portForward.protocol = this.props.model.useHttps ? "https" : "http";
|
||||
portForward.protocol = data.useHttps ? "https" : "http";
|
||||
|
||||
if (currentPort) {
|
||||
const wasRunning = portForward.status === "Active";
|
||||
@@ -88,7 +88,7 @@ class NonInjectedPortForwardDialog extends Component<PortForwardDialogProps & De
|
||||
}
|
||||
}
|
||||
|
||||
if (portForward.status === "Active" && this.props.model.openInBrowser) {
|
||||
if (portForward.status === "Active" && data.openInBrowser) {
|
||||
openPortForward(portForward);
|
||||
}
|
||||
} catch (error) {
|
||||
@@ -98,67 +98,70 @@ class NonInjectedPortForwardDialog extends Component<PortForwardDialogProps & De
|
||||
}
|
||||
};
|
||||
|
||||
renderContents() {
|
||||
renderContents(data: PortForwardDialogData) {
|
||||
return (
|
||||
<>
|
||||
<div className="flex column gaps align-left">
|
||||
<div className="input-container flex align-center">
|
||||
<div className="current-port" data-testid="current-port">
|
||||
Local port to forward from:
|
||||
<Wizard
|
||||
header={(
|
||||
<h5>
|
||||
{"Port Forwarding for "}
|
||||
<span>{data.portForward.name}</span>
|
||||
</h5>
|
||||
)}
|
||||
done={this.props.model.close}
|
||||
>
|
||||
<WizardStep
|
||||
contentClass="flex gaps column"
|
||||
next={() => this.startPortForward(data)}
|
||||
nextLabel={this.currentPort === 0 ? "Start" : "Modify"}
|
||||
>
|
||||
<div className="flex column gaps align-left">
|
||||
<div className="input-container flex align-center">
|
||||
<div className="current-port" data-testid="current-port">
|
||||
Local port to forward from:
|
||||
</div>
|
||||
<Input
|
||||
className="portInput"
|
||||
type="number"
|
||||
min="0"
|
||||
max="65535"
|
||||
value={this.desiredPort === 0 ? "" : String(this.desiredPort)}
|
||||
placeholder={"Random"}
|
||||
onChange={this.changePort}
|
||||
/>
|
||||
</div>
|
||||
<Input className="portInput"
|
||||
type="number"
|
||||
min="0"
|
||||
max="65535"
|
||||
value={this.desiredPort === 0 ? "" : String(this.desiredPort)}
|
||||
placeholder={"Random"}
|
||||
onChange={this.changePort}
|
||||
<Checkbox
|
||||
data-testid="port-forward-https"
|
||||
label="https"
|
||||
value={data.useHttps}
|
||||
onChange={value => data.useHttps = value}
|
||||
/>
|
||||
<Checkbox
|
||||
data-testid="port-forward-open"
|
||||
label="Open in Browser"
|
||||
value={data.openInBrowser}
|
||||
onChange={value => data.openInBrowser = value}
|
||||
/>
|
||||
</div>
|
||||
<Checkbox
|
||||
data-testid="port-forward-https"
|
||||
label="https"
|
||||
value={this.props.model.useHttps}
|
||||
onChange={value => this.props.model.useHttps = value}
|
||||
/>
|
||||
<Checkbox
|
||||
data-testid="port-forward-open"
|
||||
label="Open in Browser"
|
||||
value={this.props.model.openInBrowser}
|
||||
onChange={value => this.props.model.openInBrowser = value}
|
||||
/>
|
||||
</div>
|
||||
</>
|
||||
</WizardStep>
|
||||
</Wizard>
|
||||
);
|
||||
}
|
||||
|
||||
render() {
|
||||
const { className, portForwardStore, model, ...dialogProps } = this.props;
|
||||
const resourceName = this.props.model.portForward?.name ?? "";
|
||||
const header = (
|
||||
<h5>
|
||||
Port Forwarding for <span>{resourceName}</span>
|
||||
</h5>
|
||||
);
|
||||
const data = model.data.get();
|
||||
const isOpen = Boolean(data);
|
||||
|
||||
return (
|
||||
<Dialog
|
||||
{...dialogProps}
|
||||
isOpen={this.props.model.isOpen}
|
||||
isOpen={isOpen}
|
||||
className={cssNames("PortForwardDialog", className)}
|
||||
onOpen={this.onOpen}
|
||||
onClose={model.onClose}
|
||||
onOpen={data && (() => this.onOpen(data))}
|
||||
onClose={data?.onClose}
|
||||
close={this.props.model.close}
|
||||
>
|
||||
<Wizard header={header} done={this.props.model.close}>
|
||||
<WizardStep
|
||||
contentClass="flex gaps column"
|
||||
next={this.startPortForward}
|
||||
nextLabel={this.currentPort === 0 ? "Start" : "Modify"}
|
||||
>
|
||||
{this.renderContents()}
|
||||
</WizardStep>
|
||||
</Wizard>
|
||||
{data && this.renderContents(data)}
|
||||
</Dialog>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -6,22 +6,25 @@
|
||||
import React from "react";
|
||||
import { Button } from "../components/button";
|
||||
import { Notifications, notificationsStore } from "../components/notifications";
|
||||
import { getHostedClusterId } from "../utils";
|
||||
import type { NavigateToPortForwards } from "../../common/front-end-routing/routes/cluster/network/port-forwards/navigate-to-port-forwards.injectable";
|
||||
|
||||
interface AboutPortForwardingDependencies {
|
||||
navigateToPortForwards: NavigateToPortForwards;
|
||||
hostedClusterId: string;
|
||||
}
|
||||
|
||||
export const aboutPortForwarding = ({ navigateToPortForwards }: AboutPortForwardingDependencies) => () => {
|
||||
const notificationId = `port-forward-notification-${getHostedClusterId()}`;
|
||||
export const aboutPortForwarding = ({
|
||||
navigateToPortForwards,
|
||||
hostedClusterId,
|
||||
}: AboutPortForwardingDependencies) => () => {
|
||||
const notificationId = `port-forward-notification-${hostedClusterId}`;
|
||||
|
||||
Notifications.info(
|
||||
(
|
||||
<div className="flex column gaps">
|
||||
<b>Port Forwarding</b>
|
||||
<p>
|
||||
You can manage your port forwards on the Port Forwarding Page.
|
||||
You can manage your port forwards on the Port Forwarding Page.
|
||||
</p>
|
||||
<div className="flex gaps row align-left box grow">
|
||||
<Button
|
||||
@@ -45,11 +48,15 @@ export const aboutPortForwarding = ({ navigateToPortForwards }: AboutPortForward
|
||||
|
||||
interface NotifyErrorPortForwardingDependencies {
|
||||
navigateToPortForwards: NavigateToPortForwards;
|
||||
hostedClusterId: string;
|
||||
}
|
||||
|
||||
|
||||
export const notifyErrorPortForwarding = ({ navigateToPortForwards }: NotifyErrorPortForwardingDependencies) => (msg: string) => {
|
||||
const notificationId = `port-forward-error-notification-${getHostedClusterId()}`;
|
||||
export const notifyErrorPortForwarding = ({
|
||||
navigateToPortForwards,
|
||||
hostedClusterId,
|
||||
}: NotifyErrorPortForwardingDependencies) => (msg: string) => {
|
||||
const notificationId = `port-forward-error-notification-${hostedClusterId}`;
|
||||
|
||||
Notifications.error(
|
||||
(
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
import { action, makeObservable, observable, reaction } from "mobx";
|
||||
import { ItemStore } from "../../../common/item.store";
|
||||
import type { StorageHelper } from "../../utils";
|
||||
import type { StorageLayer } from "../../utils";
|
||||
import { autoBind, disposer } from "../../utils";
|
||||
import type { ForwardedPort } from "../port-forward-item";
|
||||
import { PortForwardItem } from "../port-forward-item";
|
||||
@@ -14,7 +14,7 @@ import { waitUntilFree } from "tcp-port-used";
|
||||
import logger from "../../../common/logger";
|
||||
|
||||
interface Dependencies {
|
||||
storage: StorageHelper<ForwardedPort[] | undefined>;
|
||||
storage: StorageLayer<ForwardedPort[] | undefined>;
|
||||
notifyErrorPortForwarding: (message: string) => void;
|
||||
}
|
||||
|
||||
@@ -83,7 +83,7 @@ export class PortForwardStore extends ItemStore<PortForwardItem> {
|
||||
const index = this.getIndexById(id);
|
||||
|
||||
if (index === -1) {
|
||||
return null;
|
||||
return undefined;
|
||||
}
|
||||
|
||||
return this.getItems()[index];
|
||||
@@ -315,29 +315,26 @@ export class PortForwardStore extends ItemStore<PortForwardItem> {
|
||||
*
|
||||
* @throws if the port-forward does not exist in the store
|
||||
*/
|
||||
getPortForward = async (
|
||||
portForward: ForwardedPort,
|
||||
): Promise<ForwardedPort> => {
|
||||
getPortForward = async (portForward: ForwardedPort): Promise<ForwardedPort | undefined> => {
|
||||
if (!this.findPortForward(portForward)) {
|
||||
throw new Error("port-forward not found");
|
||||
}
|
||||
|
||||
let pf: ForwardedPort;
|
||||
|
||||
try {
|
||||
// check if the port-forward is active, and if so check if it has the same local port
|
||||
pf = await getActivePortForward(portForward);
|
||||
const pf = await getActivePortForward(portForward);
|
||||
|
||||
if (pf.forwardPort && pf.forwardPort !== portForward.forwardPort) {
|
||||
if (pf?.forwardPort && pf.forwardPort !== portForward.forwardPort) {
|
||||
logger.warn(
|
||||
`[PORT-FORWARD-STORE] local port, expected ${pf.forwardPort}, got ${portForward.forwardPort}`,
|
||||
);
|
||||
}
|
||||
|
||||
return pf;
|
||||
} catch (error) {
|
||||
// port is not active
|
||||
return undefined;
|
||||
}
|
||||
|
||||
return pf;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -354,7 +351,7 @@ function portForwardsEqual(portForward: ForwardedPort) {
|
||||
);
|
||||
}
|
||||
|
||||
async function getActivePortForward(portForward: ForwardedPort): Promise<ForwardedPort> {
|
||||
async function getActivePortForward(portForward: ForwardedPort): Promise<ForwardedPort | undefined> {
|
||||
const { port, forwardPort } = portForward;
|
||||
let response: PortForwardResult;
|
||||
|
||||
@@ -362,6 +359,8 @@ async function getActivePortForward(portForward: ForwardedPort): Promise<Forward
|
||||
response = await apiBase.get<PortForwardResult>(`/pods/port-forward/${portForward.namespace}/${portForward.kind}/${portForward.name}`, { query: { port, forwardPort }});
|
||||
} catch (error) {
|
||||
logger.warn(`[PORT-FORWARD-STORE] Error getting active port-forward: ${error}`, portForward);
|
||||
|
||||
return undefined;
|
||||
}
|
||||
|
||||
portForward.status = response?.port ? "Active" : "Disabled";
|
||||
|
||||
@@ -30,7 +30,7 @@ export function openPortForward(portForward: ForwardedPort) {
|
||||
|
||||
}
|
||||
|
||||
export function predictProtocol(name: string) {
|
||||
export function predictProtocol(name: string | undefined) {
|
||||
return name === "https" ? "https" : "http";
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user