hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Terminal dock tab improvements (#294)

Browse Source 
Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
This commit is contained in:
Jari Kolehmainen 2020-04-26 10:54:16 +03:00 committed by GitHub
parent 3a92e5d3ab
commit 6d4a7f657d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dashboard/client/components/+nodes/node-menu.tsx
View File

@ -24,7 +24,7 @@ export function NodeMenu(props: KubeObjectMenuProps<Node>) {
const shell = () => { const shell = () => {
createTerminalTab({ createTerminalTab({
title: _i18n._(t`Shell: ${nodeName}`), title: _i18n._(t`Node: ${nodeName}`),
node: nodeName, node: nodeName,
}); });
hideDetails(); hideDetails();
@ -75,4 +75,4 @@ export function NodeMenu(props: KubeObjectMenuProps<Node>) {
</MenuItem> </MenuItem>
</KubeObjectMenu> </KubeObjectMenu>
); );
} }

11
dashboard/client/components/+workloads-pods/pod-menu.tsx
View File

@ -9,7 +9,7 @@ import { StatusBrick } from "../status-brick";
import { PodLogsDialog } from "./pod-logs-dialog"; import { PodLogsDialog } from "./pod-logs-dialog";
import { KubeObjectMenu, KubeObjectMenuProps } from "../kube-object/kube-object-menu"; import { KubeObjectMenu, KubeObjectMenuProps } from "../kube-object/kube-object-menu";
import { cssNames, prevDefault } from "../../utils"; import { cssNames, prevDefault } from "../../utils";
import { terminalStore } from "../dock/terminal.store"; import { terminalStore, createTerminalTab } from "../dock/terminal.store";
import { _i18n } from "../../i18n"; import { _i18n } from "../../i18n";
import { hideDetails } from "../../navigation"; import { hideDetails } from "../../navigation";
@ -22,15 +22,22 @@ export class PodMenu extends React.Component<Props> {
const { object: pod } = this.props const { object: pod } = this.props
const containerParam = container ? `-c ${container}` : "" const containerParam = container ? `-c ${container}` : ""
let command = `kubectl exec -i -t -n ${pod.getNs()} ${pod.getName()} ${containerParam} "--"` let command = `kubectl exec -i -t -n ${pod.getNs()} ${pod.getName()} ${containerParam} "--"`
if (process.platform !== "win32") {
command = `exec ${command}`
}
if (pod.getSelectedNodeOs() === "windows") { if (pod.getSelectedNodeOs() === "windows") {
command = `${command} powershell` command = `${command} powershell`
} else { } else {
command = `${command} sh -c "clear; (bash || ash || sh)"` command = `${command} sh -c "clear; (bash || ash || sh)"`
} }
const shell = createTerminalTab({
title: _i18n._(t`Pod: ${pod.getName()} (namespace: ${pod.getNs()})`)
});
terminalStore.sendCommand(command, { terminalStore.sendCommand(command, {
enter: true, enter: true,
newTab: true, tabId: shell.id
}); });
} }

4
dashboard/client/components/dock/dock-tab.scss
View File

@ -14,7 +14,7 @@
.label { .label {
.title { .title {
max-width: 150px; max-width: 250px;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
@ -31,4 +31,4 @@
&:last-child { &:last-child {
padding-right: $padding; padding-right: $padding;
} }
} }

11
dashboard/client/components/dock/terminal-tab.tsx
View File

@ -7,12 +7,20 @@ import { autobind, cssNames } from "../../utils";
import { DockTab, DockTabProps } from "./dock-tab"; import { DockTab, DockTabProps } from "./dock-tab";
import { Icon } from "../icon"; import { Icon } from "../icon";
import { terminalStore } from "./terminal.store"; import { terminalStore } from "./terminal.store";
import { dockStore } from "./dock.store";
import { reaction } from "mobx";
interface Props extends DockTabProps { interface Props extends DockTabProps {
} }
@observer @observer
export class TerminalTab extends React.Component<Props> { export class TerminalTab extends React.Component<Props> {
componentDidMount() {
reaction(() => this.isDisconnected, () => {
dockStore.closeTab(this.tabId)
})
}
get tabId() { get tabId() {
return this.props.value.id; return this.props.value.id;
} }
@ -31,6 +39,7 @@ export class TerminalTab extends React.Component<Props> {
const className = cssNames("TerminalTab", this.props.className, { const className = cssNames("TerminalTab", this.props.className, {
disconnected: this.isDisconnected, disconnected: this.isDisconnected,
}); });
return ( return (
<DockTab <DockTab
{...this.props} {...this.props}
@ -48,4 +57,4 @@ export class TerminalTab extends React.Component<Props> {
/> />
) )
} }
} }