mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-20 15:43:13 +09:00
Migrate deprecated ant design APIs
Rename visible to open and use menu instead of overlay in Dropdown as both of these have been removed in the next major version of Antd.
This commit is contained in:
1 parent
2de029b96e
commit
a1c9bc5f9b
12 files changed
+81
-85
No files matched your search
@@ -11,20 +11,16 @@ const { Paragraph } = Typography;
|
|||||||
|
|
||||||
|
|
||||||
export default function AssignInstanceModal(props) {
|
export default function AssignInstanceModal(props) {
|
||||||
let [visible, setVisible] = useState(false);
|
let [open, setOpen] = useState(false);
|
||||||
let [hostList] = useHostList();
|
let [hostList] = useHostList();
|
||||||
let [applying, setApplying] = useState(false);
|
let [applying, setApplying] = useState(false);
|
||||||
let [form] = Form.useForm();
|
let [form] = Form.useForm();
|
||||||
let control = useContext(ControlContext);
|
let control = useContext(ControlContext);
|
||||||
|
|
||||||
function open() {
|
|
||||||
setVisible(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
function handleAssign() {
|
function handleAssign() {
|
||||||
let hostId = form.getFieldValue("host");
|
let hostId = form.getFieldValue("host");
|
||||||
if (hostId === undefined) {
|
if (hostId === undefined) {
|
||||||
setVisible(false);
|
setOpen(false);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -36,7 +32,7 @@ export default function AssignInstanceModal(props) {
|
|||||||
control.send(
|
control.send(
|
||||||
new libData.InstanceAssignRequest(props.id, hostId)
|
new libData.InstanceAssignRequest(props.id, hostId)
|
||||||
).then(() => {
|
).then(() => {
|
||||||
setVisible(false);
|
setOpen(false);
|
||||||
if (props.onFinish) {
|
if (props.onFinish) {
|
||||||
props.onFinish();
|
props.onFinish();
|
||||||
}
|
}
|
||||||
@@ -48,17 +44,17 @@ export default function AssignInstanceModal(props) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function handleCancel() {
|
function handleCancel() {
|
||||||
setVisible(false);
|
setOpen(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
return <>
|
return <>
|
||||||
<Button {...props.buttonProps} onClick={open}>
|
<Button {...props.buttonProps} onClick={() => setOpen(true)}>
|
||||||
{props.buttonContent || "Assign"}
|
{props.buttonContent || "Assign"}
|
||||||
</Button>
|
</Button>
|
||||||
<Modal
|
<Modal
|
||||||
title="Assign Instance"
|
title="Assign Instance"
|
||||||
okText="Assign"
|
okText="Assign"
|
||||||
visible={visible}
|
open={open}
|
||||||
confirmLoading={applying}
|
confirmLoading={applying}
|
||||||
onOk={handleAssign}
|
onOk={handleAssign}
|
||||||
onCancel={handleCancel}
|
onCancel={handleCancel}
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import { notifyErrorHandler } from "../util/notify";
|
|||||||
|
|
||||||
|
|
||||||
export default function CreateSaveModal(props) {
|
export default function CreateSaveModal(props) {
|
||||||
let [visible, setVisible] = useState(false);
|
let [open, setOpen] = useState(false);
|
||||||
let [creatingSave, setCreatingSave] = useState(false);
|
let [creatingSave, setCreatingSave] = useState(false);
|
||||||
let [form] = Form.useForm();
|
let [form] = Form.useForm();
|
||||||
let control = useContext(ControlContext);
|
let control = useContext(ControlContext);
|
||||||
@@ -56,7 +56,7 @@ export default function CreateSaveModal(props) {
|
|||||||
new libData.InstanceCreateSaveRequest(name, seed, mapGenSettings, mapSettings),
|
new libData.InstanceCreateSaveRequest(name, seed, mapGenSettings, mapSettings),
|
||||||
).then(() => {
|
).then(() => {
|
||||||
form.resetFields();
|
form.resetFields();
|
||||||
setVisible(false);
|
setOpen(false);
|
||||||
}).catch(
|
}).catch(
|
||||||
notifyErrorHandler("Error creating save")
|
notifyErrorHandler("Error creating save")
|
||||||
).finally(() => {
|
).finally(() => {
|
||||||
@@ -81,7 +81,7 @@ export default function CreateSaveModal(props) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function handleCancel() {
|
function handleCancel() {
|
||||||
setVisible(false);
|
setOpen(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
return <>
|
return <>
|
||||||
@@ -89,7 +89,7 @@ export default function CreateSaveModal(props) {
|
|||||||
loading={creatingSave}
|
loading={creatingSave}
|
||||||
disabled={props.instance.status !== "stopped"}
|
disabled={props.instance.status !== "stopped"}
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
setVisible(true);
|
setOpen(true);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
Create save
|
Create save
|
||||||
@@ -98,7 +98,7 @@ export default function CreateSaveModal(props) {
|
|||||||
title="Create Save"
|
title="Create Save"
|
||||||
width={560}
|
width={560}
|
||||||
okText="Create"
|
okText="Create"
|
||||||
visible={visible}
|
open={open}
|
||||||
confirmLoading={creatingSave}
|
confirmLoading={creatingSave}
|
||||||
onOk={createSave}
|
onOk={createSave}
|
||||||
onCancel={handleCancel}
|
onCancel={handleCancel}
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ const strcmp = new Intl.Collator(undefined, { numerice: "true", sensitivity: "ba
|
|||||||
|
|
||||||
function GenerateHostTokenButton(props) {
|
function GenerateHostTokenButton(props) {
|
||||||
let control = useContext(ControlContext);
|
let control = useContext(ControlContext);
|
||||||
let [visible, setVisible] = useState(false);
|
let [open, setOpen] = useState(false);
|
||||||
let [token, setToken] = useState(null);
|
let [token, setToken] = useState(null);
|
||||||
let [hostId, setHostId] = useState(null);
|
let [hostId, setHostId] = useState(null);
|
||||||
let [form] = Form.useForm();
|
let [form] = Form.useForm();
|
||||||
@@ -53,23 +53,23 @@ function GenerateHostTokenButton(props) {
|
|||||||
|
|
||||||
// Generate a new random
|
// Generate a new random
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (visible) {
|
if (open) {
|
||||||
generateToken().catch(notifyErrorHandler("Error generating token"));
|
generateToken().catch(notifyErrorHandler("Error generating token"));
|
||||||
}
|
}
|
||||||
}, [visible]);
|
}, [open]);
|
||||||
|
|
||||||
// Only install plugins that aren't filesystem paths. Npm modules have max 1 forward slash in their name.
|
// Only install plugins that aren't filesystem paths. Npm modules have max 1 forward slash in their name.
|
||||||
const pluginString = pluginList.map(p => `"${p.requirePath}"`).filter(x => x.split("/") <= 1).join(" ");
|
const pluginString = pluginList.map(p => `"${p.requirePath}"`).filter(x => x.split("/") <= 1).join(" ");
|
||||||
return <>
|
return <>
|
||||||
<Button
|
<Button
|
||||||
onClick={() => { setVisible(true); }}
|
onClick={() => { setOpen(true); }}
|
||||||
>Generate Token</Button>
|
>Generate Token</Button>
|
||||||
<Modal
|
<Modal
|
||||||
title="Generate Host Token"
|
title="Generate Host Token"
|
||||||
visible={visible}
|
open={open}
|
||||||
footer={null}
|
footer={null}
|
||||||
onCancel={() => {
|
onCancel={() => {
|
||||||
setVisible(false);
|
setOpen(false);
|
||||||
setToken(null);
|
setToken(null);
|
||||||
form.resetFields();
|
form.resetFields();
|
||||||
}}
|
}}
|
||||||
|
|||||||
@@ -126,9 +126,9 @@ export default function InstanceViewPage(props) {
|
|||||||
label: "Delete",
|
label: "Delete",
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
let instanceButtonsMenu = <Menu
|
let instanceButtonsMenuProps = {
|
||||||
items={instanceButtonMenuItems}
|
items: instanceButtonMenuItems,
|
||||||
onClick={({ key }) => {
|
onClick: ({ key }) => {
|
||||||
if (key === "export") {
|
if (key === "export") {
|
||||||
setExportingData(true);
|
setExportingData(true);
|
||||||
control.sendTo(
|
control.sendTo(
|
||||||
@@ -167,8 +167,8 @@ export default function InstanceViewPage(props) {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}}
|
},
|
||||||
/>;
|
};
|
||||||
let instanceButtons = <Space>
|
let instanceButtons = <Space>
|
||||||
{
|
{
|
||||||
account.hasAnyPermission("core.instance.start", "core.instance.stop")
|
account.hasAnyPermission("core.instance.start", "core.instance.stop")
|
||||||
@@ -180,7 +180,7 @@ export default function InstanceViewPage(props) {
|
|||||||
"core.instance.extract_players",
|
"core.instance.extract_players",
|
||||||
"core.instance.kill",
|
"core.instance.kill",
|
||||||
"core.instance.delete",
|
"core.instance.delete",
|
||||||
) && <Dropdown placement="bottomRight" trigger={["click"]} overlay={instanceButtonsMenu}>
|
) && <Dropdown placement="bottomRight" trigger={["click"]} menu={instanceButtonsMenuProps}>
|
||||||
<Button>More <DownOutlined /></Button>
|
<Button>More <DownOutlined /></Button>
|
||||||
</Dropdown>}
|
</Dropdown>}
|
||||||
</Space>;
|
</Space>;
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ import { notifyErrorHandler } from "../util/notify";
|
|||||||
function CreateInstanceButton(props) {
|
function CreateInstanceButton(props) {
|
||||||
let control = useContext(ControlContext);
|
let control = useContext(ControlContext);
|
||||||
let history = useHistory();
|
let history = useHistory();
|
||||||
let [visible, setVisible] = useState(false);
|
let [open, setOpen] = useState(false);
|
||||||
let [form] = Form.useForm();
|
let [form] = Form.useForm();
|
||||||
|
|
||||||
async function createInstance() {
|
async function createInstance() {
|
||||||
@@ -30,7 +30,7 @@ function CreateInstanceButton(props) {
|
|||||||
instanceConfig.set("instance.name", values.instanceName);
|
instanceConfig.set("instance.name", values.instanceName);
|
||||||
let serializedConfig = instanceConfig.serialize("controller");
|
let serializedConfig = instanceConfig.serialize("controller");
|
||||||
await control.send(new libData.InstanceCreateRequest(serializedConfig));
|
await control.send(new libData.InstanceCreateRequest(serializedConfig));
|
||||||
setVisible(false);
|
setOpen(false);
|
||||||
history.push(`/instances/${instanceConfig.get("instance.id")}/view`);
|
history.push(`/instances/${instanceConfig.get("instance.id")}/view`);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -38,15 +38,15 @@ function CreateInstanceButton(props) {
|
|||||||
<Button
|
<Button
|
||||||
type="primary"
|
type="primary"
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
setVisible(true);
|
setOpen(true);
|
||||||
}}
|
}}
|
||||||
>Create</Button>
|
>Create</Button>
|
||||||
<Modal
|
<Modal
|
||||||
title="Create Instance"
|
title="Create Instance"
|
||||||
okText="Create"
|
okText="Create"
|
||||||
visible={visible}
|
open={open}
|
||||||
onOk={() => { createInstance().catch(notifyErrorHandler("Error creating instance")); }}
|
onOk={() => { createInstance().catch(notifyErrorHandler("Error creating instance")); }}
|
||||||
onCancel={() => { setVisible(false); }}
|
onCancel={() => { setOpen(false); }}
|
||||||
destroyOnClose
|
destroyOnClose
|
||||||
>
|
>
|
||||||
<Form form={form}>
|
<Form form={form}>
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import { notifyErrorHandler } from "../util/notify";
|
|||||||
|
|
||||||
|
|
||||||
export default function LoadScenarioModal(props) {
|
export default function LoadScenarioModal(props) {
|
||||||
let [visible, setVisible] = useState(false);
|
let [open, setOpen] = useState(false);
|
||||||
let [loadingScenario, setLoadingScenario] = useState(false);
|
let [loadingScenario, setLoadingScenario] = useState(false);
|
||||||
let [form] = Form.useForm();
|
let [form] = Form.useForm();
|
||||||
let control = useContext(ControlContext);
|
let control = useContext(ControlContext);
|
||||||
@@ -55,7 +55,7 @@ export default function LoadScenarioModal(props) {
|
|||||||
{ instanceId: props.instance.id },
|
{ instanceId: props.instance.id },
|
||||||
new libData.InstanceLoadScenarioRequest(scenario, seed, mapGenSettings, mapSettings),
|
new libData.InstanceLoadScenarioRequest(scenario, seed, mapGenSettings, mapSettings),
|
||||||
).then(() => {
|
).then(() => {
|
||||||
setVisible(false);
|
setOpen(false);
|
||||||
}).catch(
|
}).catch(
|
||||||
notifyErrorHandler("Error loading scenario")
|
notifyErrorHandler("Error loading scenario")
|
||||||
).finally(() => {
|
).finally(() => {
|
||||||
@@ -80,7 +80,7 @@ export default function LoadScenarioModal(props) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function handleCancel() {
|
function handleCancel() {
|
||||||
setVisible(false);
|
setOpen(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
return <>
|
return <>
|
||||||
@@ -88,7 +88,7 @@ export default function LoadScenarioModal(props) {
|
|||||||
loading={loadingScenario}
|
loading={loadingScenario}
|
||||||
disabled={props.instance.status !== "stopped"}
|
disabled={props.instance.status !== "stopped"}
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
setVisible(true);
|
setOpen(true);
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
Load scenario
|
Load scenario
|
||||||
@@ -97,7 +97,7 @@ export default function LoadScenarioModal(props) {
|
|||||||
title="Load Scenario"
|
title="Load Scenario"
|
||||||
width={560}
|
width={560}
|
||||||
okText="Load"
|
okText="Load"
|
||||||
visible={visible}
|
open={open}
|
||||||
confirmLoading={loadingScenario}
|
confirmLoading={loadingScenario}
|
||||||
onOk={loadScenario}
|
onOk={loadScenario}
|
||||||
onCancel={handleCancel}
|
onCancel={handleCancel}
|
||||||
|
|||||||
@@ -485,7 +485,7 @@ function CopyButton(props) {
|
|||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
let denied = clipboard.readPermissionState === "denied";
|
let denied = clipboard.readPermissionState === "denied";
|
||||||
return <Tooltip title={denied ? clipboard.deniedReason : "Copied!"} visible={denied ? undefined : copiedVisible}>
|
return <Tooltip title={denied ? clipboard.deniedReason : "Copied!"} open={denied ? undefined : copiedVisible}>
|
||||||
<Button disabled={denied} onClick={() => {
|
<Button disabled={denied} onClick={() => {
|
||||||
try {
|
try {
|
||||||
clipboard.writeText(props.content);
|
clipboard.writeText(props.content);
|
||||||
@@ -503,19 +503,19 @@ function CopyButton(props) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function ExportButton(props) {
|
function ExportButton(props) {
|
||||||
let [visible, setVisible] = useState(false);
|
let [open, setOpen] = useState(false);
|
||||||
function close() {
|
function close() {
|
||||||
setVisible(false);
|
setOpen(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
let exportString;
|
let exportString;
|
||||||
if (visible) { exportString = props.modPack.toModPackString(); }
|
if (open) { exportString = props.modPack.toModPackString(); }
|
||||||
|
|
||||||
return <>
|
return <>
|
||||||
<Button icon={<ExportOutlined />} onClick={() => { setVisible(true); }}>Export to string</Button>
|
<Button icon={<ExportOutlined />} onClick={() => { setOpen(true); }}>Export to string</Button>
|
||||||
<Modal
|
<Modal
|
||||||
title="Mod Pack String"
|
title="Mod Pack String"
|
||||||
visible={visible}
|
open={open}
|
||||||
onOk={close}
|
onOk={close}
|
||||||
onCancel={close}
|
onCancel={close}
|
||||||
destroyOnClose
|
destroyOnClose
|
||||||
|
|||||||
@@ -25,19 +25,19 @@ const { logger } = libLogging;
|
|||||||
function ImportModPackButton() {
|
function ImportModPackButton() {
|
||||||
let control = useContext(ControlContext);
|
let control = useContext(ControlContext);
|
||||||
let history = useHistory();
|
let history = useHistory();
|
||||||
let [visible, setVisible] = useState(false);
|
let [open, setOpen] = useState(false);
|
||||||
let [form] = Form.useForm();
|
let [form] = Form.useForm();
|
||||||
function close() {
|
function close() {
|
||||||
setVisible(false);
|
setOpen(false);
|
||||||
}
|
}
|
||||||
return <>
|
return <>
|
||||||
<Button icon={<ImportOutlined />} onClick={() => { setVisible(true); }}>Import string</Button>
|
<Button icon={<ImportOutlined />} onClick={() => { setOpen(true); }}>Import string</Button>
|
||||||
<Modal
|
<Modal
|
||||||
title="Import Mod Pack String"
|
title="Import Mod Pack String"
|
||||||
visible={visible}
|
open={open}
|
||||||
okText="Import"
|
okText="Import"
|
||||||
cancelText="Cancel"
|
cancelText="Cancel"
|
||||||
onCancel={() => { setVisible(false); }}
|
onCancel={() => { setOpen(false); }}
|
||||||
onOk={() => {
|
onOk={() => {
|
||||||
(async () => {
|
(async () => {
|
||||||
let values;
|
let values;
|
||||||
@@ -74,19 +74,19 @@ function ImportModPackButton() {
|
|||||||
function CreateModPackButton() {
|
function CreateModPackButton() {
|
||||||
let control = useContext(ControlContext);
|
let control = useContext(ControlContext);
|
||||||
let history = useHistory();
|
let history = useHistory();
|
||||||
let [visible, setVisible] = useState(false);
|
let [open, setOpen] = useState(false);
|
||||||
let [form] = Form.useForm();
|
let [form] = Form.useForm();
|
||||||
function close() {
|
function close() {
|
||||||
setVisible(false);
|
setOpen(false);
|
||||||
}
|
}
|
||||||
return <>
|
return <>
|
||||||
<Button type="primary" icon={<PlusOutlined />} onClick={() => { setVisible(true); }}>Create</Button>
|
<Button type="primary" icon={<PlusOutlined />} onClick={() => { setOpen(true); }}>Create</Button>
|
||||||
<Modal
|
<Modal
|
||||||
title="Create Mod Pack"
|
title="Create Mod Pack"
|
||||||
visible={visible}
|
open={open}
|
||||||
okText="Create"
|
okText="Create"
|
||||||
cancelText="Cancel"
|
cancelText="Cancel"
|
||||||
onCancel={() => { setVisible(false); }}
|
onCancel={() => { setOpen(false); }}
|
||||||
onOk={() => {
|
onOk={() => {
|
||||||
(async () => {
|
(async () => {
|
||||||
let values;
|
let values;
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ const strcmp = new Intl.Collator(undefined, { numerice: "true", sensitivity: "ba
|
|||||||
function CreateRoleButton() {
|
function CreateRoleButton() {
|
||||||
let control = useContext(ControlContext);
|
let control = useContext(ControlContext);
|
||||||
let history = useHistory();
|
let history = useHistory();
|
||||||
let [visible, setVisible] = useState(false);
|
let [open, setOpen] = useState(false);
|
||||||
let [form] = Form.useForm();
|
let [form] = Form.useForm();
|
||||||
|
|
||||||
async function createRole() {
|
async function createRole() {
|
||||||
@@ -29,21 +29,21 @@ function CreateRoleButton() {
|
|||||||
let result = await control.send(
|
let result = await control.send(
|
||||||
new libData.RoleCreateRequest(values.roleName, values.description || "", [])
|
new libData.RoleCreateRequest(values.roleName, values.description || "", [])
|
||||||
);
|
);
|
||||||
setVisible(false);
|
setOpen(false);
|
||||||
history.push(`/roles/${result.id}/view`);
|
history.push(`/roles/${result.id}/view`);
|
||||||
}
|
}
|
||||||
|
|
||||||
return <>
|
return <>
|
||||||
<Button
|
<Button
|
||||||
type="primary"
|
type="primary"
|
||||||
onClick={() => { setVisible(true); }}
|
onClick={() => { setOpen(true); }}
|
||||||
>Create</Button>
|
>Create</Button>
|
||||||
<Modal
|
<Modal
|
||||||
title="Create Role"
|
title="Create Role"
|
||||||
okText="Create"
|
okText="Create"
|
||||||
visible={visible}
|
open={open}
|
||||||
onOk={() => { createRole().catch(notifyErrorHandler("Error creating role")); }}
|
onOk={() => { createRole().catch(notifyErrorHandler("Error creating role")); }}
|
||||||
onCancel={() => { setVisible(false); }}
|
onCancel={() => { setOpen(false); }}
|
||||||
destroyOnClose
|
destroyOnClose
|
||||||
>
|
>
|
||||||
<Form form={form}>
|
<Form form={form}>
|
||||||
|
|||||||
@@ -19,17 +19,17 @@ import { notifyErrorHandler } from "../util/notify";
|
|||||||
|
|
||||||
function RenameModal(props) {
|
function RenameModal(props) {
|
||||||
let control = useContext(ControlContext);
|
let control = useContext(ControlContext);
|
||||||
let [visible, setVisible] = useState(false);
|
let [open, setOpen] = useState(false);
|
||||||
let [form] = Form.useForm();
|
let [form] = Form.useForm();
|
||||||
|
|
||||||
return <>
|
return <>
|
||||||
<Button disabled={props.disabled} onClick={() => setVisible(true)}>Rename</Button>
|
<Button disabled={props.disabled} onClick={() => setOpen(true)}>Rename</Button>
|
||||||
<Modal
|
<Modal
|
||||||
title="Rename save"
|
title="Rename save"
|
||||||
okText="Rename"
|
okText="Rename"
|
||||||
visible={visible}
|
open={open}
|
||||||
onOk={() => form.submit()}
|
onOk={() => form.submit()}
|
||||||
onCancel={() => setVisible(false)}
|
onCancel={() => setOpen(false)}
|
||||||
>
|
>
|
||||||
<Form
|
<Form
|
||||||
form={form}
|
form={form}
|
||||||
@@ -39,7 +39,7 @@ function RenameModal(props) {
|
|||||||
control.send(
|
control.send(
|
||||||
new libData.InstanceRenameSaveRequest(props.instanceId, props.save.name, values.newName)
|
new libData.InstanceRenameSaveRequest(props.instanceId, props.save.name, values.newName)
|
||||||
).then(() => {
|
).then(() => {
|
||||||
setVisible(false);
|
setOpen(false);
|
||||||
form.resetFields();
|
form.resetFields();
|
||||||
}).catch(notifyErrorHandler("Error renaming save"));
|
}).catch(notifyErrorHandler("Error renaming save"));
|
||||||
}}
|
}}
|
||||||
@@ -58,17 +58,17 @@ function RenameModal(props) {
|
|||||||
|
|
||||||
function CopyModal(props) {
|
function CopyModal(props) {
|
||||||
let control = useContext(ControlContext);
|
let control = useContext(ControlContext);
|
||||||
let [visible, setVisible] = useState(false);
|
let [open, setOpen] = useState(false);
|
||||||
let [form] = Form.useForm();
|
let [form] = Form.useForm();
|
||||||
|
|
||||||
return <>
|
return <>
|
||||||
<Button disabled={props.disabled} onClick={() => setVisible(true)}>Copy</Button>
|
<Button disabled={props.disabled} onClick={() => setOpen(true)}>Copy</Button>
|
||||||
<Modal
|
<Modal
|
||||||
title="Copy save"
|
title="Copy save"
|
||||||
okText="Copy"
|
okText="Copy"
|
||||||
visible={visible}
|
open={open}
|
||||||
onOk={() => form.submit()}
|
onOk={() => form.submit()}
|
||||||
onCancel={() => setVisible(false)}
|
onCancel={() => setOpen(false)}
|
||||||
>
|
>
|
||||||
<Form
|
<Form
|
||||||
form={form}
|
form={form}
|
||||||
@@ -78,7 +78,7 @@ function CopyModal(props) {
|
|||||||
control.send(
|
control.send(
|
||||||
new libData.InstanceCopySaveRequest(props.instanceId, props.save.name, values.newName)
|
new libData.InstanceCopySaveRequest(props.instanceId, props.save.name, values.newName)
|
||||||
).then(() => {
|
).then(() => {
|
||||||
setVisible(false);
|
setOpen(false);
|
||||||
form.resetFields();
|
form.resetFields();
|
||||||
}).catch(notifyErrorHandler("Error copying save"));
|
}).catch(notifyErrorHandler("Error copying save"));
|
||||||
}}
|
}}
|
||||||
@@ -98,18 +98,18 @@ function CopyModal(props) {
|
|||||||
function TransferModal(props) {
|
function TransferModal(props) {
|
||||||
let account = useAccount();
|
let account = useAccount();
|
||||||
let control = useContext(ControlContext);
|
let control = useContext(ControlContext);
|
||||||
let [visible, setVisible] = useState(false);
|
let [open, setOpen] = useState(false);
|
||||||
let [form] = Form.useForm();
|
let [form] = Form.useForm();
|
||||||
let [instanceList] = useInstanceList();
|
let [instanceList] = useInstanceList();
|
||||||
|
|
||||||
return <>
|
return <>
|
||||||
<Button disabled={props.disabled} onClick={() => setVisible(true)}>Transfer</Button>
|
<Button disabled={props.disabled} onClick={() => setOpen(true)}>Transfer</Button>
|
||||||
<Modal
|
<Modal
|
||||||
title="Transfer save"
|
title="Transfer save"
|
||||||
okText="Transfer"
|
okText="Transfer"
|
||||||
visible={visible}
|
open={open}
|
||||||
onOk={() => form.submit()}
|
onOk={() => form.submit()}
|
||||||
onCancel={() => setVisible(false)}
|
onCancel={() => setOpen(false)}
|
||||||
destroyOnClose
|
destroyOnClose
|
||||||
>
|
>
|
||||||
<Form
|
<Form
|
||||||
@@ -118,7 +118,7 @@ function TransferModal(props) {
|
|||||||
wrapperCol={{ span: 18 }}
|
wrapperCol={{ span: 18 }}
|
||||||
initialValues={{ transferredName: props.save.name, copy: false }}
|
initialValues={{ transferredName: props.save.name, copy: false }}
|
||||||
onFinish={values => {
|
onFinish={values => {
|
||||||
setVisible(false);
|
setOpen(false);
|
||||||
let hide = message.loading("Transferring save...", 0);
|
let hide = message.loading("Transferring save...", 0);
|
||||||
control.send(new libData.InstanceTransferSaveRequest(
|
control.send(new libData.InstanceTransferSaveRequest(
|
||||||
props.instanceId,
|
props.instanceId,
|
||||||
|
|||||||
@@ -26,20 +26,20 @@ export default function SiteLayout(props) {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
let accountMenu = <Menu
|
let accountMenuProps = {
|
||||||
onClick={({ key }) => {
|
onClick: ({ key }) => {
|
||||||
if (key === "user") {
|
if (key === "user") {
|
||||||
history.push(`/users/${account.name}/view`);
|
history.push(`/users/${account.name}/view`);
|
||||||
} else if (key === "logOut") {
|
} else if (key === "logOut") {
|
||||||
account.logOut();
|
account.logOut();
|
||||||
}
|
}
|
||||||
}}
|
},
|
||||||
items={[
|
items: [
|
||||||
{ label: account.name, key: "user" },
|
{ label: account.name, key: "user" },
|
||||||
{ type: "divider" },
|
{ type: "divider" },
|
||||||
{ label: "Log out", danger: true, key: "logOut" },
|
{ label: "Log out", danger: true, key: "logOut" },
|
||||||
]}
|
],
|
||||||
/>;
|
};
|
||||||
|
|
||||||
let combinedPages = [...pages];
|
let combinedPages = [...pages];
|
||||||
for (let plugin of plugins.values()) {
|
for (let plugin of plugins.values()) {
|
||||||
@@ -88,7 +88,7 @@ export default function SiteLayout(props) {
|
|||||||
className="account-dropdown-header"
|
className="account-dropdown-header"
|
||||||
placement="bottomRight"
|
placement="bottomRight"
|
||||||
trigger="click"
|
trigger="click"
|
||||||
overlay={accountMenu}
|
menu={accountMenuProps}
|
||||||
>
|
>
|
||||||
<UserOutlined/>
|
<UserOutlined/>
|
||||||
</Dropdown>
|
</Dropdown>
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ const strcmp = new Intl.Collator(undefined, { numerice: "true", sensitivity: "ba
|
|||||||
function CreateUserButton() {
|
function CreateUserButton() {
|
||||||
let control = useContext(ControlContext);
|
let control = useContext(ControlContext);
|
||||||
let history = useHistory();
|
let history = useHistory();
|
||||||
let [visible, setVisible] = useState(false);
|
let [open, setOpen] = useState(false);
|
||||||
let [form] = Form.useForm();
|
let [form] = Form.useForm();
|
||||||
|
|
||||||
async function createUser() {
|
async function createUser() {
|
||||||
@@ -29,21 +29,21 @@ function CreateUserButton() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
await control.send(new libData.UserCreateRequest(values.userName));
|
await control.send(new libData.UserCreateRequest(values.userName));
|
||||||
setVisible(false);
|
setOpen(false);
|
||||||
history.push(`/users/${values.userName}/view`);
|
history.push(`/users/${values.userName}/view`);
|
||||||
}
|
}
|
||||||
|
|
||||||
return <>
|
return <>
|
||||||
<Button
|
<Button
|
||||||
type="primary"
|
type="primary"
|
||||||
onClick={() => { setVisible(true); }}
|
onClick={() => { setOpen(true); }}
|
||||||
>Create</Button>
|
>Create</Button>
|
||||||
<Modal
|
<Modal
|
||||||
title="Create User"
|
title="Create User"
|
||||||
okText="Create"
|
okText="Create"
|
||||||
visible={visible}
|
open={open}
|
||||||
onOk={() => { createUser().catch(notifyErrorHandler("Error creating user")); }}
|
onOk={() => { createUser().catch(notifyErrorHandler("Error creating user")); }}
|
||||||
onCancel={() => { setVisible(false); }}
|
onCancel={() => { setOpen(false); }}
|
||||||
destroyOnClose
|
destroyOnClose
|
||||||
>
|
>
|
||||||
<Form form={form}>
|
<Form form={form}>
|
||||||
|
|||||||
Reference in new issue
Block a user