) : null}
@@ -331,9 +331,7 @@ class ChouetteAllJobs extends React.Component {
) : (
)}
diff --git a/src/screens/providers/components/ChouetteJobDetails.js b/src/screens/providers/components/ChouetteJobDetails.js
index 7ef89a30..0af8821d 100644
--- a/src/screens/providers/components/ChouetteJobDetails.js
+++ b/src/screens/providers/components/ChouetteJobDetails.js
@@ -279,7 +279,7 @@ class ChouetteJobDetails extends React.Component {
)}
{requestingJobs ? (
-
+
) : null}
@@ -337,9 +337,7 @@ class ChouetteJobDetails extends React.Component {
) : (
-
- No chouette jobs found for your search criterias.
-
+ No chouette jobs found for your search criterias.
)}
diff --git a/src/screens/providers/components/entityTypesView/EntityTypesView.js b/src/screens/providers/components/EntityTypesView.js
similarity index 98%
rename from src/screens/providers/components/entityTypesView/EntityTypesView.js
rename to src/screens/providers/components/EntityTypesView.js
index 50fbe081..dc522ae2 100644
--- a/src/screens/providers/components/entityTypesView/EntityTypesView.js
+++ b/src/screens/providers/components/EntityTypesView.js
@@ -16,7 +16,7 @@
import React from 'react';
import { connect } from 'react-redux';
-import './entityTypesView.scss';
+import 'sass/views/entityTypesView.scss';
import MdEdit from 'material-ui/svg-icons/image/edit';
import FloatingActionButton from 'material-ui/FloatingActionButton';
import ContentAdd from 'material-ui/svg-icons/content/add';
@@ -24,7 +24,7 @@ import ModalCreateEntityType from 'modals/ModalCreateEntityType';
import ModalEditEntiyType from 'modals/ModalEditEntityType';
import OrganizationRegisterActions from 'actions/OrganizationRegisterActions';
import MdDelete from 'material-ui/svg-icons/action/delete';
-import { sortByColumns } from 'utils';
+import { sortByColumns } from 'utils/index';
import ModalConfirmation from 'modals/ModalConfirmation';
class EntityTypesView extends React.Component {
diff --git a/src/screens/providers/components/GraphStatus.js b/src/screens/providers/components/GraphStatus.js
index 77b8a263..4f70546a 100644
--- a/src/screens/providers/components/GraphStatus.js
+++ b/src/screens/providers/components/GraphStatus.js
@@ -35,14 +35,17 @@ const getColorByStatus = status => {
const containerStyle = {
display: 'flex',
- flexDirection: 'column'
+ alignItems: 'center',
+ flexDirection: 'row'
};
const wrapperStyle = {
- padding: '0 0 10px 0'
+ padding: 10
};
const statusStyle = {
+ marginRight: 10,
+ marginTop: 10,
display: 'flex',
alignItems: 'center',
flexDirection: 'row'
@@ -64,10 +67,7 @@ const GraphStatusDetails = ({ title, status, started }) => (
{status}
-
+
{moment(started).fromNow()}
@@ -111,7 +111,7 @@ class GraphStatus extends React.Component {
<>
-
Graph status
+ Graph status:
{graphStatus.otp1 && (
-
Base graph status
+ Base graph status:
{baseGraphStatus.otp1 && (
(
-
-
-
{name}
-
-
-
- Serialization id:
- Created:
- Size:
-
-
- {serializationId}
-
- {moment(creationDate).format('DD-MM-YYYY hh:mm:ss')}
-
-
- {Math.round((size / 1024 / 1024 / 1024 + Number.EPSILON) * 100) / 100}{' '}
- GB
-
-
-
-
-
-
- Latest street graphs
-
- <>
- {streetGraphs.map(streetGraph => (
-
- ))}
-
-
-
-
- Latest transit graphs
-
- <>
- {transitGraphs.map(transitGraph => (
-
- ))}
-
-
-
-
-
setShowGraphStatus(!showGraphStatus)}
- >
- {showGraphStatus ? : }
-
-
- {showGraphStatus && (
-
-
-
-
- )}
-
+
+
+
+
+
+
this.setState({ graphPopoverOpen: false })}
+ >
+
+
+
+
+
+
this.setState({ googlePopoverOpen: false })}
+ >
+
+ {/*
*/}
+
+
+
+
+
+
+
+ }
+ onClick={() => this.handleCancelAllJobs()}
+ />
+
+
this.setState({ cleanPopoverOpen: false })}
+ >
+
+
)}
+
{
- const isAdmin = rolesParser.isAdmin(auth.roleAssignments);
+export default () => {
return (
-
-
+
+
+
+
+
);
};
-
-const mapStateToProps = state => ({
- auth: state.UserReducer.auth
-});
-
-export default connect(mapStateToProps)(Providers);