History page refactoring

frontend/src/pages/history.js

@@ -1,61 +1,68 @@
-import React, { Component } from 'react';
+import React, { Component } from 'react'
-import { Link } from 'react-router-dom';
+import { Link } from 'react-router-dom'
 
-import Nav from '../blocks/nav.js';
+import Nav from '../blocks/nav.js'
-import JobList from '../blocks/job_list.js';
+import JobList from '../blocks/job_list.js'
-import User from '../blocks/user.js';
+import User from '../blocks/user.js'
-import { api, httpGET } from '../http.js';
+import Alert from '../blocks/alert.js'
-import './history.css';
+import { api, httpGET } from '../http.js'
+import './history.css'
 
 export default class History extends Component {
     constructor(props) {
-        super(props);
+        super(props)
-        this.state = {};
+        this.state = {}
     }
 
     componentDidMount() {
-        var url;
+        httpGET(this.endpointFromProps(this.props),
-        if (this.props.cmd !== undefined) {
-            url = api("/commands/" + this.props.cmd + "/jobs")
-        } else if (this.props.userID !== undefined) {
-            url = api("/users/" + this.props.userID + "/jobs")
-        } else {
-            url = api("/jobs")
-        }
-        httpGET(url,
             (status, body) => {
-                let jobs = JSON.parse(body);
+                let jobs = JSON.parse(body)
-                this.setState({jobs: jobs});
+                this.setState({jobs: jobs})
             },
             (error) => {
-                console.log("Failed to load jobs:", error);
+                this.setState({error: "Failed to load jobs: "+ error})
             },
-        );
+        )
+    }
+
+    endpointFromProps(props) {
+        if (props.cmd !== undefined) {
+            return api("/commands/" + props.cmd + "/jobs")
+        } else if (props.userID !== undefined) {
+            return api("/users/" + props.userID + "/jobs")
+        } else {
+            return api("/jobs")
+        }
     }
 
     render() {
-        let details;
-        if (this.props.cmd !== undefined) {
-            details = (
-                <div className="command-details">
-                    <span>Command</span>
-                    <div className="cmd-name"><Link to={"/cmd/"+ this.props.cmd}>{this.props.cmd}</Link></div>
-                </div>
-            );
-        } else if (this.props.userID !== undefined) {
-            details = (
-                <User id={this.props.userID} />
-            );
-        }
         return (
             <div className="container">
                 <Nav commands={this.props.commands} active={this.props.cmd}
                     query={this.props.query} onQueryChange={this.props.onQueryChange} />
                 <main>
-                    {details}
+                    {this.renderJobDetails()}
+                    <Alert type="error" message={this.state.error} />
                     <JobList jobs={this.state.jobs} />
                 </main>
             </div>
-        );
+        )
+    }
+
+    renderJobDetails() {
+        if (this.props.cmd !== undefined) {
+            return (
+                <div className="command-details">
+                    <span>Command</span>
+                    <div className="cmd-name"><Link to={"/cmd/"+ this.props.cmd}>{this.props.cmd}</Link></div>
+                </div>
+            )
+        } else if (this.props.userID !== undefined) {
+            return (
+                <User id={this.props.userID} />
+            )
+        }
+        return null
     }
 }