mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-23 00:13:13 +09:00
Fix instance list
This commit is contained in:
1 file changed
+16
-15
@@ -1,7 +1,7 @@
|
|||||||
import React from "react";
|
import React from "react";
|
||||||
import { useHistory } from "react-router-dom";
|
import { useHistory } from "react-router-dom";
|
||||||
import { notification, Button, Table } from "antd";
|
import { message, Button, Table } from "antd";
|
||||||
import { CopyOutlined } from "@ant-design/icons";
|
import CopyOutlined from "@ant-design/icons/CopyOutlined";
|
||||||
|
|
||||||
import { useSlaveList } from "../model/slave";
|
import { useSlaveList } from "../model/slave";
|
||||||
import InstanceStatusTag from "./InstanceStatusTag";
|
import InstanceStatusTag from "./InstanceStatusTag";
|
||||||
@@ -19,13 +19,18 @@ export default function InstanceList(props) {
|
|||||||
}
|
}
|
||||||
return String(slaveId);
|
return String(slaveId);
|
||||||
}
|
}
|
||||||
function slavePublicAddress(slaveId) {
|
|
||||||
let slave = slaveList.find(s => s.id === slaveId);
|
function instancePublicAddress(instance) {
|
||||||
if (slave) {
|
let slave = slaveList.find(s => s.id === instance.assigned_slave);
|
||||||
|
if (slave && slave.public_address) {
|
||||||
|
if (instance.game_port) {
|
||||||
|
return `${slave.public_address}:${instance.game_port}`;
|
||||||
|
}
|
||||||
return slave.public_address;
|
return slave.public_address;
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
let columns = [
|
let columns = [
|
||||||
{
|
{
|
||||||
title: "Name",
|
title: "Name",
|
||||||
@@ -43,23 +48,19 @@ export default function InstanceList(props) {
|
|||||||
title: "Public address",
|
title: "Public address",
|
||||||
key: "public_address",
|
key: "public_address",
|
||||||
render: instance => {
|
render: instance => {
|
||||||
let address = slavePublicAddress(instance["assigned_slave"]);
|
let public_address = instancePublicAddress(instance);
|
||||||
let full_address = address + (instance["game_port"] !== null ? `:${instance["game_port"]}` : "");
|
return public_address ? <>
|
||||||
return <>
|
{public_address}
|
||||||
{full_address}
|
|
||||||
<Button
|
<Button
|
||||||
type="text"
|
type="text"
|
||||||
icon={<CopyOutlined/>}
|
icon={<CopyOutlined/>}
|
||||||
onClick={(e) => {
|
onClick={(e) => {
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
navigator.clipboard.writeText(full_address);
|
navigator.clipboard.writeText(public_address);
|
||||||
notification.success({
|
message.success("Copied public address!");
|
||||||
message: "Copied public address!",
|
|
||||||
duration: 1.5,
|
|
||||||
});
|
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</>;
|
</> : "";
|
||||||
},
|
},
|
||||||
sorter: (a, b) => strcmp(slavePublicAddress(a["assigned_slave"]), slavePublicAddress(b["assigned_slave"])),
|
sorter: (a, b) => strcmp(slavePublicAddress(a["assigned_slave"]), slavePublicAddress(b["assigned_slave"])),
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in new issue
Block a user