From 82c3d27bff591774e4b8225b93c66b05942ed0d5 Mon Sep 17 00:00:00 2001 From: Hornwitser Date: Wed, 9 Jun 2021 13:15:16 +0200 Subject: [PATCH] Rewrite instances page Render the table in the instances page using an antd Table component directly and feed it the data via an automatically updating list of instances. --- .../web_ui/src/components/InstancesPage.jsx | 114 +++++++++++++----- packages/web_ui/src/index.css | 4 + packages/web_ui/src/model/instance.jsx | 41 +++++++ packages/web_ui/src/util/websocket.jsx | 13 +- 4 files changed, 136 insertions(+), 36 deletions(-) diff --git a/packages/web_ui/src/components/InstancesPage.jsx b/packages/web_ui/src/components/InstancesPage.jsx index 0d4f9031..bab926ba 100644 --- a/packages/web_ui/src/components/InstancesPage.jsx +++ b/packages/web_ui/src/components/InstancesPage.jsx @@ -1,52 +1,104 @@ -import React, { useContext } from "react"; +import React, { useContext, useState } from "react"; import { useHistory } from "react-router-dom"; +import { Button, Form, Input, Modal, PageHeader, Table } from "antd"; import libLink from "@clusterio/lib/link"; import libConfig from "@clusterio/lib/config"; -import DataTable from "./data-table"; import ControlContext from "./ControlContext"; import PageLayout from "./PageLayout"; +import { useInstanceList } from "../model/instance"; +import { notifyErrorHandler } from "../util/notify"; +import { useSlaveList } from "../model/slave"; -export default function InstancesPage() { +function CreateInstanceButton(props) { let control = useContext(ControlContext); let history = useHistory(); + let [visible, setVisible] = useState(false); + let [form] = Form.useForm(); - async function listInstances() { - let result = await libLink.messages.listInstances.send(control); - return result["list"].map(item => ({ - key: item["id"], - "Name": item["name"], - "Assigned Slave": item["assigned_slave"], - "Status": item["status"], - })); + async function createInstance() { + let values = form.getFieldsValue(); + if (!values.instanceName) { + form.setFields([{ name: "mapGenSettings", errors: ["Name is required"] }]); + } + + let instanceConfig = new libConfig.InstanceConfig("control"); + await instanceConfig.init(); + instanceConfig.set("instance.name", values.instanceName); + let serialized_config = instanceConfig.serialize("master"); + let result = await libLink.messages.createInstance.send(control, { serialized_config }); + setVisible(false); + history.push(`/instances/${instanceConfig.get("instance.id")}/view`); } + return <> + + { createInstance().catch(notifyErrorHandler("Error creating instance")); }} + onCancel={() => { setVisible(false); }} + destroyOnClose + > +
+ + + +
+
+ ; +} + +export default function InstancesPage() { + let history = useHistory(); + let [slaveList] = useSlaveList(); + let [instanceList] = useInstanceList(); + return -

Instances

- + /> + + { - let instanceConfig = new libConfig.InstanceConfig("control"); - await instanceConfig.init(); - instanceConfig.set("instance.name", args.name); - let serialized_config = instanceConfig.serialize("master"); - let response = await libLink.messages.createInstance.send(control, { serialized_config }); + dataIndex: "name", }, - }} - TableProps={{ - onRow: (record, rowIndex) => ({ - onClick: event => { - history.push(`/instances/${record.key}/view`); + { + title: "Assigned Slave", + key: "assigned_slave", + render: instance => { + let slave = slaveList.find(s => s.id === instance.assigned_slave); + if (slave) { + return slave.name; + } + return instance.assigned_slave; }, - }), - }} + }, + { + title: "Status", + dataIndex: "status", + }, + ]} + dataSource={instanceList} + rowKey={instance => instance["id"]} + pagination={false} + onRow={(record, rowIndex) => ({ + onClick: event => { + history.push(`/instances/${record.id}/view`); + }, + })} /> ; } diff --git a/packages/web_ui/src/index.css b/packages/web_ui/src/index.css index 97d8a4a6..1129e846 100644 --- a/packages/web_ui/src/index.css +++ b/packages/web_ui/src/index.css @@ -67,6 +67,10 @@ body { padding-right: 64px; } +.site-page-header { + padding: 0 0 16px; +} + .section-header { display: flex; align-items: center; diff --git a/packages/web_ui/src/model/instance.jsx b/packages/web_ui/src/model/instance.jsx index 4048a135..5b027d3a 100644 --- a/packages/web_ui/src/model/instance.jsx +++ b/packages/web_ui/src/model/instance.jsx @@ -39,3 +39,44 @@ export function useInstance(id) { return [instance, updateInstance]; } + +export function useInstanceList() { + let control = useContext(ControlContext); + let [instanceList, setInstanceList] = useState([]); + + function updateInstanceList() { + libLink.messages.listInstances.send(control).then(result => { + setInstanceList(result.list); + }).catch(err => { + logger.error(`Failed to list instances:\n${err}`); + }); + } + + useEffect(() => { + updateInstanceList(); + + function updateHandler(newInstance) { + setInstanceList(oldList => { + let newList = oldList.concat(); + let index = newList.findIndex(s => s.id === newInstance.id); + if (newInstance.status !== "deleted") { + if (index !== -1) { + newList[index] = newInstance; + } else { + newList.push(newInstance); + } + } else if (index !== -1) { + newList.splice(index, 1); + } + return newList; + }); + } + + control.onInstanceUpdate(null, updateHandler); + return () => { + control.offInstanceUpdate(null, updateHandler); + }; + }, []); + + return [instanceList]; +} diff --git a/packages/web_ui/src/util/websocket.jsx b/packages/web_ui/src/util/websocket.jsx index 6b07fc65..6b3b983f 100644 --- a/packages/web_ui/src/util/websocket.jsx +++ b/packages/web_ui/src/util/websocket.jsx @@ -154,14 +154,17 @@ export class Control extends libLink.Link { } async instanceUpdateEventHandler(message) { - let handlers = this.instanceUpdateHandlers.get(message.data.id); - for (let handler of handlers || []) { + let handlers = [].concat( + this.instanceUpdateHandlers.get(null) || [], + this.instanceUpdateHandlers.get(message.data.id) || [], + ); + for (let handler of handlers) { handler(message.data); } }; async onInstanceUpdate(id, handler) { - if (!Number.isInteger(id)) { + if (id !== null && !Number.isInteger(id)) { throw new Error("Invalid instance id"); } @@ -202,8 +205,8 @@ export class Control extends libLink.Link { } await libLink.messages.setInstanceSubscriptions.send(this, { - all: false, - instance_ids: [...this.instanceUpdateHandlers.keys()], + all: this.instanceUpdateHandlers.has(null), + instance_ids: [...this.instanceUpdateHandlers.keys()].filter(e => e !== null), }); }