aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxuegao <xg353y@intl.att.com>2019-07-25 15:43:06 +0200
committerxuegao <xg353y@intl.att.com>2019-07-29 13:14:56 +0200
commite52d5727650590b9adaa43f5830c40913cebf348 (patch)
treec7cbcfc5b2f2a0fe4329a4a97f9c297ac303de81
parentb09e7df8439398fc094a56ec33fa33950ac8fa9e (diff)
Rework user info window
Rework the user info window with react. Issue-ID: CLAMP-449 Change-Id: I260bcb3c15cae73af0c180706928415ddc81dfbf Signed-off-by: xuegao <xg353y@intl.att.com>
-rw-r--r--ui-react/src/LoopUI.js10
-rw-r--r--ui-react/src/api/UserService.js23
-rw-r--r--ui-react/src/components/dialogs/UserInfo.js161
3 files changed, 192 insertions, 2 deletions
diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index 1f79d39eb..342f43dae 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -38,6 +38,8 @@ import { Route, Redirect } from 'react-router-dom'
import OpenLoopModal from './components/dialogs/OpenLoop/OpenLoopModal';
import OperationalPolicyModal from './components/dialogs/OperationalPolicy/OperationalPolicyModal';
import ConfigurationPolicyModal from './components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal';
+import LoopProperties from './components/dialogs/LoopProperties';
+import UserInfo from './components/dialogs/UserInfo';
const ProjectNameStyled = styled.a`
vertical-align: middle;
@@ -104,7 +106,7 @@ export default class LoopUI extends React.Component {
renderMenuNavBar() {
return (
- <MenuBar />
+ <MenuBar loopCache={this.state.loopCache}/>
);
}
@@ -153,6 +155,10 @@ export default class LoopUI extends React.Component {
);
}
+ getLoopCache() {
+ return this.state.loopCache;
+
+ }
renderLoopViewer() {
return (
<LoopViewDivStyled>
@@ -177,6 +183,8 @@ export default class LoopUI extends React.Component {
render={(routeProps) => (<OperationalPolicyModal {...routeProps} loopCache={this.state.loopCache} />)} />
<Route path="/configurationPolicyModal/:componentName" render={(routeProps) => (<ConfigurationPolicyModal {...routeProps} loopCache={this.state.loopCache} />)} />
<Route path="/openLoop" render={(routeProps) => (<OpenLoopModal {...routeProps} updateLoopCacheFunction={this.updateLoopCache} />)} />
+ <Route path="/loopProperties" render={(routeProps) => (<LoopProperties {...routeProps} loopCache={this.getLoopCache()} />)} />
+ <Route path="/userInfo" render={(routeProps) => (<UserInfo {...routeProps} />)} />
<Route path="/closeLoop" render={(routeProps) => (<Redirect to='/'/>)} />
</div>
);
diff --git a/ui-react/src/api/UserService.js b/ui-react/src/api/UserService.js
index 22168d41b..be21e692a 100644
--- a/ui-react/src/api/UserService.js
+++ b/ui-react/src/api/UserService.js
@@ -47,5 +47,26 @@ export default class UserService {
return UserService.notLoggedUserName;
});
}
-}
+ static getUserInfo() {
+ return fetch('/restservices/clds/v1/clds/cldsInfo', {
+ method: 'GET',
+ credentials: 'same-origin',
+ })
+ .then(function (response) {
+ console.debug("getUserInfo response received, status code:", response.status);
+ if (response.ok) {
+ return response.json();
+ }
+ })
+ .then(function (data) {
+ console.info ("User info received:",data)
+ return data;
+ })
+ .catch(function(error) {
+ console.warn("getUserInfo error received, user set to: ",UserService.notLoggedUserName);
+ console.error("getUserInfo error:",error);
+ return;
+ });
+ }
+}
diff --git a/ui-react/src/components/dialogs/UserInfo.js b/ui-react/src/components/dialogs/UserInfo.js
new file mode 100644
index 000000000..a8ef717b3
--- /dev/null
+++ b/ui-react/src/components/dialogs/UserInfo.js
@@ -0,0 +1,161 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+import React from 'react'
+import Button from 'react-bootstrap/Button';
+import Modal from 'react-bootstrap/Modal';
+import Form from 'react-bootstrap/Form';
+import Row from 'react-bootstrap/Row';
+import Col from 'react-bootstrap/Col';
+import styled from 'styled-components';
+import UserService from '../../api/UserService';
+
+const ModalStyled = styled(Modal)`
+ background-color: transparent;
+`
+
+export default class UserInfo extends React.Component {
+
+ constructor(props, context) {
+ super(props, context);
+
+ this.handleClose = this.handleClose.bind(this);
+ this.initialValues = this.initialValues.bind(this);
+ this.renderReadTemplatePermission = this.renderReadTemplatePermission.bind(this);
+ this.renderReadModelPermission = this.renderReadModelPermission.bind(this);
+ this.renderReadToscaPermission = this.renderReadToscaPermission.bind(this);
+ this.renderUpdateTemplatePermission = this.renderUpdateTemplatePermission.bind(this);
+ this.renderUpdateModelPermission = this.renderUpdateModelPermission.bind(this);
+ this.renderUpdateToscaPermission = this.renderUpdateToscaPermission.bind(this);
+ this.renderUserName = this.renderUserName.bind(this);
+ this.state = {
+ show: true,
+ userInfo: {permissionReadTemplate: true,
+ permissionReadCl: true,
+ permissionReadTosca: true,
+ permissionUpdateCl: true,
+ permissionUpdateTemplate: true,
+ permissionUpdateTosca: true,
+ userName: 'admin',
+ cldsVersion: '1.0.0'
+ }
+ };
+
+ }
+ initialValues() {
+ UserService.getUserInfo().then(userInfo => {
+ this.setState({ userInfo: userInfo })
+ });
+ }
+ handleClose() {
+ this.props.history.push('/');
+ }
+ renderReadTemplatePermission() {
+ if (this.state.userInfo["permissionReadTemplate"]) {
+ return <Form.Control plaintext readOnly defaultValue="Read Template" />
+ } else {
+ return;
+ }
+ }
+ renderReadModelPermission() {
+ if (this.state.userInfo["permissionReadCl"]) {
+ return <Form.Control plaintext readOnly defaultValue="Read Model" />
+ } else {
+ return;
+ }
+ }
+ renderReadToscaPermission() {
+ if (this.state.userInfo["permissionReadTosca"]) {
+ return <Form.Control plaintext readOnly defaultValue="Read Tosca" />
+ } else {
+ return;
+ }
+ }
+ renderUpdateTemplatePermission() {
+ if (this.state.userInfo["permissionUpdateTemplate"]) {
+ return <Form.Control plaintext readOnly defaultValue="Edit Template" />
+ } else {
+ return;
+ }
+ }
+ renderUpdateModelPermission() {
+ if (this.state.userInfo["permissionUpdateCl"]) {
+ return <Form.Control plaintext readOnly defaultValue="Edit Model" />
+ } else {
+ return;
+ }
+ }
+ renderUpdateToscaPermission() {
+ if (this.state.userInfo["permissionUpdateTosca"]) {
+ return <Form.Control plaintext readOnly defaultValue="Edit Tosca" />
+ } else {
+ return;
+ }
+ }
+ renderUserName() {
+ if (this.state.userInfo["userName"]) {
+ return <Form.Control plaintext readOnly defaultValue={this.state.userInfo["userName"]} />
+ } else {
+ return;
+ }
+ }
+ renderVersion() {
+ if (this.state.userInfo["cldsVersion"]) {
+ return <Form.Control plaintext readOnly defaultValue={this.state.userInfo["cldsVersion"]} />
+ } else {
+ return;
+ }
+ }
+ render() {
+ return (
+ <ModalStyled size="lg" show={this.state.show} onHide={this.handleClose} onEntered={this.initialValues}>
+ <Modal.Header closeButton>
+ <Modal.Title>User Info</Modal.Title>
+ </Modal.Header>
+ <Modal.Body>
+ <Form.Group as={Row} controlId="userName">
+ <Form.Label column sm="3">Current User:</Form.Label>
+ <Col>{this.renderUserName()}</Col>
+ </Form.Group>
+ <Form.Group as={Row} controlId="cldsVersion">
+ <Form.Label column sm="3">CLDS Version:</Form.Label>
+ <Col>{this.renderVersion()}</Col>
+ </Form.Group>
+ <Form.Group as={Row} controlId="userPermissions">
+ <Form.Label column sm="3">User Permissions:</Form.Label>
+ <Col>
+ {this.renderReadTemplatePermission()}
+ {this.renderReadModelPermission()}
+ {this.renderReadToscaPermission()}
+ {this.renderUpdateTemplatePermission()}
+ {this.renderUpdateModelPermission()}
+ {this.renderUpdateToscaPermission()}
+ </Col>
+ </Form.Group>
+ </Modal.Body>
+ <Modal.Footer>
+ <Button variant="secondary" type="null" onClick={this.handleClose}>Cacel</Button>
+ </Modal.Footer>
+ </ModalStyled>
+ );
+ }
+}