diff --git a/src/renderer/components/+network-port-forwards/port-forward-menu.tsx b/src/renderer/components/+network-port-forwards/port-forward-menu.tsx index b5f4298e79..2f6f8ea569 100644 --- a/src/renderer/components/+network-port-forwards/port-forward-menu.tsx +++ b/src/renderer/components/+network-port-forwards/port-forward-menu.tsx @@ -37,9 +37,10 @@ export class PortForwardMenu extends React.Component { @boundMethod remove() { const { portForward } = this.props; + try { removePortForward(portForward); - } catch(eror) { + } catch (error) { Notifications.error(`Error occurred stopping the port-forward from port ${portForward.forwardPort}. The port-forward may still be active.`); } } diff --git a/src/renderer/components/+network-services/service-port-component.tsx b/src/renderer/components/+network-services/service-port-component.tsx index 02f41f4587..ce9f731b21 100644 --- a/src/renderer/components/+network-services/service-port-component.tsx +++ b/src/renderer/components/+network-services/service-port-component.tsx @@ -51,7 +51,7 @@ export class ServicePortComponent extends React.Component { componentDidMount() { disposeOnUnmount(this, [ - reaction(() => [ portForwardStore.portForwards, this.props.service ], () => this.checkExistingPortForwarding()), + reaction(() => [portForwardStore.portForwards, this.props.service], () => this.checkExistingPortForwarding()), ]); } @@ -66,10 +66,12 @@ export class ServicePortComponent extends React.Component { }; let activePort: number; + try { activePort = await getPortForward(portForward) ?? 0; - } catch(error) { + } catch (error) { this.isPortForwarded = false; + return; } diff --git a/src/renderer/components/+workloads-pods/pod-container-port.tsx b/src/renderer/components/+workloads-pods/pod-container-port.tsx index a135f34cea..41bb4c9736 100644 --- a/src/renderer/components/+workloads-pods/pod-container-port.tsx +++ b/src/renderer/components/+workloads-pods/pod-container-port.tsx @@ -55,7 +55,7 @@ export class PodContainerPort extends React.Component { componentDidMount() { disposeOnUnmount(this, [ - reaction(() => [ portForwardStore.portForwards, this.props.pod ], () => this.checkExistingPortForwarding()), + reaction(() => [portForwardStore.portForwards, this.props.pod], () => this.checkExistingPortForwarding()), ]); } @@ -70,10 +70,12 @@ export class PodContainerPort extends React.Component { }; let activePort: number; + try { activePort = await getPortForward(portForward) ?? 0; - } catch(error) { + } catch (error) { this.isPortForwarded = false; + return; }