diff --git a/src/main.tsx b/src/main.tsx
index b90671d4..87f283ba 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -672,15 +672,54 @@ class TextAreaInput extends React.Component<{}, {}> {
@mobxReact.observer
class InfoRemoteShowAll extends React.Component<{}, {}> {
+ clickRow(remoteId : string) : void {
+ GlobalCommandRunner.showRemote(remoteId);
+ }
+
render() {
let inputModel = GlobalModel.inputModel;
let infoMsg = inputModel.infoMsg.get();
if (infoMsg == null || !infoMsg.remoteshowall) {
return null;
}
+ let remotes = GlobalModel.remotes ?? [];
+ let remote : RemoteType = null;
+ let idx : number = 0;
+ remotes = sortAndFilterRemotes(remotes);
return (
- showall
+
+
+
+ | status |
+ id |
+ alias |
+ user@host |
+ connectmode |
+
+
+
+
+ this.clickRow(remote.remoteid)}>
+ |
+
+ |
+
+ {remote.remoteid.substr(0, 8)}
+ |
+
+ {isBlank(remote.remotealias) ? "-" : remote.remotealias}
+ |
+
+ {remote.remotecanonicalname}
+ |
+
+ {remote.connectmode}
+ |
+
+
+
+
);
}
@@ -856,7 +895,7 @@ class InfoRemoteShow extends React.Component<{}, {}> {
class InfoRemoteEdit extends React.Component<{}, {}> {
alias : mobx.IObservableValue;
hostName : mobx.IObservableValue;
- userName : mobx.IObservableValue;
+ keyStr : mobx.IObservableValue;
portStr : mobx.IObservableValue;
colorStr : mobx.IObservableValue;
connectMode : mobx.IObservableValue;
@@ -871,7 +910,7 @@ class InfoRemoteEdit extends React.Component<{}, {}> {
resetForm() {
this.alias = mobx.observable.box("");
this.hostName = mobx.observable.box("");
- this.userName = mobx.observable.box("");
+ this.keyStr = mobx.observable.box("");
this.portStr = mobx.observable.box("22");
this.colorStr = mobx.observable.box("");
this.connectMode = mobx.observable.box("startup");
@@ -881,7 +920,7 @@ class InfoRemoteEdit extends React.Component<{}, {}> {
@boundMethod
doCreateRemote() {
- let cname = this.userName.get() + "@" + this.hostName.get();
+ let cname = this.hostName.get();
let kwargs : Record = {};
if (this.alias.get() != "") {
kwargs["alias"] = this.alias.get();
@@ -895,6 +934,9 @@ class InfoRemoteEdit extends React.Component<{}, {}> {
if (this.colorStr.get() != "") {
kwargs["color"] = this.colorStr.get();
}
+ if (this.keyStr.get() != "") {
+ kwargs["key"] = this.keyStr.get();
+ }
kwargs["connectmode"] = this.connectMode.get();
if (!this.autoInstallBool.get()) {
kwargs["autoinstall"] = "0";
@@ -904,7 +946,6 @@ class InfoRemoteEdit extends React.Component<{}, {}> {
console.log("create remote", cname, kwargs);
mobx.action(() => {
GlobalCommandRunner.createRemote(cname, kwargs);
- this.resetForm();
})();
}
@@ -945,9 +986,9 @@ class InfoRemoteEdit extends React.Component<{}, {}> {
}
@boundMethod
- onChangeUserName(e : any) {
+ onChangeKeyStr(e : any) {
mobx.action(() => {
- this.userName.set(e.target.value);
+ this.keyStr.set(e.target.value);
})();
}
@@ -991,6 +1032,13 @@ class InfoRemoteEdit extends React.Component<{}, {}> {
})();
}
+ remoteCName() : string {
+ if (this.hostName.get() == "") {
+ return "[no host]";
+ }
+ return this.hostName.get();
+ }
+
render() {
let inputModel = GlobalModel.inputModel;
let infoMsg = inputModel.infoMsg.get();
@@ -1013,7 +1061,7 @@ class InfoRemoteEdit extends React.Component<{}, {}> {