Fix web interface indents

Use project standard of tabs for indents.
This commit is contained in:
Hornwitser committed 2020-09-28 05:51:15 +02:00
1 parent 94200433cc
commit 8dce1dd0fd
16 files changed
+1267 -1267

No files matched your search

+5 -5
View File
@@ -5,9 +5,9 @@ import basename from "../basename";
import Layout from "../layout"; import Layout from "../layout";
export default function App() { export default function App() {
return ( return (
<BrowserRouter basename={basename}> <BrowserRouter basename={basename}>
<Layout /> <Layout />
</BrowserRouter> </BrowserRouter>
); );
} }
+230 -230
View File
@@ -19,28 +19,28 @@ const { Panel } = Collapse;
* RecordIdField - String - By default we assume the column "Id" is a unique identifier for a record. If that isn't the case, supply the column name here * RecordIdField - String - By default we assume the column "Id" is a unique identifier for a record. If that isn't the case, supply the column name here
*/ */
class DataTable extends Component { class DataTable extends Component {
constructor(props) { constructor(props) {
super(props); super(props);
if (!this.props.DataFunction) throw new Error("DataFunction not defined") if (!this.props.DataFunction) throw new Error("DataFunction not defined")
this.state = { this.state = {
pagination: { pagination: {
pageSize: 100, pageSize: 100,
current: 1 current: 1
}, },
filters: this.props.Filters, filters: this.props.Filters,
sorter: {}, sorter: {},
tableData: [], tableData: [],
showEditModal: false, showEditModal: false,
record: {}, record: {},
} }
} }
componentDidMount() { componentDidMount() {
this.getData() this.getData()
} }
async getData(pagination, filters, sorter) { async getData(pagination, filters, sorter) {
/* /*
pagination = { pagination = {
pageSize: 10, // items per page pageSize: 10, // items per page
current: 1, // page number current: 1, // page number
@@ -51,235 +51,235 @@ class DataTable extends Component {
} }
sorter = {} sorter = {}
*/ */
pagination = pagination || this.state.pagination pagination = pagination || this.state.pagination
filters = filters || this.state.filters filters = filters || this.state.filters
sorter = sorter || this.state.sorter sorter = sorter || this.state.sorter
// console.log(pagination, filters, sorter) // console.log(pagination, filters, sorter)
let data = await this.props.DataFunction() let data = await this.props.DataFunction()
// await fetchApi(this.state.dataUrl, "post", { // await fetchApi(this.state.dataUrl, "post", {
// database: this.props.Database, // database: this.props.Database,
// table: this.props.Table, // table: this.props.Table,
// dataSource: this.props.DataSource, // dataSource: this.props.DataSource,
// pagination: this.props.RecordCount? {...pagination, pageSize: this.props.RecordCount, current: 1}:pagination, // pagination: this.props.RecordCount? {...pagination, pageSize: this.props.RecordCount, current: 1}:pagination,
// filters, // filters,
// sorter, // sorter,
// recordIdField: this.props.RecordIdField || "Id", // Sort by this // recordIdField: this.props.RecordIdField || "Id", // Sort by this
// }) // })
console.log(data) console.log(data)
data = data || {} data = data || {}
this.setState({ this.setState({
tableData: this.props.CustomDataFilterFunction ? this.props.CustomDataFilterFunction(data) : data, tableData: this.props.CustomDataFilterFunction ? this.props.CustomDataFilterFunction(data) : data,
pagination: { ...pagination, ...data.pagination }, pagination: { ...pagination, ...data.pagination },
sorter, sorter,
filters, filters,
}) })
} }
showEditModal(record, index) { showEditModal(record, index) {
if (!this.state.showEditModal) if (!this.state.showEditModal)
this.setState({ this.setState({
record: record, record: record,
showEditModal: true, showEditModal: true,
}) })
} }
hideEditModal() { hideEditModal() {
this.setState({ this.setState({
showEditModal: false, showEditModal: false,
inserting: false, inserting: false,
record: {} record: {}
}) })
} }
async onEditFinish(values) { async onEditFinish(values) {
console.log("Finished editing", values) console.log("Finished editing", values)
if (this.state.inserting) { // Create new record if (this.state.inserting) { // Create new record
var status = {} var status = {}
await this.props.AddRecord.insert(values) await this.props.AddRecord.insert(values)
} else { // Edit existing record, capable of doing sparse updates } else { // Edit existing record, capable of doing sparse updates
var status = {} var status = {}
await this.props.Editable.insert(values) await this.props.Editable.insert(values)
} }
this.setState({ this.setState({
showEditModal: false, showEditModal: false,
inserting: false, inserting: false,
record: {}, record: {},
}) })
// Force refresh of data // Force refresh of data
this.getData() this.getData()
} }
async deleteRecord(record) { async deleteRecord(record) {
delete record.key delete record.key
// Delete "null" values as they seem to cause deletes to fail silently when the value is null and field type is float // Delete "null" values as they seem to cause deletes to fail silently when the value is null and field type is float
for (let key in record) { for (let key in record) {
if (record[key] === null) delete record[key] if (record[key] === null) delete record[key]
} }
var status = {} var status = {}
// await fetchApi(`/api/${this.props.Server}/tableData/record`, "delete", { // await fetchApi(`/api/${this.props.Server}/tableData/record`, "delete", {
// database: this.props.Database, // database: this.props.Database,
// table: this.props.Table, // table: this.props.Table,
// dataSource: this.props.DataSource, // dataSource: this.props.DataSource,
// record, // record,
// }, undefined, true) // }, undefined, true)
console.log("Deleted record", status) console.log("Deleted record", status)
if (status.ok) notify("success", status.msg, "success") if (status.ok) notify("success", status.msg, "success")
if (!status.ok) notify("error", status.msg, "error") if (!status.ok) notify("error", status.msg, "error")
// Force refresh of data // Force refresh of data
this.getData() this.getData()
} }
render() { render() {
let tableProps = { let tableProps = {
...this.props.TableProps || {}, ...this.props.TableProps || {},
onRow: (record, rowIndex) => { onRow: (record, rowIndex) => {
/* /*
To allow for extending functionality, we take a TableProps argument from props and pass it through to the Table component. To allow for extending functionality, we take a TableProps argument from props and pass it through to the Table component.
Since we are also using onRow internaly here, we handle the externally provided events ourselves by passing along the event Since we are also using onRow internaly here, we handle the externally provided events ourselves by passing along the event
object. This way the end user isn't affected by our event handlers. object. This way the end user isn't affected by our event handlers.
*/ */
let externalOnRow = { let externalOnRow = {
...(this.props.TableProps && this.props.TableProps.onRow && this.props.TableProps.onRow(record, rowIndex)), ...(this.props.TableProps && this.props.TableProps.onRow && this.props.TableProps.onRow(record, rowIndex)),
} }
return { return {
onClick: event => { onClick: event => {
if (event.target.type !== "button") { if (event.target.type !== "button") {
console.log("onRow", record, rowIndex) console.log("onRow", record, rowIndex)
if (this.props.Editable) this.showEditModal(record, rowIndex) if (this.props.Editable) this.showEditModal(record, rowIndex)
if (externalOnRow.onClick) externalOnRow.onClick(event) if (externalOnRow.onClick) externalOnRow.onClick(event)
} }
}, },
onDoubleClick: event => { onDoubleClick: event => {
if (externalOnRow.onDoubleClick) externalOnRow.onDoubleClick(event) if (externalOnRow.onDoubleClick) externalOnRow.onDoubleClick(event)
}, },
onContextMenu: event => { onContextMenu: event => {
if (externalOnRow.onContextMenu) externalOnRow.onContextMenu(event) if (externalOnRow.onContextMenu) externalOnRow.onContextMenu(event)
}, },
onMouseEnter: event => { onMouseEnter: event => {
if (externalOnRow.onMouseEnter) externalOnRow.onMouseEnter(event) if (externalOnRow.onMouseEnter) externalOnRow.onMouseEnter(event)
}, },
onMouseLeave: event => { onMouseLeave: event => {
if (externalOnRow.onMouseLeave) externalOnRow.onMouseLeave(event) if (externalOnRow.onMouseLeave) externalOnRow.onMouseLeave(event)
}, },
} }
} }
} }
let columns = this.props.columns || this.inferColumns(this.state.tableData) let columns = this.props.columns || this.inferColumns(this.state.tableData)
if (this.props.DeleteRecord && !columns.find(x => x.dataIndex === "notInUse")) columns.push({ if (this.props.DeleteRecord && !columns.find(x => x.dataIndex === "notInUse")) columns.push({
// Add delete button on the right // Add delete button on the right
dataIndex: "notInUse", dataIndex: "notInUse",
title: "", title: "",
render: (text, record) => <Popover render: (text, record) => <Popover
content={ content={
<Button <Button
type="primary" type="primary"
danger danger
onClick={() => { onClick={() => {
this.deleteRecord(record) this.deleteRecord(record)
}} }}
> >
Slett permanent Slett permanent
</Button> </Button>
} }
trigger="click" trigger="click"
> >
<Button danger style={{ float: "right", fontSize: "16px" }}> <Button danger style={{ float: "right", fontSize: "16px" }}>
<DeleteOutlined /> <DeleteOutlined />
</Button> </Button>
</Popover> </Popover>
}) })
return <> return <>
<Row> <Row>
<Col span={24}> <Col span={24}>
<style> <style>
{` {`
.editableTable .ant-table-tbody > tr { .editableTable .ant-table-tbody > tr {
cursor:pointer cursor:pointer
} }
`} `}
</style> </style>
<Table <Table
className={this.props.Editable && "editableTable"} className={this.props.Editable && "editableTable"}
{...tableProps} {...tableProps}
columns={columns.map(x => { columns={columns.map(x => {
return { return {
...x, // Add a 4th parameter to the stock render function with all of our table data ...x, // Add a 4th parameter to the stock render function with all of our table data
render: x.render ? (...originalParams) => x.render(...originalParams, this.state.tableData) : undefined render: x.render ? (...originalParams) => x.render(...originalParams, this.state.tableData) : undefined
} }
})} })}
dataSource={this.state.tableData} dataSource={this.state.tableData}
pagination={this.state.pagination.total > 10 ? this.state.pagination : false} pagination={this.state.pagination.total > 10 ? this.state.pagination : false}
onChange={this.getData.bind(this)} onChange={this.getData.bind(this)}
/> />
{this.props.AddRecord && <Button type="primary" onClick={() => this.setState({ {this.props.AddRecord && <Button type="primary" onClick={() => this.setState({
showEditModal: true, showEditModal: true,
inserting: true inserting: true
})}> })}>
<PlusOutlined />Add <PlusOutlined />Add
</Button>} </Button>}
</Col> </Col>
<Modal <Modal
visible={this.state.showEditModal} visible={this.state.showEditModal}
onCancel={this.hideEditModal} onCancel={this.hideEditModal}
footer={null} footer={null}
title={ title={
<h2>{this.state.inserting ? "Legg til" : "Rediger"}</h2> <h2>{this.state.inserting ? "Legg til" : "Rediger"}</h2>
} }
> >
{this.state.showEditModal && <Form {this.state.showEditModal && <Form
labelCol={{ labelCol={{
span: 6, span: 6,
}} }}
wrapperCol={{ wrapperCol={{
span: 12, span: 12,
}} }}
layout="horizontal" layout="horizontal"
onFinish={this.onEditFinish.bind(this)} onFinish={this.onEditFinish.bind(this)}
initialValues={this.state.record} initialValues={this.state.record}
> >
{ {
( (
(this.state.inserting && this.props.AddRecord && this.props.AddRecord.fields) // Use externally supplied form input fields (this.state.inserting && this.props.AddRecord && this.props.AddRecord.fields) // Use externally supplied form input fields
|| this.props.columns.filter && this.props.columns.filter(x => x.dataIndex !== "notInUse") // Generate input fields from external columns || this.props.columns.filter && this.props.columns.filter(x => x.dataIndex !== "notInUse") // Generate input fields from external columns
|| this.inferColumns(this.state.tableData)).map(col => { // Generate input fields from autogenerated columns (only works with existing data) || this.inferColumns(this.state.tableData)).map(col => { // Generate input fields from autogenerated columns (only works with existing data)
console.log(this.state.record) console.log(this.state.record)
return <Form.Item key={col.dataIndex} label={col.title} name={col.dataIndex}> return <Form.Item key={col.dataIndex} label={col.title} name={col.dataIndex}>
{col.renderEdit && col.renderEdit(this.state.record[col.dataIndex], this.state.record, undefined /* Non spec compliant, is supposed to be index of record */, this.state.tableData) || <Input {col.renderEdit && col.renderEdit(this.state.record[col.dataIndex], this.state.record, undefined /* Non spec compliant, is supposed to be index of record */, this.state.tableData) || <Input
placeholder={this.state.record[col.dataIndex]} placeholder={this.state.record[col.dataIndex]}
/>} />}
</Form.Item> </Form.Item>
}) })
} }
<Form.Item> <Form.Item>
<Button type="primary" htmlType="submit"> <Button type="primary" htmlType="submit">
{this.state.inserting ? "Legg til" : "Lagre"} {this.state.inserting ? "Legg til" : "Lagre"}
</Button> </Button>
</Form.Item> </Form.Item>
</Form>} </Form>}
</Modal> </Modal>
</Row> </Row>
</> </>
} }
inferColumns(data) { inferColumns(data) {
// Look at the data and find columns and how to display them. Can be overridden by props.Columns if more customization is needed // Look at the data and find columns and how to display them. Can be overridden by props.Columns if more customization is needed
let columns = [] let columns = []
data.forEach(row => { data.forEach(row => {
Object.keys(row).filter(x => x !== "key").forEach(key => { Object.keys(row).filter(x => x !== "key").forEach(key => {
let existing = columns.find(col => col.key === key) let existing = columns.find(col => col.key === key)
if (!existing) { if (!existing) {
columns.push({ columns.push({
key: key, key: key,
title: key, title: key,
dataIndex: key, dataIndex: key,
}) })
} }
}) })
}) })
return columns return columns
} }
} }
export default DataTable; export default DataTable;
+133 -133
View File
@@ -19,148 +19,148 @@ const { SubMenu } = Menu;
class SiteLayout extends Component { class SiteLayout extends Component {
constructor(props) { constructor(props) {
super(props); super(props);
const { location } = props; const { location } = props;
this.state = { this.state = {
collapsed: false, collapsed: false,
setcollapsed: false, setcollapsed: false,
tags: [], tags: [],
setTags: [], setTags: [],
location, location,
siteSettings: {}, siteSettings: {},
factoryModel: [] factoryModel: []
}; };
} }
onCollapse() { onCollapse() {
this.setState({ collapsed: !this.state.collapsed }) this.setState({ collapsed: !this.state.collapsed })
} }
titleCase(text) { titleCase(text) {
return text.substring(0, 1).toUpperCase() + text.substring(1); return text.substring(0, 1).toUpperCase() + text.substring(1);
} }
replaceParametersInUrl({ endpoint, params }) { replaceParametersInUrl({ endpoint, params }) {
let path = endpoint; let path = endpoint;
console.log("endpoint", params) console.log("endpoint", params)
Object.keys(params).forEach(key => { Object.keys(params).forEach(key => {
path = path.replace(":" + key, params[key]) path = path.replace(":" + key, params[key])
}) })
return path; return path;
} }
render() { render() {
return ( return (
<Layout style={{ minHeight: "100vh" }}> <Layout style={{ minHeight: "100vh" }}>
{document.location.search !== "?hideExtras" ? ( {document.location.search !== "?hideExtras" ? (
<Sider <Sider
collapsible collapsible
collapsed={this.state.collapsed} collapsed={this.state.collapsed}
onCollapse={this.onCollapse.bind(this)} onCollapse={this.onCollapse.bind(this)}
width={250} width={250}
breakpoint="lg" breakpoint="lg"
> >
<p></p> <p></p>
<div style={{ width: "100%", textAlign: "center" }}> <div style={{ width: "100%", textAlign: "center" }}>
{" "} {" "}
{this.state.collapsed ? ( {this.state.collapsed ? (
<img <img
alt="" alt=""
src="/smal_logo.png" src="/smal_logo.png"
style={{ height: "48px", margin: 8 }} style={{ height: "48px", margin: 8 }}
/> />
) : ( ) : (
<img <img
alt="" alt=""
src="/logo.png" src="/logo.png"
style={{ width: "200px", margin: 8 }} style={{ width: "200px", margin: 8 }}
/> />
)} )}
</div> </div>
<p></p> <p></p>
<p></p> <p></p>
<Menu <Menu
theme="dark" theme="dark"
defaultSelectedKeys={[ defaultSelectedKeys={[
this.state.location.pathname.split("/")[ this.state.location.pathname.split("/")[
this.state.location.pathname.split("/").length - 1 this.state.location.pathname.split("/").length - 1
], ],
]} ]}
defaultOpenKeys={(() => { defaultOpenKeys={(() => {
let x = this.state.location.pathname.split("/"); let x = this.state.location.pathname.split("/");
x.shift(); x.shift();
return x; return x;
})()} })()}
mode="inline" mode="inline"
> >
<Menu.Item key="slaves"> <Menu.Item key="slaves">
<span>Slaves</span> <span>Slaves</span>
<Link to="/slaves" /> <Link to="/slaves" />
</Menu.Item> </Menu.Item>
<Menu.Item key="instances"> <Menu.Item key="instances">
<span>Instances</span> <span>Instances</span>
<Link to="/instances" /> <Link to="/instances" />
</Menu.Item> </Menu.Item>
<Menu.Item key="users"> <Menu.Item key="users">
<span>Users</span> <span>Users</span>
<Link to="/users" /> <Link to="/users" />
</Menu.Item> </Menu.Item>
<Menu.Item key="roles"> <Menu.Item key="roles">
<span>Roles</span> <span>Roles</span>
<Link to="/roles" /> <Link to="/roles" />
</Menu.Item> </Menu.Item>
<Menu.Item key="permissions"> <Menu.Item key="permissions">
<span>Permissions</span> <span>Permissions</span>
<Link to="/permissions" /> <Link to="/permissions" />
</Menu.Item> </Menu.Item>
<Menu.Item key="settings"> <Menu.Item key="settings">
<span>Settings</span> <span>Settings</span>
<Link to="/settings" /> <Link to="/settings" />
</Menu.Item> </Menu.Item>
</Menu> </Menu>
</Sider> </Sider>
) : ( ) : (
"" ""
)} )}
<Layout style={{ <Layout style={{
// background: "#F4F4F4" // background: "#F4F4F4"
}}> }}>
<Content <Content
style={{ style={{
margin: "24px 16px", margin: "24px 16px",
padding: 24, padding: 24,
// background: "#fff", // background: "#fff",
minHeight: 280, minHeight: 280,
}} }}
> >
<Route exact path="/" component={Dashboard} /> <Route exact path="/" component={Dashboard} />
<Route exact path="/instances" component={InstancesTable} /> <Route exact path="/instances" component={InstancesTable} />
<Route exact path="/instances/:id/view" component={InstanceView} /> <Route exact path="/instances/:id/view" component={InstanceView} />
<Route exact path="/slaves" component={SlavesTable} /> <Route exact path="/slaves" component={SlavesTable} />
<Route exact path="/slaves/:id/view" component={SlavesTable} /> <Route exact path="/slaves/:id/view" component={SlavesTable} />
<Route exact path="/users" component={UsersTable} /> <Route exact path="/users" component={UsersTable} />
<Route exact path="/users/:id/view" component={UserView} /> <Route exact path="/users/:id/view" component={UserView} />
<Route exact path="/roles" component={RolesTable} /> <Route exact path="/roles" component={RolesTable} />
<Route exact path="/roles/:id/view" component={RoleView} /> <Route exact path="/roles/:id/view" component={RoleView} />
<Route exact path="/permissions" component={PermissionsTable} /> <Route exact path="/permissions" component={PermissionsTable} />
<Route exact path="/permissions/:id/view" component={PermissionsTable} /> <Route exact path="/permissions/:id/view" component={PermissionsTable} />
<Route exact path="/settings" component={Settings} /> <Route exact path="/settings" component={Settings} />
</Content> </Content>
<Footer style={{ <Footer style={{
// background: "#F4F4F4", // background: "#F4F4F4",
textAlign: "center" textAlign: "center"
}}> }}>
Clusterio 2.0 web interface https://github.com/clusterio Clusterio 2.0 web interface https://github.com/clusterio
</Footer> </Footer>
</Layout> </Layout>
</Layout> </Layout>
); );
} }
} }
export default withRouter(SiteLayout); export default withRouter(SiteLayout);
+6 -6
View File
@@ -1,10 +1,10 @@
import React, {Component} from "react" import React, {Component} from "react"
export class Dashboard extends Component { export class Dashboard extends Component {
constructor(props){ constructor(props){
super(props) super(props)
} }
render(){ render(){
return <h2>Dashboard</h2> return <h2>Dashboard</h2>
} }
} }
+383 -383
View File
@@ -1,17 +1,17 @@
import React, { Component } from "react" import React, { Component } from "react"
import { Card, Button, Popover, Select, Divider, Input, Form, Col, Row, Checkbox, Space } from "antd" import { Card, Button, Popover, Select, Divider, Input, Form, Col, Row, Checkbox, Space } from "antd"
import { import {
listSlaves, listSlaves,
listInstances, listInstances,
startInstance, startInstance,
stopInstance, stopInstance,
setInstanceOutputSubscriptions, setInstanceOutputSubscriptions,
deleteInstance, deleteInstance,
assignInstance, assignInstance,
createSave, createSave,
getInstanceConfig, getInstanceConfig,
setInstanceConfigField, setInstanceConfigField,
sendRcon, sendRcon,
} from "../../util/wslink" } from "../../util/wslink"
import DataTable from "../../components/data-table" import DataTable from "../../components/data-table"
import notify from "../../util/notify" import notify from "../../util/notify"
@@ -22,208 +22,208 @@ import PlusOutlined from "@ant-design/icons/PlusOutlined"
const { Option } = Select const { Option } = Select
export class InstanceView extends Component { export class InstanceView extends Component {
constructor(props) { constructor(props) {
super(props) super(props)
this.state = { this.state = {
instance: {}, instance: {},
slaves: [], slaves: [],
logLines: [{ message: "Logviewer. Follows the latest logs if you scroll to the bottom. Does not store logs past the lifetime of this tab" }], logLines: [{ message: "Logviewer. Follows the latest logs if you scroll to the bottom. Does not store logs past the lifetime of this tab" }],
} }
this.messagesEndRef = React.createRef() this.messagesEndRef = React.createRef()
} }
navigate(url) { navigate(url) {
this.props.history.push(url); this.props.history.push(url);
} }
async componentDidMount() { async componentDidMount() {
let id = this.props.match.params.id let id = this.props.match.params.id
await this.getData() await this.getData()
await setInstanceOutputSubscriptions({ await setInstanceOutputSubscriptions({
instance_id: Number(id), instance_id: Number(id),
}) })
window.instanceOutputEventHandler = ({ instance_id, output }) => { window.instanceOutputEventHandler = ({ instance_id, output }) => {
if (instance_id === Number(id)) { if (instance_id === Number(id)) {
this.setState({ this.setState({
logLines: [...this.state.logLines, output], logLines: [...this.state.logLines, output],
}) })
} }
// Automatically scroll to bottom on new line. // Automatically scroll to bottom on new line.
// this.messagesEndRef.current.scrollIntoView({ behavior: 'smooth' }) // this.messagesEndRef.current.scrollIntoView({ behavior: 'smooth' })
} }
} }
async getData() { async getData() {
let id = this.props.match.params.id let id = this.props.match.params.id
let instances = await listInstances() let instances = await listInstances()
let slaves = await listSlaves() let slaves = await listSlaves()
this.setState({ this.setState({
instance: instances.find(x => x.id === Number(id)), instance: instances.find(x => x.id === Number(id)),
slaves, slaves,
}) })
let config = await getInstanceConfig({ instance_id: Number(id) }) let config = await getInstanceConfig({ instance_id: Number(id) })
console.log(config) console.log(config)
this.setState({ this.setState({
config config
}) })
} }
async start() { async start() {
this.setState({ this.setState({
starting: true, starting: true,
}) })
try { try {
await startInstance({ await startInstance({
instance_id: this.state.instance.id, instance_id: this.state.instance.id,
save: null, save: null,
}) })
} catch (e) { } catch (e) {
notify("Error starting instance", "error", e.message) notify("Error starting instance", "error", e.message)
return this.setState({ return this.setState({
starting: false, starting: false,
}) })
} }
notify("Instance started") notify("Instance started")
this.setState({ this.setState({
starting: false, starting: false,
}) })
this.getData() this.getData()
} }
async stop() { async stop() {
this.setState({ this.setState({
stopping: true, stopping: true,
}) })
try { try {
await stopInstance({ await stopInstance({
instance_id: this.state.instance.id, instance_id: this.state.instance.id,
}) })
} catch (e) { } catch (e) {
notify("Error stopping instance", "error", e.message) notify("Error stopping instance", "error", e.message)
return this.setState({ return this.setState({
stopping: false, stopping: false,
}) })
} }
notify("Instance stopped") notify("Instance stopped")
this.setState({ this.setState({
stopping: false, stopping: false,
}) })
this.getData() this.getData()
} }
async createSave() { async createSave() {
this.setState({ this.setState({
creatingSave: true, creatingSave: true,
}) })
try { try {
await createSave({ await createSave({
instance_id: this.state.instance.id, instance_id: this.state.instance.id,
}) })
} catch (e) { } catch (e) {
notify("Error creating save", "error", e.message) notify("Error creating save", "error", e.message)
return this.setState({ return this.setState({
creatingSave: false, creatingSave: false,
}) })
} }
notify("Save created", "success") notify("Save created", "success")
this.setState({ this.setState({
creatingSave: false, creatingSave: false,
}) })
} }
async onConfigEditFinish(values) { async onConfigEditFinish(values) {
console.log("Completed config edit with", values) console.log("Completed config edit with", values)
for (let k in values) { for (let k in values) {
if (values[k] !== this.getInstanceConfigAsKvObject(this.state.config)[k]) { if (values[k] !== this.getInstanceConfigAsKvObject(this.state.config)[k]) {
let value = values[k] let value = values[k]
if (typeof value === "boolean") value = value.toString() if (typeof value === "boolean") value = value.toString()
console.log("Setting", k, value) console.log("Setting", k, value)
await setInstanceConfigField({ await setInstanceConfigField({
instance_id: this.state.instance.id, instance_id: this.state.instance.id,
field: k, field: k,
value: value, value: value,
}) })
} }
} }
notify("Set configuration fields", "success") notify("Set configuration fields", "success")
this.setState({ this.setState({
editingConfig: false editingConfig: false
}) })
this.getData() this.getData()
} }
render() { render() {
console.log(this.state) console.log(this.state)
let { instance, slaves } = this.state let { instance, slaves } = this.state
let slave = slaves && slaves.find(x => x.id === instance.assigned_slave); let slave = slaves && slaves.find(x => x.id === instance.assigned_slave);
return <Card> return <Card>
<h2>{instance.name}</h2> <h2>{instance.name}</h2>
<p>ID: {instance.id}</p> <p>ID: {instance.id}</p>
<p>Slave: {slave && slave.name}</p> <p>Slave: {slave && slave.name}</p>
{instance.status !== "running" && <Button {instance.status !== "running" && <Button
loading={this.state.starting} loading={this.state.starting}
type="primary" type="primary"
onClick={this.start.bind(this)} onClick={this.start.bind(this)}
> >
Start server Start server
</Button>} </Button>}
{instance.status !== "stopped" && <Button {instance.status !== "stopped" && <Button
loading={this.state.stopping} loading={this.state.stopping}
type="primary" type="primary"
onClick={this.stop.bind(this)} onClick={this.stop.bind(this)}
> >
Stop server Stop server
</Button>} </Button>}
{instance.status !== "running" && <Button {instance.status !== "running" && <Button
loading={this.state.creatingSave} loading={this.state.creatingSave}
type="primary" type="primary"
onClick={this.createSave.bind(this)} onClick={this.createSave.bind(this)}
> >
Create save Create save
</Button>} </Button>}
<Popover <Popover
content={ content={
<Select style={{ <Select style={{
width: "200px" width: "200px"
}} }}
onChange={async newSlaveId => { onChange={async newSlaveId => {
let result = await assignInstance({ instance_id: instance.id, slave_id: newSlaveId }) let result = await assignInstance({ instance_id: instance.id, slave_id: newSlaveId })
notify("Assigned to slave", "success") notify("Assigned to slave", "success")
this.getData() this.getData()
}} }}
> >
{this.state.slaves.map(slave => <Option defaultValue={instance.assigned_slave} value={slave.id} key={slave.id}> {this.state.slaves.map(slave => <Option defaultValue={instance.assigned_slave} value={slave.id} key={slave.id}>
{slave.name} {slave.name}
</Option>)} </Option>)}
</Select> </Select>
} }
trigger="click" trigger="click"
type={instance.status === "unassigned" ? "primary" : "default"} type={instance.status === "unassigned" ? "primary" : "default"}
> >
<Button> <Button>
Assign to slave Assign to slave
</Button> </Button>
</Popover> </Popover>
<Popover <Popover
content={ content={
<Button <Button
type="primary" type="primary"
danger danger
onClick={async () => { onClick={async () => {
await deleteInstance({ instance_id: instance.id }); await deleteInstance({ instance_id: instance.id });
notify("Deleted instance " + instance.id, "success") notify("Deleted instance " + instance.id, "success")
this.navigate("/instances") this.navigate("/instances")
}} }}
> >
Delete this instance permanently Delete this instance permanently
</Button> </Button>
} }
trigger="click" trigger="click"
> >
<Button danger style={{ float: "right", fontSize: "16px" }}> <Button danger style={{ float: "right", fontSize: "16px" }}>
<DeleteOutlined /> <DeleteOutlined />
</Button> </Button>
</Popover> </Popover>
<style> <style>
{/* Scroll sticks to bottom of terminal window after manually scrolling to the bottom */} {/* Scroll sticks to bottom of terminal window after manually scrolling to the bottom */}
{`#scroller * { {`#scroller * {
/* don't allow the children of the scrollable element to be selected as an anchor node */ /* don't allow the children of the scrollable element to be selected as an anchor node */
overflow-anchor: none; overflow-anchor: none;
} }
@@ -234,116 +234,116 @@ export class InstanceView extends Component {
/* anchor nodes are required to have non-zero area */ /* anchor nodes are required to have non-zero area */
height: 1px; height: 1px;
}`} }`}
</style> </style>
<div id="scroller" style={{ <div id="scroller" style={{
height: "300px", height: "300px",
overflowY: "scroll", overflowY: "scroll",
}}> }}>
{this.state.logLines.map(item => <p>{item.time} {item.level} {item.file}: {item.message}</p>)} {this.state.logLines.map(item => <p>{item.time} {item.level} {item.file}: {item.message}</p>)}
<div id="anchor" ref={this.messagesEndRef}></div> <div id="anchor" ref={this.messagesEndRef}></div>
</div> </div>
{/* rcon input field */} {/* rcon input field */}
<Form <Form
onFinish={async values => { onFinish={async values => {
await sendRcon({ instance_id: instance.id, command: values.command }) await sendRcon({ instance_id: instance.id, command: values.command })
}} }}
> >
<Form.Item <Form.Item
label="RCON: " label="RCON: "
name="command" name="command"
> >
<Input /> <Input />
</Form.Item> </Form.Item>
</Form> </Form>
{this.state.config && this.renderConfig(this.state.config)} {this.state.config && this.renderConfig(this.state.config)}
</Card> </Card>
} }
getInstanceConfigAsKvObject(config) { getInstanceConfigAsKvObject(config) {
let object = {} let object = {}
for (let group of config.serialized_config.groups) { for (let group of config.serialized_config.groups) {
for (let fieldName in group.fields) { for (let fieldName in group.fields) {
object[group.name + "." + fieldName] = group.fields[fieldName] object[group.name + "." + fieldName] = group.fields[fieldName]
} }
} }
return object return object
} }
renderConfig(config) { renderConfig(config) {
const layout = { const layout = {
labelCol: { labelCol: {
span: 6, span: 6,
}, },
wrapperCol: { wrapperCol: {
span: 14, span: 14,
}, },
}; };
const tailLayout = { const tailLayout = {
wrapperCol: { wrapperCol: {
offset: 6, offset: 6,
span: 14, span: 14,
}, },
}; };
return <Card> return <Card>
<Form <Form
{...layout} {...layout}
initialValues={this.getInstanceConfigAsKvObject(config)} initialValues={this.getInstanceConfigAsKvObject(config)}
onFinish={this.onConfigEditFinish.bind(this)} onFinish={this.onConfigEditFinish.bind(this)}
> >
{this.state.editingConfig ? {this.state.editingConfig ?
<Form.Item> <Form.Item>
<Button type="primary" htmlType="submit"> <Button type="primary" htmlType="submit">
Save config changes Save config changes
</Button> </Button>
</Form.Item> </Form.Item>
: :
<Button onClick={() => this.setState({ editingConfig: true })}> <Button onClick={() => this.setState({ editingConfig: true })}>
<EditOutlined /> Edit config <EditOutlined /> Edit config
</Button> </Button>
} }
<Row> <Row>
{config && config.serialized_config.groups.map(group => <> {config && config.serialized_config.groups.map(group => <>
<Col span={24} lg={12}> <Col span={24} lg={12}>
<Divider <Divider
// orientation="left" // orientation="left"
>{group.name}</Divider> >{group.name}</Divider>
{/* {Object.keys(group.fields).map(field => <> {/* {Object.keys(group.fields).map(field => <>
<span>{field}: </span> <span>{field}: </span>
<span>{JSON.stringify(group.fields[field])}</span> <span>{JSON.stringify(group.fields[field])}</span>
<br /> <br />
</>)} */} </>)} */}
{console.log(group)} {console.log(group)}
{Object.keys(group.fields).map(field => <ConfigFormItem field={field} group={group} editingConfig={this.state.editingConfig} />)} {Object.keys(group.fields).map(field => <ConfigFormItem field={field} group={group} editingConfig={this.state.editingConfig} />)}
</Col> </Col>
</>)} </>)}
</Row> </Row>
</Form> </Form>
</Card> </Card>
} }
} }
function renderDisplayField(value) { function renderDisplayField(value) {
if (typeof value === "object") { if (typeof value === "object") {
return JSON.stringify(value) return JSON.stringify(value)
} }
if (typeof value === "boolean") { if (typeof value === "boolean") {
return <Checkbox /> return <Checkbox />
} }
return value.toString() return value.toString()
} }
function renderFormField(value) { function renderFormField(value) {
if (typeof value === "object") { if (typeof value === "object") {
return <ObjectInput /> return <ObjectInput />
} }
if (typeof value === "boolean") { if (typeof value === "boolean") {
return <Checkbox /> return <Checkbox />
} }
return <Input /> return <Input />
} }
class ObjectInput extends Component { class ObjectInput extends Component {
constructor(props) { constructor(props) {
super(props) super(props)
console.log(this.props) console.log(this.props)
/* /*
value: { value: {
auto_pause: false, auto_pause: false,
tags: ["clusterio"] tags: ["clusterio"]
@@ -351,89 +351,89 @@ class ObjectInput extends Component {
id: "factorio.settings", id: "factorio.settings",
onChange: f() onChange: f()
*/ */
this.state = {} this.state = {}
} }
onChange(e, key) { onChange(e, key) {
if (e.target.type === "checkbox") { if (e.target.type === "checkbox") {
// if (e.target.checked !== undefined) { // if (e.target.checked !== undefined) {
// Its a checkbox, set value to true/false // Its a checkbox, set value to true/false
let value = { ...this.props.value } let value = { ...this.props.value }
value[key] = e.target.checked || false value[key] = e.target.checked || false
this.props.onChange(value) this.props.onChange(value)
} else if (e.target.type === "text") { } else if (e.target.type === "text") {
// } else if (e.target.value !== undefined) { // } else if (e.target.value !== undefined) {
// its probably a text input // its probably a text input
let value = { ...this.props.value } let value = { ...this.props.value }
value[key] = e.target.value || "" value[key] = e.target.value || ""
this.props.onChange(value) this.props.onChange(value)
} }
} }
render() { render() {
let { value } = this.props let { value } = this.props
let ret = [] let ret = []
for (let key in value) { for (let key in value) {
if (typeof value[key] === "boolean") { if (typeof value[key] === "boolean") {
ret.push(<Checkbox ret.push(<Checkbox
key={key} key={key}
checked={value[key]} checked={value[key]}
onChange={e => this.onChange(e, key)} onChange={e => this.onChange(e, key)}
> >
{key} {key}
</Checkbox> </Checkbox>
) )
} else if (typeof value[key] === "string") { } else if (typeof value[key] === "string") {
ret.push(<div ret.push(<div
key={key} key={key}
><span>{key}</span><Input ><span>{key}</span><Input
value={value[key]} value={value[key]}
onChange={e => this.onChange(e, key)} onChange={e => this.onChange(e, key)}
/></div> /></div>
) )
} }
} }
ret.push(<Popover ret.push(<Popover
key="addMore" key="addMore"
content={<> content={<>
<Input onChange={e => this.setState({ newInput: e.target.value })} /> <Input onChange={e => this.setState({ newInput: e.target.value })} />
<Button <Button
onClick={e => { onClick={e => {
this.onChange({ target: { value: "", type: "text" } }, this.state.newInput) this.onChange({ target: { value: "", type: "text" } }, this.state.newInput)
this.setState({ this.setState({
newInput: undefined, newInput: undefined,
addPopoverVisible: false, addPopoverVisible: false,
}) })
}} }}
><PlusOutlined />Add property</Button> ><PlusOutlined />Add property</Button>
</>} </>}
trigger="click" trigger="click"
visible={this.state.addPopoverVisible} visible={this.state.addPopoverVisible}
handleVisibleChange={visible => this.setState({ addPopoverVisible: visible })} handleVisibleChange={visible => this.setState({ addPopoverVisible: visible })}
> >
<Button <Button
onClick={e => this.setState({ addPopoverVisible: true })} onClick={e => this.setState({ addPopoverVisible: true })}
> >
<PlusOutlined />Add property <PlusOutlined />Add property
</Button> </Button>
</Popover>) </Popover>)
return <Space direction="vertical">{ret}</Space> return <Space direction="vertical">{ret}</Space>
} }
} }
class ConfigFormItem extends Component { class ConfigFormItem extends Component {
constructor(props) { constructor(props) {
super(props) super(props)
} }
render() { render() {
let { field, group, editingConfig } = this.props let { field, group, editingConfig } = this.props
return <Form.Item return <Form.Item
label={field} label={field}
name={group.name + "." + field} name={group.name + "." + field}
valuePropName={typeof group.fields[field] === "boolean" ? "checked" : "value" /* Boolean fields should be rendered as checkboxes */} valuePropName={typeof group.fields[field] === "boolean" ? "checked" : "value" /* Boolean fields should be rendered as checkboxes */}
> >
{editingConfig ? {editingConfig ?
renderFormField(group.fields[field]) renderFormField(group.fields[field])
: :
renderDisplayField(group.fields[field]) renderDisplayField(group.fields[field])
} }
</Form.Item> </Form.Item>
} }
} }
@@ -5,42 +5,42 @@ import DataTable from "../../components/data-table"
const config = require("@clusterio/lib/config") const config = require("@clusterio/lib/config")
export class InstancesTable extends Component { export class InstancesTable extends Component {
constructor(props) { constructor(props) {
super(props) super(props)
} }
navigate(url) { navigate(url) {
this.props.history.push(url); this.props.history.push(url);
} }
render() { render() {
return <Card> return <Card>
<h2>Instances</h2> <h2>Instances</h2>
<DataTable <DataTable
AddRecord={{ AddRecord={{
fields: [{ fields: [{
dataIndex: "name", dataIndex: "name",
title: "Name" title: "Name"
}], }],
insert: async args => { insert: async args => {
let instanceConfig = new config.InstanceConfig(); let instanceConfig = new config.InstanceConfig();
await instanceConfig.init(); await instanceConfig.init();
console.log("Base config", instanceConfig) console.log("Base config", instanceConfig)
instanceConfig.set("instance.name", args.name); instanceConfig.set("instance.name", args.name);
let serialized_config = instanceConfig.serialize(); let serialized_config = instanceConfig.serialize();
let response = await createInstance(serialized_config) let response = await createInstance(serialized_config)
console.log("Created instance", response) console.log("Created instance", response)
} }
}} }}
DataFunction={listInstances} DataFunction={listInstances}
TableProps={{ TableProps={{
onRow: (record, rowIndex) => { onRow: (record, rowIndex) => {
return { return {
onClick: event => { onClick: event => {
this.navigate(`/instances/${record.id}/view`) this.navigate(`/instances/${record.id}/view`)
} }
} }
} }
}} }}
/> />
</Card> </Card>
} }
} }
@@ -4,27 +4,27 @@ import { listSlaves, listInstances, listPermissions } from "../../util/wslink"
import DataTable from "../../components/data-table" import DataTable from "../../components/data-table"
export class PermissionsTable extends Component { export class PermissionsTable extends Component {
constructor(props) { constructor(props) {
super(props) super(props)
} }
navigate(url) { navigate(url) {
this.props.history.push(url); this.props.history.push(url);
} }
render() { render() {
return <Card> return <Card>
<h2>Permissions</h2> <h2>Permissions</h2>
<DataTable <DataTable
DataFunction={listPermissions} DataFunction={listPermissions}
TableProps={{ TableProps={{
onRow: (record, rowIndex) => { onRow: (record, rowIndex) => {
return { return {
onClick: event => { onClick: event => {
this.navigate(`/permissions/${record.id}/view`) this.navigate(`/permissions/${record.id}/view`)
} }
} }
} }
}} }}
/> />
</Card> </Card>
} }
} }
+91 -91
View File
@@ -4,23 +4,23 @@ import { Card, Button, Popover, Select, Transfer } from "antd"
import DeleteOutlined from "@ant-design/icons/DeleteOutlined" import DeleteOutlined from "@ant-design/icons/DeleteOutlined"
import { import {
listSlaves, listSlaves,
listInstances, listInstances,
startInstance, startInstance,
stopInstance, stopInstance,
setInstanceOutputSubscriptions, setInstanceOutputSubscriptions,
deleteInstance, deleteInstance,
assignInstance, assignInstance,
createSave, createSave,
getInstanceConfig, getInstanceConfig,
setInstanceConfigField, setInstanceConfigField,
sendRcon, sendRcon,
deleteUser, deleteUser,
listUsers, listUsers,
listRoles, listRoles,
setRoles, setRoles,
listPermissions, listPermissions,
updateRole, updateRole,
} from "../../util/wslink" } from "../../util/wslink"
import DataTable from "../../components/data-table" import DataTable from "../../components/data-table"
import notify from "../../util/notify" import notify from "../../util/notify"
@@ -28,86 +28,86 @@ import notify from "../../util/notify"
const { Option } = Select const { Option } = Select
export class RoleView extends Component { export class RoleView extends Component {
constructor(props) { constructor(props) {
super(props) super(props)
this.state = { this.state = {
role: {} role: {}
} }
this.messagesEndRef = React.createRef() this.messagesEndRef = React.createRef()
} }
navigate(url) { navigate(url) {
this.props.history.push(url); this.props.history.push(url);
} }
async componentDidMount() { async componentDidMount() {
await this.getData() await this.getData()
} }
async getData() { async getData() {
let id = this.props.match.params.id let id = this.props.match.params.id
let roles = await listRoles() let roles = await listRoles()
let permissions = await listPermissions() let permissions = await listPermissions()
this.setState({ this.setState({
role: roles.find(x => x.id === Number(id)), role: roles.find(x => x.id === Number(id)),
permissions, permissions,
}) })
} }
async handleChange(targetKeys) { async handleChange(targetKeys) {
this.setState({ this.setState({
role: { role: {
...this.state.role, ...this.state.role,
permissions: targetKeys permissions: targetKeys
} }
}); });
let response = await updateRole({ let response = await updateRole({
...this.state.role, ...this.state.role,
permissions: targetKeys, permissions: targetKeys,
}) })
console.log("Updated user roles", response) console.log("Updated user roles", response)
} }
render() { render() {
console.log(this.state) console.log(this.state)
let { role, permissions } = this.state let { role, permissions } = this.state
return <Card> return <Card>
<Popover <Popover
content={ content={
<Button <Button
type="primary" type="primary"
danger danger
onClick={async () => { onClick={async () => {
await deleteUser({ role: role.name }) await deleteUser({ role: role.name })
notify("Deleted role " + role.name, "success") notify("Deleted role " + role.name, "success")
this.navigate("/roles") this.navigate("/roles")
}} }}
> >
Delete this role permanently Delete this role permanently
</Button> </Button>
} }
trigger="click" trigger="click"
> >
<Button danger style={{ float: "right", fontSize: "16px" }}> <Button danger style={{ float: "right", fontSize: "16px" }}>
<DeleteOutlined /> <DeleteOutlined />
</Button> </Button>
</Popover> </Popover>
<h2>{role.name}</h2> <h2>{role.name}</h2>
<h3>Assign roles</h3> <h3>Assign roles</h3>
<style> <style>
{` {`
.ant-transfer-list{ .ant-transfer-list{
width: calc( 50% - 34px ); width: calc( 50% - 34px );
height: 500px; height: 500px;
} }
`} `}
</style> </style>
<Transfer <Transfer
titles={["Available", "Assigned"]} titles={["Available", "Assigned"]}
dataSource={permissions} dataSource={permissions}
showSearch showSearch
filterOption={(inputValue, option) => option.name.toLowerCase().indexOf(inputValue.toLowerCase()) > -1} filterOption={(inputValue, option) => option.name.toLowerCase().indexOf(inputValue.toLowerCase()) > -1}
targetKeys={role.permissions} targetKeys={role.permissions}
onChange={this.handleChange.bind(this)} onChange={this.handleChange.bind(this)}
render={item => item.name} render={item => item.name}
/> />
</Card> </Card>
} }
} }
+36 -36
View File
@@ -4,40 +4,40 @@ import { listSlaves, listInstances, listRoles, createRole } from "../../util/wsl
import DataTable from "../../components/data-table" import DataTable from "../../components/data-table"
export class RolesTable extends Component { export class RolesTable extends Component {
constructor(props) { constructor(props) {
super(props) super(props)
} }
navigate(url) { navigate(url) {
this.props.history.push(url); this.props.history.push(url);
} }
render() { render() {
return <Card> return <Card>
<h2>Roles</h2> <h2>Roles</h2>
<DataTable <DataTable
AddRecord={{ AddRecord={{
fields: [{ fields: [{
dataIndex: "name", dataIndex: "name",
title: "Name" title: "Name"
},{ },{
dataIndex: "description", dataIndex: "description",
title: "Description" title: "Description"
}], }],
insert: async args => { insert: async args => {
let response = await createRole({name: args.name, description: args.description}) let response = await createRole({name: args.name, description: args.description})
console.log("Created role",response) console.log("Created role",response)
} }
}} }}
DataFunction={listRoles} DataFunction={listRoles}
TableProps={{ TableProps={{
onRow: (record, rowIndex) => { onRow: (record, rowIndex) => {
return { return {
onClick: event => { onClick: event => {
this.navigate(`/roles/${record.id}/view`) this.navigate(`/roles/${record.id}/view`)
} }
} }
} }
}} }}
/> />
</Card> </Card>
} }
} }
+70 -70
View File
@@ -2,80 +2,80 @@ import React, { Component } from "react"
import { Card, Button, Input, Form } from "antd" import { Card, Button, Input, Form } from "antd"
const layout = { const layout = {
labelCol: { labelCol: {
span: 4, span: 4,
}, },
wrapperCol: { wrapperCol: {
span: 16, span: 16,
}, },
}; };
const tailLayout = { const tailLayout = {
wrapperCol: { wrapperCol: {
offset: 4, offset: 4,
span: 16, span: 16,
}, },
}; };
export class Settings extends Component { export class Settings extends Component {
constructor(props) { constructor(props) {
super(props) super(props)
this.state = { this.state = {
role: {} role: {}
} }
} }
navigate(url) { navigate(url) {
this.props.history.push(url); this.props.history.push(url);
} }
render() { render() {
console.log(this.state) console.log(this.state)
return <Card> return <Card>
<h2>Web interface settings</h2> <h2>Web interface settings</h2>
<Form <Form
{...layout} {...layout}
name="basic" name="basic"
initialValues={{ initialValues={{
master_url: localStorage.getItem("master_url"), master_url: localStorage.getItem("master_url"),
master_token: localStorage.getItem("master_token"), master_token: localStorage.getItem("master_token"),
}} }}
onFinish={values => { onFinish={values => {
console.log("Saving settings",values) console.log("Saving settings",values)
for(let key of Object.keys(values)){ for(let key of Object.keys(values)){
localStorage.setItem(key, values[key].replace("https://", "wss://").replace("http://", "ws://")) localStorage.setItem(key, values[key].replace("https://", "wss://").replace("http://", "ws://"))
} }
// Force refresh to apply changes // Force refresh to apply changes
document.location = document.location document.location = document.location
}} }}
> >
<Form.Item <Form.Item
label="Master URL" label="Master URL"
name="master_url" name="master_url"
rules={[ rules={[
{ {
required: true, required: true,
message: 'Please input master url, ex ws://localhost:8080 or wss://localhost:8443/ . For SSL connections, ensure you have a valid certificate.', message: 'Please input master url, ex ws://localhost:8080 or wss://localhost:8443/ . For SSL connections, ensure you have a valid certificate.',
}, },
]} ]}
> >
<Input /> <Input />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="User auth token" label="User auth token"
name="master_token" name="master_token"
rules={[ rules={[
{ {
required: true, required: true,
message: 'Please input your user auth token from config-control.json', message: 'Please input your user auth token from config-control.json',
}, },
]} ]}
> >
<Input /> <Input />
</Form.Item> </Form.Item>
<Form.Item {...tailLayout}> <Form.Item {...tailLayout}>
<Button type="primary" htmlType="submit"> <Button type="primary" htmlType="submit">
Save Save
</Button> </Button>
</Form.Item> </Form.Item>
</Form> </Form>
</Card> </Card>
} }
} }
@@ -4,27 +4,27 @@ import { listSlaves, listInstances } from "../../util/wslink"
import DataTable from "../../components/data-table" import DataTable from "../../components/data-table"
export class SlavesTable extends Component { export class SlavesTable extends Component {
constructor(props) { constructor(props) {
super(props) super(props)
} }
navigate(url) { navigate(url) {
this.props.history.push(url); this.props.history.push(url);
} }
render() { render() {
return <Card> return <Card>
<h2>Slaves</h2> <h2>Slaves</h2>
<DataTable <DataTable
DataFunction={listSlaves} DataFunction={listSlaves}
TableProps={{ TableProps={{
onRow: (record, rowIndex) => { onRow: (record, rowIndex) => {
return { return {
onClick: event => { onClick: event => {
this.navigate(`/slaves/${record.id}/view`) this.navigate(`/slaves/${record.id}/view`)
} }
} }
} }
}} }}
/> />
</Card> </Card>
} }
} }
+75 -75
View File
@@ -1,10 +1,10 @@
import React, { Component } from "react" import React, { Component } from "react"
import { Card, Button, Popover, Select, Transfer } from "antd"; import { Card, Button, Popover, Select, Transfer } from "antd";
import { import {
deleteUser, deleteUser,
listUsers, listUsers,
listRoles, listRoles,
setRoles, setRoles,
} from "../../util/wslink" } from "../../util/wslink"
import DataTable from "../../components/data-table" import DataTable from "../../components/data-table"
import notify from "../../util/notify" import notify from "../../util/notify"
@@ -13,78 +13,78 @@ import DeleteOutlined from "@ant-design/icons/DeleteOutlined"
const { Option } = Select const { Option } = Select
export class UserView extends Component { export class UserView extends Component {
constructor(props) { constructor(props) {
super(props) super(props)
this.state = { this.state = {
user: {} user: {}
} }
this.messagesEndRef = React.createRef(); this.messagesEndRef = React.createRef();
} }
navigate(url) { navigate(url) {
this.props.history.push(url); this.props.history.push(url);
} }
async componentDidMount() { async componentDidMount() {
await this.getData() await this.getData()
} }
async getData() { async getData() {
let name = this.props.match.params.id let name = this.props.match.params.id
let users = await listUsers() let users = await listUsers()
let roles = await listRoles() let roles = await listRoles()
this.setState({ this.setState({
user: users.find(x => x.name === name), user: users.find(x => x.name === name),
roles, roles,
}) })
} }
async handleChange(targetKeys) { async handleChange(targetKeys) {
this.setState({ this.setState({
user: { user: {
...this.state.user, ...this.state.user,
roles: targetKeys roles: targetKeys
} }
}); });
let response = await setRoles({ let response = await setRoles({
name: this.state.user.name, name: this.state.user.name,
roles: targetKeys, roles: targetKeys,
}) })
console.log("Updated user roles",response) console.log("Updated user roles",response)
}; };
render() { render() {
console.log(this.state) console.log(this.state)
let { user, roles } = this.state let { user, roles } = this.state
return <Card> return <Card>
<h2>{user.name}</h2> <h2>{user.name}</h2>
<h3>Assign roles</h3> <h3>Assign roles</h3>
<Transfer <Transfer
titles={["Available","Assigned"]} titles={["Available","Assigned"]}
dataSource={roles} dataSource={roles}
showSearch showSearch
filterOption={(inputValue, option) => option.name.toLowerCase().indexOf(inputValue.toLowerCase()) > -1} filterOption={(inputValue, option) => option.name.toLowerCase().indexOf(inputValue.toLowerCase()) > -1}
targetKeys={user.roles} targetKeys={user.roles}
onChange={this.handleChange.bind(this)} onChange={this.handleChange.bind(this)}
render={item => item.name} render={item => item.name}
/> />
<Popover <Popover
content={ content={
<Button <Button
type="primary" type="primary"
danger danger
onClick={async () => { onClick={async () => {
await deleteUser({ name: user.name }) await deleteUser({ name: user.name })
notify("Deleted user " + user.name, "success") notify("Deleted user " + user.name, "success")
this.navigate("/users") this.navigate("/users")
}} }}
> >
Delete this user from the cluster Delete this user from the cluster
</Button> </Button>
} }
trigger="click" trigger="click"
> >
<Button danger style={{ float: "right", fontSize: "16px" }}> <Button danger style={{ float: "right", fontSize: "16px" }}>
<DeleteOutlined /> <DeleteOutlined />
</Button> </Button>
</Popover> </Popover>
</Card> </Card>
} }
} }
+33 -33
View File
@@ -4,37 +4,37 @@ import { listSlaves, listInstances, listUsers, createUser } from "../../util/wsl
import DataTable from "../../components/data-table" import DataTable from "../../components/data-table"
export class UsersTable extends Component { export class UsersTable extends Component {
constructor(props) { constructor(props) {
super(props) super(props)
} }
navigate(url) { navigate(url) {
this.props.history.push(url); this.props.history.push(url);
} }
render() { render() {
return <Card> return <Card>
<h2>Slaves</h2> <h2>Slaves</h2>
<DataTable <DataTable
AddRecord={{ AddRecord={{
fields: [{ fields: [{
dataIndex: "name", dataIndex: "name",
title: "Name" title: "Name"
}], }],
insert: async args => { insert: async args => {
let response = await createUser({name: args.name}) let response = await createUser({name: args.name})
console.log("Created user",response) console.log("Created user",response)
} }
}} }}
DataFunction={listUsers} DataFunction={listUsers}
TableProps={{ TableProps={{
onRow: (record, rowIndex) => { onRow: (record, rowIndex) => {
return { return {
onClick: event => { onClick: event => {
this.navigate(`/users/${record.name}/view`) this.navigate(`/users/${record.name}/view`)
} }
} }
} }
}} }}
/> />
</Card> </Card>
} }
} }
+6 -6
View File
@@ -6,10 +6,10 @@ import { notification } from "antd";
* @param {("info"|"error"|"success"|"warning"|"warn")} type * @param {("info"|"error"|"success"|"warning"|"warn")} type
*/ */
export default function notify(message, type = "info", description) { export default function notify(message, type = "info", description) {
notification[type]({ notification[type]({
message: typeof message === "string" ? message : "ERROR: See console", message: typeof message === "string" ? message : "ERROR: See console",
description, description,
placement: "bottomRight", placement: "bottomRight",
}); });
if (typeof message !== "string") console.error(message) if (typeof message !== "string") console.error(message)
} }
+40 -40
View File
@@ -36,19 +36,19 @@ function formatOutput(output) {
* @private * @private
*/ */
export class ControlConnector extends link.WebSocketClientConnector { export class ControlConnector extends link.WebSocketClientConnector {
constructor(url, reconnectDelay, token) { constructor(url, reconnectDelay, token) {
super(url, reconnectDelay); super(url, reconnectDelay);
this._token = token; this._token = token;
} }
register() { register() {
console.log("SOCKET | registering control"); console.log("SOCKET | registering control");
this.sendHandshake("register_control", { this.sendHandshake("register_control", {
token: this._token, token: this._token,
agent: "web", agent: "web",
version: "2.0.0-alpha", version: "2.0.0-alpha",
}); });
} }
} }
/** /**
@@ -58,41 +58,41 @@ export class ControlConnector extends link.WebSocketClientConnector {
* @static * @static
*/ */
export class Control extends link.Link { export class Control extends link.Link {
constructor(connector, controlPlugins) { constructor(connector, controlPlugins) {
super("control", "master", connector); super("control", "master", connector);
link.attachAllMessages(this); link.attachAllMessages(this);
/** /**
* Mapping of plugin names to their instance for loaded plugins. * Mapping of plugin names to their instance for loaded plugins.
* @type {Map<string, module:lib/plugin.BaseControlPlugin>} * @type {Map<string, module:lib/plugin.BaseControlPlugin>}
*/ */
this.plugins = controlPlugins; this.plugins = controlPlugins;
for (let controlPlugin of controlPlugins.values()) { for (let controlPlugin of controlPlugins.values()) {
plugin.attachPluginMessages(this, controlPlugin.info, controlPlugin); plugin.attachPluginMessages(this, controlPlugin.info, controlPlugin);
} }
} }
async instanceOutputEventHandler(message) { async instanceOutputEventHandler(message) {
let { instance_id, output } = message.data; let { instance_id, output } = message.data;
console.log(formatOutput(output)); console.log(formatOutput(output));
window.instanceOutputEventHandler && window.instanceOutputEventHandler({instance_id, output}) window.instanceOutputEventHandler && window.instanceOutputEventHandler({instance_id, output})
} }
async debugWsMessageEventHandler(message) { async debugWsMessageEventHandler(message) {
console.log("WS", message.data.direction, message.data.content); console.log("WS", message.data.direction, message.data.content);
} }
async shutdown() { async shutdown() {
this.connector.setTimeout(30); this.connector.setTimeout(30);
try { try {
await link.messages.prepareDisconnect.send(this); await link.messages.prepareDisconnect.send(this);
} catch (err) { } catch (err) {
if (!(err instanceof errors.SessionLost)) { if (!(err instanceof errors.SessionLost)) {
throw err; throw err;
} }
} }
await this.connector.close(1001, "Control Quit"); await this.connector.close(1001, "Control Quit");
} }
} }
+75 -75
View File
@@ -7,18 +7,18 @@ let control, controlConnector
// Create WS connection to master. Used by all components through the interface exported here. // Create WS connection to master. Used by all components through the interface exported here.
(async () => { (async () => {
config.finalizeConfigs(); config.finalizeConfigs();
controlConnector = new ControlConnector( controlConnector = new ControlConnector(
localStorage.getItem("master_url"), localStorage.getItem("master_url"),
10, // Reconnect delay 10, // Reconnect delay
localStorage.getItem("master_token"), localStorage.getItem("master_token"),
); );
control = new Control(controlConnector, []); control = new Control(controlConnector, []);
try { try {
await controlConnector.connect(); await controlConnector.connect();
} catch (err) { } catch (err) {
console.log(err) console.log(err)
} }
})() })()
let listSlaves = createListFunction("listSlaves") let listSlaves = createListFunction("listSlaves")
@@ -28,107 +28,107 @@ let listRoles = createListFunction("listRoles")
let listPermissions = createListFunction("listPermissions", "name") let listPermissions = createListFunction("listPermissions", "name")
let startInstance = async function ({ instance_id, save = null }) { let startInstance = async function ({ instance_id, save = null }) {
return await link.messages.startInstance.send(control, { instance_id, save }) return await link.messages.startInstance.send(control, { instance_id, save })
} }
let stopInstance = async function ({ instance_id }) { let stopInstance = async function ({ instance_id }) {
return await link.messages.stopInstance.send(control, { instance_id }) return await link.messages.stopInstance.send(control, { instance_id })
} }
let createInstance = async function (serialized_config) { let createInstance = async function (serialized_config) {
return await link.messages.createInstance.send(control, { serialized_config }); return await link.messages.createInstance.send(control, { serialized_config });
} }
let deleteInstance = async function ({ instance_id }) { let deleteInstance = async function ({ instance_id }) {
return await link.messages.deleteInstance.send(control, { instance_id }); return await link.messages.deleteInstance.send(control, { instance_id });
} }
let assignInstance = async function ({ instance_id, slave_id }) { let assignInstance = async function ({ instance_id, slave_id }) {
return await link.messages.assignInstanceCommand.send(control, { return await link.messages.assignInstanceCommand.send(control, {
instance_id, instance_id,
slave_id, slave_id,
}); });
} }
let createSave = async function ({ instance_id }) { let createSave = async function ({ instance_id }) {
return await link.messages.createSave.send(control, { instance_id }); return await link.messages.createSave.send(control, { instance_id });
} }
let getInstanceConfig = async function ({ instance_id }) { let getInstanceConfig = async function ({ instance_id }) {
return await link.messages.getInstanceConfig.send(control, { instance_id }); return await link.messages.getInstanceConfig.send(control, { instance_id });
} }
let setInstanceConfigField = async function ({ instance_id, field, value }) { let setInstanceConfigField = async function ({ instance_id, field, value }) {
return await link.messages.setInstanceConfigField.send(control, { return await link.messages.setInstanceConfigField.send(control, {
instance_id, instance_id,
field, field,
value: typeof value === "object" ? JSON.stringify(value) : value, value: typeof value === "object" ? JSON.stringify(value) : value,
}); });
} }
let setInstanceConfigProp = async function ({ instance_id, field, prop, value }) { let setInstanceConfigProp = async function ({ instance_id, field, prop, value }) {
return await link.messages.setInstanceConfigProp.send(control, { return await link.messages.setInstanceConfigProp.send(control, {
instance_id, instance_id,
field, field,
prop, prop,
value, // JSON Object value, // JSON Object
}); });
} }
let sendRcon = async function ({ instance_id, command }) { let sendRcon = async function ({ instance_id, command }) {
return await link.messages.sendRcon.send(control, { instance_id, command }) return await link.messages.sendRcon.send(control, { instance_id, command })
} }
let setInstanceOutputSubscriptions = async function ({ instance_id }) { let setInstanceOutputSubscriptions = async function ({ instance_id }) {
return await link.messages.setInstanceOutputSubscriptions.send(control, { instance_ids: [instance_id] }) return await link.messages.setInstanceOutputSubscriptions.send(control, { instance_ids: [instance_id] })
} }
let createUser = async function ({ name }) { let createUser = async function ({ name }) {
return await link.messages.createUser.send(control, { name }) return await link.messages.createUser.send(control, { name })
} }
let deleteUser = async function ({ name }) { let deleteUser = async function ({ name }) {
return await link.messages.deleteUser.send(control, { name }) return await link.messages.deleteUser.send(control, { name })
} }
let setRoles = async function ({ name, roles }) { let setRoles = async function ({ name, roles }) {
return await link.messages.updateUserRoles.send(control, { return await link.messages.updateUserRoles.send(control, {
name, name,
roles, roles,
}) })
} }
let createRole = async function ({ name, description, permissions = [] }) { let createRole = async function ({ name, description, permissions = [] }) {
return await link.messages.createRole.send(control, { name, description, permissions }) return await link.messages.createRole.send(control, { name, description, permissions })
} }
let updateRole = async function ({ id, name, description, permissions }) { let updateRole = async function ({ id, name, description, permissions }) {
return await link.messages.updateRole.send(control, { return await link.messages.updateRole.send(control, {
id, name, description, permissions id, name, description, permissions
}) })
} }
export { export {
listSlaves, listSlaves,
listInstances, listInstances,
listUsers, listUsers,
createUser, createUser,
deleteUser, deleteUser,
listRoles, listRoles,
setRoles, setRoles,
createRole, createRole,
updateRole, updateRole,
listPermissions, listPermissions,
startInstance, startInstance,
stopInstance, stopInstance,
createInstance, createInstance,
deleteInstance, deleteInstance,
assignInstance, assignInstance,
createSave, createSave,
getInstanceConfig, getInstanceConfig,
setInstanceConfigField, setInstanceConfigField,
setInstanceConfigProp, setInstanceConfigProp,
sendRcon, sendRcon,
setInstanceOutputSubscriptions, setInstanceOutputSubscriptions,
} }
function createListFunction(name, key) { function createListFunction(name, key) {
return async () => { return async () => {
return (await link.messages[name].send(control)).list.map(addKey(key || "id")); return (await link.messages[name].send(control)).list.map(addKey(key || "id"));
} }
} }
function addKey(key) { function addKey(key) {
return function (el) { return function (el) {
return { return {
...el, ...el,
key: el[key] key: el[key]
} }
} }
} }