Fix no way to unassign instances in Web UI

This commit is contained in:
Hornwitser committed 2023-02-15 20:31:02 +01:00
1 parent 2d8b35291d
commit 082d07d718
3 files changed
+14 -1

No files matched your search

+3
View File
@@ -356,6 +356,9 @@ class ControlConnection extends BaseConnection {
instance_id, instance_id,
serialized_config: instance.config.serialize("slave"), serialized_config: instance.config.serialize("slave"),
}); });
} else {
instance.status = "unassigned";
this._master.instanceUpdated(instance);
} }
} }
@@ -28,6 +28,10 @@ export default function AssignInstanceModal(props) {
return; return;
} }
if (slaveId === "null") {
slaveId = null;
}
setApplying(true); setApplying(true);
libLink.messages.assignInstanceCommand.send(control, { libLink.messages.assignInstanceCommand.send(control, {
instance_id: props.id, instance_id: props.id,
@@ -67,9 +71,12 @@ export default function AssignInstanceModal(props) {
the instance. Note that reassigning an instance from the instance. Note that reassigning an instance from
one slave to another will not move the server save over. one slave to another will not move the server save over.
</Paragraph> </Paragraph>
<Form form={form} initialValues={{ slave: props.slaveId }}> <Form form={form} initialValues={{ slave: props.slaveId === null ? "null" : props.slaveId }}>
<Form.Item name="slave" label="Slave"> <Form.Item name="slave" label="Slave">
<Select> <Select>
<Select.Option value={"null"}>
<Typography.Text italic>Unassigned</Typography.Text>
</Select.Option>
{slaveList.map((slave) => <Select.Option {slaveList.map((slave) => <Select.Option
key={slave["id"]} key={slave["id"]}
value={slave["id"]} value={slave["id"]}
@@ -16,6 +16,9 @@ export default function InstanceList(props) {
let [slaveList] = useSlaveList(); let [slaveList] = useSlaveList();
function slaveName(slaveId) { function slaveName(slaveId) {
if (slaveId === null) {
return "";
}
let slave = slaveList.find(s => s.id === slaveId); let slave = slaveList.find(s => s.id === slaveId);
if (slave) { if (slave) {
return slave.name; return slave.name;