Skip to content

Commit d229457

Browse files
ewoutpewoutp
authored
Merge pull request #215 from arangodb/feature/dashboard-replication
Adding ArangoDeploymentReplication dashboard.
2 parents f124554 + ddd2462 commit d229457

27 files changed

+836
-129
lines changed

‎dashboard/assets.go‎

Lines changed: 47 additions & 47 deletions
Large diffs are not rendered by default.

‎dashboard/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"devDependencies": {
1717
"react-scripts": "1.1.4"
1818
},
19-
"proxy": "https://192.168.140.211:8528",
19+
"proxy": "https://192.168.140.212:8528",
2020
"scripts": {
2121
"start": "react-scripts start",
2222
"build": "react-scripts build",

‎dashboard/src/App.js‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1+
import { Container, Segment, Message } from 'semantic-ui-react';
12
import React, { Component } from 'react';
23
import ReactTimeout from 'react-timeout';
3-
import DeploymentOperator from './deployment/DeploymentOperator.js';
4-
import StorageOperator from './storage/StorageOperator.js';
5-
import NoOperator from './NoOperator.js';
6-
import Loading from './util/Loading.js';
7-
import api, { isUnauthorized } from './api/api.js';
8-
import { Container, Segment, Message } from 'semantic-ui-react';
9-
import { withAuth } from './auth/Auth.js';
4+
5+
import { withAuth } from './auth/Auth';
6+
import api, { isUnauthorized } from './api/api';
7+
import DeploymentOperator from './deployment/DeploymentOperator';
8+
import DeploymentReplicationOperator from './replication/DeploymentReplicationOperator';
9+
import Loading from './util/Loading';
10+
import NoOperator from './NoOperator';
11+
import StorageOperator from './storage/StorageOperator';
1012

1113
const PodInfoView = ({pod, namespace}) => (
1214
<Segment basic>
@@ -17,10 +19,12 @@ const PodInfoView = ({pod, namespace}) => (
1719
</Segment>
1820
);
1921

20-
const OperatorsView = ({error, deployment, storage, pod, namespace}) => {
22+
const OperatorsView = ({error, deployment, deploymentReplication, storage, pod, namespace}) => {
2123
let Operator = NoOperator;
2224
if (deployment)
2325
Operator = DeploymentOperator;
26+
else if (deploymentReplication)
27+
Operator = DeploymentReplicationOperator;
2428
else if (storage)
2529
Operator = StorageOperator;
2630
return (
@@ -70,6 +74,7 @@ class App extends Component {
7074
return <OperatorsView
7175
error={this.state.error}
7276
deployment={this.state.operators.deployment}
77+
deploymentReplication={this.state.operators.deployment_replication}
7378
storage={this.state.operators.storage}
7479
pod={this.state.operators.pod}
7580
namespace={this.state.operators.namespace}

‎dashboard/src/NoOperator.js‎

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,21 @@
1-
import React, { Component } from 'react';
21
import { Container, Message, Modal, Segment } from 'semantic-ui-react';
2+
import React from 'react';
33

4-
class NoOperator extends Component {
5-
render() {
6-
return (
7-
<Container>
8-
<Modal open>
9-
<Modal.Header>Welcome to Kube-ArangoDB</Modal.Header>
10-
<Modal.Content>
11-
<Segment basic>
12-
<Message color="orange">
13-
There are no operators available yet.
14-
</Message>
15-
</Segment>
16-
{this.props.podInfoView}
17-
{(this.props.error) ? <Message error content={this.props.error}/> : null}
18-
</Modal.Content>
19-
</Modal>
20-
</Container>
21-
);
22-
}
23-
}
4+
const NoOperator = () => (
5+
<Container>
6+
<Modal open>
7+
<Modal.Header>Welcome to Kube-ArangoDB</Modal.Header>
8+
<Modal.Content>
9+
<Segment basic>
10+
<Message color="orange">
11+
There are no operators available yet.
12+
</Message>
13+
</Segment>
14+
{this.props.podInfoView}
15+
{(this.props.error) ? <Message error content={this.props.error}/> : null}
16+
</Modal.Content>
17+
</Modal>
18+
</Container>
19+
);
2420

2521
export default NoOperator;

‎dashboard/src/auth/Auth.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import React, { Component } from 'react';
2-
import api from '../api/api.js';
3-
import Login from './Login.js';
4-
import Loading from '../util/Loading.js';
5-
import LogoutContext from './LogoutContext.js';
6-
import { getSessionItem, setSessionItem } from "../util/Storage.js";
72

8-
const tokenSessionKey = "auth-token";
3+
import { getSessionItem, setSessionItem } from '../util/Storage';
4+
import api from '../api/api';
5+
import Loading from '../util/Loading';
6+
import Login from './Login';
7+
import LogoutContext from './LogoutContext';
98

9+
const tokenSessionKey = "auth-token";
1010

1111
// withAuth adds a doLogout property to the given component.
1212
export function withAuth(WrappedComponent) {

‎dashboard/src/auth/Login.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import React, { Component } from 'react';
21
import { Button, Container, Form, Icon, Message, Modal } from 'semantic-ui-react';
32
import { css } from 'react-emotion';
3+
import React, { Component } from 'react';
44

55
const LoginView = ({username, password, onUsernameChanged, onPasswordChanged, doLogin, error}) => (
66
<Container>

‎dashboard/src/deployment/DeploymentDetails.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
import ReactTimeout from 'react-timeout';
1+
import { Loader } from 'semantic-ui-react';
22
import React, { Component } from 'react';
3-
import api, { isUnauthorized } from '../api/api.js';
4-
import Loading from '../util/Loading.js';
5-
import MemberList from './MemberList.js';
3+
import ReactTimeout from 'react-timeout';
64
import styled from 'react-emotion';
7-
import { Loader } from 'semantic-ui-react';
5+
86
import { withAuth } from '../auth/Auth.js';
7+
import api, { isUnauthorized } from '../api/api';
8+
import Loading from '../util/Loading';
9+
import MemberList from './MemberList';
910

1011
const LoaderBox = styled('span')`
1112
float: right;

‎dashboard/src/deployment/DeploymentList.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import { Icon, Loader, Popup, Table } from 'semantic-ui-react';
22
import { Link } from "react-router-dom";
3-
import api, { isUnauthorized } from '../api/api.js';
4-
import CommandInstruction from '../util/CommandInstruction.js';
5-
import Loading from '../util/Loading.js';
63
import React, { Component } from 'react';
74
import ReactTimeout from 'react-timeout';
85
import styled from 'react-emotion';
9-
import { withAuth } from '../auth/Auth.js';
6+
7+
import { withAuth } from '../auth/Auth';
8+
import api, { isUnauthorized } from '../api/api';
9+
import CommandInstruction from '../util/CommandInstruction';
10+
import Loading from '../util/Loading';
1011

1112
const LoaderBox = styled('span')`
1213
float: right;

‎dashboard/src/deployment/DeploymentOperator.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
import React, { Component } from 'react';
2-
import LogoutContext from '../auth/LogoutContext.js';
3-
import DeploymentDetails from './DeploymentDetails.js';
4-
import DeploymentList from './DeploymentList.js';
5-
import { Header, Menu, Message, Segment } from 'semantic-ui-react';
61
import { BrowserRouter as Router, Route, Link } from "react-router-dom";
2+
import { Header, Menu, Message, Segment } from 'semantic-ui-react';
3+
import React, { Component } from 'react';
74
import styled from 'react-emotion';
85

6+
import DeploymentDetails from './DeploymentDetails';
7+
import DeploymentList from './DeploymentList';
8+
import LogoutContext from '../auth/LogoutContext';
9+
910
const StyledMenu = styled(Menu)`
1011
width: 15rem !important;
1112
@media (max-width: 768px) {

‎dashboard/src/deployment/MemberList.js‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,8 @@
1-
import React, { Component } from 'react';
2-
import styled from 'react-emotion';
31
import { Accordion, Header, Icon, List, Segment } from 'semantic-ui-react';
4-
import CommandInstruction from '../util/CommandInstruction.js';
5-
6-
const Field = styled('div')`
7-
padding-top: 0.3em;
8-
padding-bottom: 0.3em;
9-
`;
10-
11-
const FieldLabel = styled('span')`
12-
width: 9rem;
13-
display: inline-block;
14-
`;
2+
import React, { Component } from 'react';
153

16-
const FieldIcons = styled('div')`
17-
float: right;
18-
`;
4+
import { Field, FieldLabel, FieldIcons } from '../style/style';
5+
import CommandInstruction from '../util/CommandInstruction';
196

207
const MemberListView = ({group, activeMemberID, onClick, members, namespace}) => (
218
<Segment>

0 commit comments

Comments
 (0)