Skip to content

Commit

Permalink
src: delete serviceWorker + global rename
Browse files Browse the repository at this point in the history
  • Loading branch information
Sinclert committed Jul 31, 2018
1 parent 2cde9fa commit 541f80f
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 139 deletions.
2 changes: 1 addition & 1 deletion reana-ui/src/components/Header.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

import React, { Component } from "react";
import { Segment, Image, Button, Menu, Icon } from "semantic-ui-react";
import LogoImg from "../images/logo.svg";
import LogoImg from "../images/logo-reana.svg";

export default class Header extends Component {
render() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import React, { Component } from "react";
import { Button } from "semantic-ui-react";

export default class TableActions extends Component {
export default class WorkflowActions extends Component {
static disableView() {
return false;
}
Expand All @@ -45,24 +45,24 @@ export default class TableActions extends Component {
return (
<Button.Group basic icon size="tiny" color="blue" widths="4">
<Button
disabled={TableActions.disableView()}
disabled={WorkflowActions.disableView()}
icon="eye"
content=" View"
compact
/>
<Button
disabled={TableActions.disablePause()}
disabled={WorkflowActions.disablePause()}
icon="pause"
content=" Pause"
compact
/>
<Button
disabled={TableActions.disableResume(this.props.status)}
disabled={WorkflowActions.disableResume(this.props.status)}
icon="play"
content=" Resume"
/>
<Button
disabled={TableActions.disableRunnable(this.props.status)}
disabled={WorkflowActions.disableRunnable(this.props.status)}
icon="refresh"
content=" Rerun"
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@

import React, { Component } from "react";
import { Icon, Menu, Segment, Table } from "semantic-ui-react";
import TableProgress from "./TableProgress";
import TableActions from "./TableActions";
import WorkflowProgress from "./WorkflowProgress";
import WorkflowActions from "./WorkflowActions";
import _ from "lodash";

const URL = "http://reana-dev.cern.ch/api/workflows?";
const TOKEN = "<ACCESS_TOKEN>";
const POOLING_PERIOD = 5;

export default class SortTable extends Component {
export default class WorkflowList extends Component {
/**
* Variables defining the state of the table
*/
Expand Down Expand Up @@ -72,7 +72,7 @@ export default class SortTable extends Component {
let date = new Date(workflow["created"]);
workflow["created"] =
date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate();
workflow["duration"] = SortTable.msToTime(Date.now() - date.getTime());
workflow["duration"] = WorkflowList.msToTime(Date.now() - date.getTime());
});

return data;
Expand All @@ -87,7 +87,7 @@ export default class SortTable extends Component {
.then(data => {
const { column, direction } = this.state;

data = _.sortBy(SortTable.parseData(data), [column]);
data = _.sortBy(WorkflowList.parseData(data), [column]);
this.setState({
data: direction === "descending" ? data.reverse() : data
});
Expand Down Expand Up @@ -188,11 +188,11 @@ export default class SortTable extends Component {
<Table.Cell colSpan="2">{created}</Table.Cell>
<Table.Cell colSpan="2">{duration}</Table.Cell>
<Table.Cell colSpan="8">
<TableProgress completed={0} total={0} status={status} />
<WorkflowProgress completed={0} total={0} status={status} />
</Table.Cell>
<Table.Cell colSpan="1">{status}</Table.Cell>
<Table.Cell colSpan="4">
<TableActions status={status} />
<WorkflowActions status={status} />
</Table.Cell>
</Table.Row>
))}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import React, { Component } from "react";
import { Progress } from "semantic-ui-react";

export default class TableProgress extends Component {
export default class WorkflowProgress extends Component {
static handleActive(status) {
return status === "running";
}
Expand All @@ -50,12 +50,12 @@ export default class TableProgress extends Component {
return (
<Progress
size="small"
percent={TableProgress.handlePercentage(
percent={WorkflowProgress.handlePercentage(
this.props.completed,
this.props.total
)}
color={TableProgress.handleColor(this.props.status)}
active={TableProgress.handleActive(this.props.status)}
color={WorkflowProgress.handleColor(this.props.status)}
active={WorkflowProgress.handleActive(this.props.status)}
>
{this.props.completed} / {this.props.total}
</Progress>
Expand Down
File renamed without changes
2 changes: 0 additions & 2 deletions reana-ui/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
import React from "react";
import ReactDOM from "react-dom";
import App from "./App";
import registerServiceWorker from "./registerServiceWorker";
import "semantic-ui-css/semantic.min.css";

ReactDOM.render(<App />, document.getElementById("root"));
registerServiceWorker();
4 changes: 2 additions & 2 deletions reana-ui/src/pages/Workflows.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@

import React, { Component } from "react";
import Header from "../components/Header";
import Table from "../components/Table";
import WorkflowList from "../components/WorkflowList";

export default class WorkflowsPage extends Component {
render() {
return (
<div>
<Header />
<Table />
<WorkflowList />
</div>
);
}
Expand Down
117 changes: 0 additions & 117 deletions reana-ui/src/registerServiceWorker.js

This file was deleted.

2 changes: 1 addition & 1 deletion run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
# submit itself to any jurisdiction.

sphinx-build -qnN docs docs/_build/html
#prettier reana-ui/src/**/*.js --list-different
prettier reana-ui/src/**/*.js --list-different

0 comments on commit 541f80f

Please sign in to comment.