Finish linting web interface

Fix remaining linter errors detected in web interface code.
This commit is contained in:
Hornwitser committed 2020-09-28 05:52:31 +02:00
1 parent 03b7d22ba6
commit bccc89fa0b
16 files changed
+201 -187

No files matched your search

+1 -4
View File
@@ -1,10 +1,7 @@
import React, {Component} from "react";
export class Dashboard extends Component {
constructor(props){
super(props);
}
render(){
return <h2>Dashboard</h2>;
}
}
}
@@ -31,9 +31,11 @@ export class InstanceView extends Component {
};
this.messagesEndRef = React.createRef();
}
navigate(url) {
this.props.history.push(url);
}
async componentDidMount() {
let id = this.props.match.params.id;
@@ -52,6 +54,7 @@ export class InstanceView extends Component {
// this.messagesEndRef.current.scrollIntoView({ behavior: 'smooth' })
};
}
async getData() {
let id = this.props.match.params.id;
@@ -66,9 +69,10 @@ export class InstanceView extends Component {
let config = await getInstanceConfig({ instance_id: Number(id) });
console.log(config);
this.setState({
config
config,
});
}
async start() {
this.setState({
starting: true,
@@ -80,9 +84,10 @@ export class InstanceView extends Component {
});
} catch (e) {
notify("Error starting instance", "error", e.message);
return this.setState({
this.setState({
starting: false,
});
return;
}
notify("Instance started");
this.setState({
@@ -90,6 +95,7 @@ export class InstanceView extends Component {
});
this.getData();
}
async stop() {
this.setState({
stopping: true,
@@ -100,9 +106,10 @@ export class InstanceView extends Component {
});
} catch (e) {
notify("Error stopping instance", "error", e.message);
return this.setState({
this.setState({
stopping: false,
});
return;
}
notify("Instance stopped");
this.setState({
@@ -110,6 +117,7 @@ export class InstanceView extends Component {
});
this.getData();
}
async createSave() {
this.setState({
creatingSave: true,
@@ -120,15 +128,17 @@ export class InstanceView extends Component {
});
} catch (e) {
notify("Error creating save", "error", e.message);
return this.setState({
this.setState({
creatingSave: false,
});
return;
}
notify("Save created", "success");
this.setState({
creatingSave: false,
});
}
async onConfigEditFinish(values) {
console.log("Completed config edit with", values);
for (let k in values) {
@@ -145,10 +155,11 @@ export class InstanceView extends Component {
}
notify("Set configuration fields", "success");
this.setState({
editingConfig: false
editingConfig: false,
});
this.getData();
}
render() {
console.log(this.state);
let { instance, slaves } = this.state;
@@ -162,26 +173,26 @@ export class InstanceView extends Component {
type="primary"
onClick={this.start.bind(this)}
>
Start server
Start server
</Button>}
{instance.status !== "stopped" && <Button
loading={this.state.stopping}
type="primary"
onClick={this.stop.bind(this)}
>
Stop server
Stop server
</Button>}
{instance.status !== "running" && <Button
loading={this.state.creatingSave}
type="primary"
onClick={this.createSave.bind(this)}
>
Create save
Create save
</Button>}
<Popover
content={
<Select style={{
width: "200px"
width: "200px",
}}
onChange={async newSlaveId => {
let result = await assignInstance({ instance_id: instance.id, slave_id: newSlaveId });
@@ -198,7 +209,7 @@ export class InstanceView extends Component {
type={instance.status === "unassigned" ? "primary" : "default"}
>
<Button>
Assign to slave
Assign to slave
</Button>
</Popover>
<Popover
@@ -212,7 +223,7 @@ export class InstanceView extends Component {
this.navigate("/instances");
}}
>
Delete this instance permanently
Delete this instance permanently
</Button>
}
trigger="click"
@@ -224,16 +235,16 @@ export class InstanceView extends Component {
<style>
{/* Scroll sticks to bottom of terminal window after manually scrolling to the bottom */}
{`#scroller * {
/* don't allow the children of the scrollable element to be selected as an anchor node */
overflow-anchor: none;
}
#anchor {
/* allow the final child to be selected as an anchor node */
overflow-anchor: auto;
/* don't allow the children of the scrollable element to be selected as an anchor node */
overflow-anchor: none;
}
#anchor {
/* allow the final child to be selected as an anchor node */
overflow-anchor: auto;
/* anchor nodes are required to have non-zero area */
height: 1px;
}`}
/* anchor nodes are required to have non-zero area */
height: 1px;
}`}
</style>
<div id="scroller" style={{
height: "300px",
@@ -258,15 +269,17 @@ export class InstanceView extends Component {
{this.state.config && this.renderConfig(this.state.config)}
</Card>;
}
getInstanceConfigAsKvObject(config) {
let object = {};
for (let group of config.serialized_config.groups) {
for (let fieldName in group.fields) {
for (let fieldName of Object.keys(group.fields)) {
object[group.name + "." + fieldName] = group.fields[fieldName];
}
}
return object;
}
renderConfig(config) {
const layout = {
labelCol: {
@@ -291,7 +304,7 @@ export class InstanceView extends Component {
{this.state.editingConfig ?
<Form.Item>
<Button type="primary" htmlType="submit">
Save config changes
Save config changes
</Button>
</Form.Item>
:
@@ -306,10 +319,10 @@ export class InstanceView extends Component {
// orientation="left"
>{group.name}</Divider>
{/* {Object.keys(group.fields).map(field => <>
<span>{field}: </span>
<span>{JSON.stringify(group.fields[field])}</span>
<br />
</>)} */}
<span>{field}: </span>
<span>{JSON.stringify(group.fields[field])}</span>
<br />
</>)} */}
{console.log(group)}
{Object.keys(group.fields).map(field => <ConfigFormItem field={field} group={group} editingConfig={this.state.editingConfig} />)}
</Col>
@@ -344,15 +357,16 @@ class ObjectInput extends Component {
super(props);
console.log(this.props);
/*
value: {
auto_pause: false,
tags: ["clusterio"]
},
id: "factorio.settings",
onChange: f()
*/
value: {
auto_pause: false,
tags: ["clusterio"]
},
id: "factorio.settings",
onChange: f()
*/
this.state = {};
}
onChange(e, key) {
if (e.target.type === "checkbox") {
// if (e.target.checked !== undefined) {
@@ -368,6 +382,7 @@ class ObjectInput extends Component {
this.props.onChange(value);
}
}
render() {
let { value } = this.props;
let ret = [];
@@ -418,10 +433,8 @@ class ObjectInput extends Component {
return <Space direction="vertical">{ret}</Space>;
}
}
class ConfigFormItem extends Component {
constructor(props) {
super(props);
}
render() {
let { field, group, editingConfig } = this.props;
return <Form.Item
@@ -5,12 +5,10 @@ import DataTable from "../../components/data-table";
const config = require("@clusterio/lib/config");
export class InstancesTable extends Component {
constructor(props) {
super(props);
}
navigate(url) {
this.props.history.push(url);
}
render() {
return <Card>
<h2>Instances</h2>
@@ -18,7 +16,7 @@ export class InstancesTable extends Component {
AddRecord={{
fields: [{
dataIndex: "name",
title: "Name"
title: "Name",
}],
insert: async args => {
let instanceConfig = new config.InstanceConfig();
@@ -28,17 +26,15 @@ export class InstancesTable extends Component {
let serialized_config = instanceConfig.serialize();
let response = await createInstance(serialized_config);
console.log("Created instance", response);
}
},
}}
DataFunction={listInstances}
TableProps={{
onRow: (record, rowIndex) => {
return {
onClick: event => {
this.navigate(`/instances/${record.id}/view`);
}
};
}
onRow: (record, rowIndex) => ({
onClick: event => {
this.navigate(`/instances/${record.id}/view`);
},
}),
}}
/>
</Card>;
@@ -4,25 +4,21 @@ import { listSlaves, listInstances, listPermissions } from "../../util/wslink";
import DataTable from "../../components/data-table";
export class PermissionsTable extends Component {
constructor(props) {
super(props);
}
navigate(url) {
this.props.history.push(url);
}
render() {
return <Card>
<h2>Permissions</h2>
<DataTable
DataFunction={listPermissions}
TableProps={{
onRow: (record, rowIndex) => {
return {
onClick: event => {
this.navigate(`/permissions/${record.id}/view`);
}
};
}
onRow: (record, rowIndex) => ({
onClick: event => {
this.navigate(`/permissions/${record.id}/view`);
},
}),
}}
/>
</Card>;
+14 -9
View File
@@ -31,16 +31,19 @@ export class RoleView extends Component {
constructor(props) {
super(props);
this.state = {
role: {}
role: {},
};
this.messagesEndRef = React.createRef();
}
navigate(url) {
this.props.history.push(url);
}
async componentDidMount() {
await this.getData();
}
async getData() {
let id = this.props.match.params.id;
@@ -52,12 +55,13 @@ export class RoleView extends Component {
permissions,
});
}
async handleChange(targetKeys) {
this.setState({
role: {
...this.state.role,
permissions: targetKeys
}
permissions: targetKeys,
},
});
let response = await updateRole({
...this.state.role,
@@ -65,6 +69,7 @@ export class RoleView extends Component {
});
console.log("Updated user roles", response);
}
render() {
console.log(this.state);
let { role, permissions } = this.state;
@@ -80,7 +85,7 @@ export class RoleView extends Component {
this.navigate("/roles");
}}
>
Delete this role permanently
Delete this role permanently
</Button>
}
trigger="click"
@@ -93,11 +98,11 @@ export class RoleView extends Component {
<h3>Assign roles</h3>
<style>
{`
.ant-transfer-list{
width: calc( 50% - 34px );
height: 500px;
}
`}
.ant-transfer-list{
width: calc( 50% - 34px );
height: 500px;
}
`}
</style>
<Transfer
titles={["Available", "Assigned"]}
+9 -13
View File
@@ -4,12 +4,10 @@ import { listSlaves, listInstances, listRoles, createRole } from "../../util/wsl
import DataTable from "../../components/data-table";
export class RolesTable extends Component {
constructor(props) {
super(props);
}
navigate(url) {
this.props.history.push(url);
}
render() {
return <Card>
<h2>Roles</h2>
@@ -17,25 +15,23 @@ export class RolesTable extends Component {
AddRecord={{
fields: [{
dataIndex: "name",
title: "Name"
title: "Name",
},{
dataIndex: "description",
title: "Description"
title: "Description",
}],
insert: async args => {
let response = await createRole({name: args.name, description: args.description});
console.log("Created role",response);
}
},
}}
DataFunction={listRoles}
TableProps={{
onRow: (record, rowIndex) => {
return {
onClick: event => {
this.navigate(`/roles/${record.id}/view`);
}
};
}
onRow: (record, rowIndex) => ({
onClick: event => {
this.navigate(`/roles/${record.id}/view`);
},
}),
}}
/>
</Card>;
@@ -20,12 +20,14 @@ export class Settings extends Component {
constructor(props) {
super(props);
this.state = {
role: {}
role: {},
};
}
navigate(url) {
this.props.history.push(url);
}
render() {
console.log(this.state);
return <Card>
@@ -39,7 +41,7 @@ export class Settings extends Component {
}}
onFinish={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://"));
}
// Force refresh to apply changes
@@ -52,7 +54,7 @@ export class Settings extends Component {
rules={[
{
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.",
},
]}
>
@@ -64,7 +66,7 @@ export class Settings extends Component {
rules={[
{
required: true,
message: 'Please input your user auth token from config-control.json',
message: "Please input your user auth token from config-control.json",
},
]}
>
@@ -72,7 +74,7 @@ export class Settings extends Component {
</Form.Item>
<Form.Item {...tailLayout}>
<Button type="primary" htmlType="submit">
Save
Save
</Button>
</Form.Item>
</Form>
@@ -4,25 +4,21 @@ import { listSlaves, listInstances } from "../../util/wslink";
import DataTable from "../../components/data-table";
export class SlavesTable extends Component {
constructor(props) {
super(props);
}
navigate(url) {
this.props.history.push(url);
}
render() {
return <Card>
<h2>Slaves</h2>
<DataTable
DataFunction={listSlaves}
TableProps={{
onRow: (record, rowIndex) => {
return {
onClick: event => {
this.navigate(`/slaves/${record.id}/view`);
}
};
}
onRow: (record, rowIndex) => ({
onClick: event => {
this.navigate(`/slaves/${record.id}/view`);
},
}),
}}
/>
</Card>;
+9 -4
View File
@@ -16,16 +16,19 @@ export class UserView extends Component {
constructor(props) {
super(props);
this.state = {
user: {}
user: {},
};
this.messagesEndRef = React.createRef();
}
navigate(url) {
this.props.history.push(url);
}
async componentDidMount() {
await this.getData();
}
async getData() {
let name = this.props.match.params.id;
@@ -37,12 +40,13 @@ export class UserView extends Component {
roles,
});
}
async handleChange(targetKeys) {
this.setState({
user: {
...this.state.user,
roles: targetKeys
}
roles: targetKeys,
},
});
let response = await setRoles({
name: this.state.user.name,
@@ -50,6 +54,7 @@ export class UserView extends Component {
});
console.log("Updated user roles",response);
};
render() {
console.log(this.state);
let { user, roles } = this.state;
@@ -76,7 +81,7 @@ export class UserView extends Component {
this.navigate("/users");
}}
>
Delete this user from the cluster
Delete this user from the cluster
</Button>
}
trigger="click"
+8 -12
View File
@@ -4,12 +4,10 @@ import { listSlaves, listInstances, listUsers, createUser } from "../../util/wsl
import DataTable from "../../components/data-table";
export class UsersTable extends Component {
constructor(props) {
super(props);
}
navigate(url) {
this.props.history.push(url);
}
render() {
return <Card>
<h2>Slaves</h2>
@@ -17,22 +15,20 @@ export class UsersTable extends Component {
AddRecord={{
fields: [{
dataIndex: "name",
title: "Name"
title: "Name",
}],
insert: async args => {
let response = await createUser({name: args.name});
console.log("Created user",response);
}
},
}}
DataFunction={listUsers}
TableProps={{
onRow: (record, rowIndex) => {
return {
onClick: event => {
this.navigate(`/users/${record.name}/view`);
}
};
}
onRow: (record, rowIndex) => ({
onClick: event => {
this.navigate(`/users/${record.name}/view`);
},
}),
}}
/>
</Card>;