Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2024-12-22 16:48:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
Red J. Adaya 2023-11-30 09:39:00 +08:00
commit 962da77918
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/app/common/modals/modals.tsx
View File

@ -11,7 +11,7 @@ import dayjs from "dayjs";
import localizedFormat from "dayjs/plugin/localizedFormat"; import localizedFormat from "dayjs/plugin/localizedFormat";
import { GlobalModel, GlobalCommandRunner, RemotesModel } from "../../../model/model"; import { GlobalModel, GlobalCommandRunner, RemotesModel } from "../../../model/model";
import * as T from "../../../types/types"; import * as T from "../../../types/types";
import { Markdown, InfoMessage } from "../common"; import { Markdown } from "../common";
import * as util from "../../../util/util"; import * as util from "../../../util/util";
import * as textmeasure from "../../../util/textmeasure"; import * as textmeasure from "../../../util/textmeasure";
import { Toggle, Checkbox, Modal } from "../common"; import { Toggle, Checkbox, Modal } from "../common";
@ -20,12 +20,10 @@ import { TextField, NumberField, InputDecoration, Dropdown, PasswordField, Toolt
import close from "../../assets/icons/close.svg"; import close from "../../assets/icons/close.svg";
import { ReactComponent as WarningIcon } from "../../assets/icons/line/triangle-exclamation.svg"; import { ReactComponent as WarningIcon } from "../../assets/icons/line/triangle-exclamation.svg";
import { ReactComponent as XmarkIcon } from "../../assets/icons/line/xmark.svg";
import shield from "../../assets/icons/shield_check.svg"; import shield from "../../assets/icons/shield_check.svg";
import help from "../../assets/icons/help_filled.svg"; import help from "../../assets/icons/help_filled.svg";
import github from "../../assets/icons/github.svg"; import github from "../../assets/icons/github.svg";
import logo from "../../assets/waveterm-logo-with-bg.svg"; import logo from "../../assets/waveterm-logo-with-bg.svg";
import { ReactComponent as AngleDownIcon } from "../../assets/icons/history/angle-down.svg";
dayjs.extend(localizedFormat); dayjs.extend(localizedFormat);
@ -877,7 +875,7 @@ class ViewRemoteConnDetailModal extends React.Component<{ remotesModel?: Remotes
return; return;
} }
let prtn = GlobalModel.showAlert({ let prtn = GlobalModel.showAlert({
message: "Are you sure you want to archive this connection?", message: "Are you sure you want to delete this connection?",
confirm: true, confirm: true,
}); });
prtn.then((confirm) => { prtn.then((confirm) => {
@ -924,7 +922,7 @@ class ViewRemoteConnDetailModal extends React.Component<{ remotesModel?: Remotes
let buttons: React.ReactNode[] = []; let buttons: React.ReactNode[] = [];
const archiveButton = ( const archiveButton = (
<Button theme="secondary" onClick={() => this.clickArchive()}> <Button theme="secondary" onClick={() => this.clickArchive()}>
Archive Delete
</Button> </Button>
); );
const disconnectButton = ( const disconnectButton = (
@ -1196,7 +1194,7 @@ class EditRemoteConnModal extends React.Component<{ remotesModel?: RemotesModel
return; return;
} }
let prtn = GlobalModel.showAlert({ let prtn = GlobalModel.showAlert({
message: "Are you sure you want to archive this connection?", message: "Are you sure you want to delete this connection?",
confirm: true, confirm: true,
}); });
@ -1234,6 +1232,20 @@ class EditRemoteConnModal extends React.Component<{ remotesModel?: RemotesModel
})(); })();
} }
@boundMethod
handleChangeConnectMode(value: string): void {
mobx.action(() => {
this.tempConnectMode.set(value);
})();
}
@boundMethod
handleChangeAuthMode(value: string): void {
mobx.action(() => {
this.tempAuthMode.set(value);
})();
}
@boundMethod @boundMethod
canResetPw(): boolean { canResetPw(): boolean {
if (this.remoteEdit == null) { if (this.remoteEdit == null) {
@ -1283,7 +1295,9 @@ class EditRemoteConnModal extends React.Component<{ remotesModel?: RemotesModel
kwargs["connectmode"] = this.tempConnectMode.get() ?? ""; kwargs["connectmode"] = this.tempConnectMode.get() ?? "";
} }
if (Object.keys(kwargs).length == 0) { if (Object.keys(kwargs).length == 0) {
this.submitted.set(true); mobx.action(() => {
this.submitted.set(true);
})();
return; return;
} }
kwargs["visual"] = "1"; kwargs["visual"] = "1";
@ -1343,7 +1357,7 @@ class EditRemoteConnModal extends React.Component<{ remotesModel?: RemotesModel
<div className="name text-primary">{getName(this.selectedRemote)}</div> <div className="name text-primary">{getName(this.selectedRemote)}</div>
<div className="header-actions"> <div className="header-actions">
<Button theme="secondary" onClick={this.clickArchive}> <Button theme="secondary" onClick={this.clickArchive}>
Archive Delete
</Button> </Button>
<Button theme="secondary" onClick={this.clickForceInstall}> <Button theme="secondary" onClick={this.clickForceInstall}>
Force Install Force Install