diff options
author | xuegao <xg353y@intl.att.com> | 2019-07-15 15:16:18 +0200 |
---|---|---|
committer | xuegao <xg353y@intl.att.com> | 2019-07-15 15:43:11 +0200 |
commit | f248df69de034f43e04d8dbcf0ad836850cb9654 (patch) | |
tree | 8d4cc5703d0aca5c00506e8d769e16f9e09b72ea | |
parent | e44fdb1905fae612b12b56886af8f387e516e485 (diff) |
Rework the Open CL window
Rework the Open CL window of the Clamp UI.
Issue-ID: CLAMP-420
Change-Id: Ic7e1e6add4067bc2ee94bd758d76e15397d941df
Signed-off-by: xuegao <xg353y@intl.att.com>
-rw-r--r-- | ui-react/package.json | 3 | ||||
-rw-r--r-- | ui-react/src/api/LoopCache.js | 12 | ||||
-rw-r--r-- | ui-react/src/api/LoopService.js | 76 | ||||
-rw-r--r-- | ui-react/src/components/dialogs/LoopModal.js | 110 | ||||
-rw-r--r-- | ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js | 4 | ||||
-rw-r--r-- | ui-react/src/components/loop_viewer/logs/ClosedLoopLogs.js | 1 | ||||
-rw-r--r-- | ui-react/src/components/menu/MenuBar.js | 3 | ||||
-rw-r--r-- | ui-react/src/index.js | 3 |
8 files changed, 199 insertions, 13 deletions
diff --git a/ui-react/package.json b/ui-react/package.json index c6369a3a..1b98d0f1 100644 --- a/ui-react/package.json +++ b/ui-react/package.json @@ -20,7 +20,8 @@ "react-bootstrap": "1.0.0-beta.9", "bootstrap-css-only": "4.3.1", "styled-components": "4.3.2", - "react-router-dom": "5.0.1" + "react-router-dom": "5.0.1", + "react-select": "3.0.4" }, "browserslist": [ ">0.2%", diff --git a/ui-react/src/api/LoopCache.js b/ui-react/src/api/LoopCache.js index 80f02f02..d44b5cfd 100644 --- a/ui-react/src/api/LoopCache.js +++ b/ui-react/src/api/LoopCache.js @@ -18,7 +18,7 @@ * limitations under the License. * ============LICENSE_END============================================ * =================================================================== - * + * */ class LoopCache { @@ -30,9 +30,9 @@ class LoopCache { } updateMsProperties(type, newMsProperties) { - if (newMsProperties["name"] == type) { + if (newMsProperties["name"] === type) { for (var policy in this.loopJsonCache["microServicePolicies"]) { - if (this.loopJsonCache["microServicePolicies"][policy]["name"] == type) { + if (this.loopJsonCache["microServicePolicies"][policy]["name"] === type) { this.loopJsonCache["microServicePolicies"][policy] = newMsProperties; } } @@ -70,7 +70,7 @@ class LoopCache { getMsJson(type) { var msProperties = this.loopJsonCache["microServicePolicies"]; for (var policy in msProperties) { - if (msProperties[policy]["name"] == type) { + if (msProperties[policy]["name"] === type) { return JSON.parse(JSON.stringify(msProperties[policy])); } } @@ -80,7 +80,7 @@ class LoopCache { getMsProperty(type) { var msProperties = this.loopJsonCache["microServicePolicies"]; for (var policy in msProperties) { - if (msProperties[policy]["name"] == type) { + if (msProperties[policy]["name"] === type) { if (msProperties[policy]["properties"] !== null && msProperties[policy]["properties"] !== undefined) { return JSON.parse(JSON.stringify(msProperties[policy]["properties"])); } @@ -92,7 +92,7 @@ class LoopCache { getMsUI(type) { var msProperties = this.loopJsonCache["microServicePolicies"]; for (var policy in msProperties) { - if (msProperties[policy]["name"] == type) { + if (msProperties[policy]["name"] === type) { return JSON.parse(JSON.stringify(msProperties[policy]["jsonRepresentation"])); } } diff --git a/ui-react/src/api/LoopService.js b/ui-react/src/api/LoopService.js new file mode 100644 index 00000000..f59f4576 --- /dev/null +++ b/ui-react/src/api/LoopService.js @@ -0,0 +1,76 @@ +/*- + * ============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============================================ + * =================================================================== + * + */ + +export default class LoopService { + static getLoopNames() { + const url = '/restservices/clds/v2/loop/getAllNames'; + const options = { + method: 'GET' + }; + return fetch(url,options) + .then(function (response) { + if (response.ok) { + console.log("GetLoopNames response received: ", response.status); + return response.json(); + } else { + let errorMsg = "GetLoopNames failed with status code: " + response.status; + console.error(errorMsg); + return Promise.reject(errorMsg); + } + }) + .then(function (data) { + return data; + }) + .catch(function(error) { + console.error("GetLoopNames error received",error); + return Promise.reject(error); + }); + } + + static getLoop(loopName) { + const url = '/restservices/clds/v2/loop/' + loopName; + const options = { + method: 'GET', + headers: { + "Content-Type": "application/json" + } + }; + return fetch(url,options) + .then(function (response) { + if (response.ok) { + console.log("GetLoop response received: ", response.status); + return response.json(); + } else { + let errorMsg = "GetLoop failed with status code: " + response.status; + console.error(errorMsg); + return Promise.reject(errorMsg); + } + }) + .then(function (data) { + return data; + }) + .catch(function(error) { + console.error("GetLoop error received",error); + return Promise.reject(error); + }); + } +} diff --git a/ui-react/src/components/dialogs/LoopModal.js b/ui-react/src/components/dialogs/LoopModal.js new file mode 100644 index 00000000..6dc04d19 --- /dev/null +++ b/ui-react/src/components/dialogs/LoopModal.js @@ -0,0 +1,110 @@ +/*- + * ============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 Select from 'react-select'; +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 FormCheck from 'react-bootstrap/FormCheck' +import styled from 'styled-components'; +import LoopService from '../../api/LoopService'; +import LoopCache from '../../api/LoopCache'; + +const ModalStyled = styled(Modal)` + background-color: transparent; +` +const CheckBoxStyled = styled(FormCheck.Input)` + margin-left:3rem; +` + +export default class LoopModal extends React.Component { + constructor(props, context) { + super(props, context); + + this.getLoopNames = this.getLoopNames.bind(this); + this.openModel = this.openModel.bind(this); + this.handleClose = this.handleClose.bind(this); + this.handleDropdownListChange = this.handleDropdownListChange.bind(this); + this.state = { + show: true, + chosenLoopName: '', + loopNames:[] + }; + } + componentDidMount() { + this.getLoopNames(); + } + handleClose() { + this.setState({ show: false }); + this.props.history.push('/'); + } + handleDropdownListChange(e) { + this.setState({ chosenLoopName: e.value}); + } + getLoopNames() { + LoopService.getLoopNames().then(loopNames => { + const loopOptions = loopNames.map((loopName) => { return {label: loopName, value: loopName}}); + this.setState({loopNames:loopOptions}) + }); + } + openModel() { + this.setState({ show: false }); + this.props.history.push('/'); + // Open selected model + console.log("Loop " + this.state.chosenLoopName + " is chosen"); + LoopService.getLoop(this.state.chosenLoopName).then(loop => { + console.log("Initialize the loop cache"); + new LoopCache(loop); + }); + } + render() { + return ( + <ModalStyled size="lg" show={this.state.show} onHide={this.handleClose}> + <Modal.Header closeButton> + <Modal.Title>Open Model</Modal.Title> + </Modal.Header> + <Modal.Body> + <Form.Group as={Row} controlId="formPlaintextEmail"> + <Form.Label column sm="2">Model Name</Form.Label> + <Col sm="10"> + <Select onChange={this.handleDropdownListChange} options={ this.state.loopNames } /> + </Col> + </Form.Group> + <Form.Group controlId="formBasicChecbox"> + <Form.Check> + <FormCheck.Label>Read Only</FormCheck.Label> + <CheckBoxStyled type="checkbox" /> + </Form.Check> + </Form.Group> + </Modal.Body> + <Modal.Footer> + <Button variant="secondary" type="null" onClick={this.handleClose}>Cacel</Button> + <Button variant="primary" type="submit" onClick={this.openModel}>OK</Button> + </Modal.Footer> + </ModalStyled> + + ); + } +} diff --git a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js index 7d339313..fd53300d 100644 --- a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js +++ b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js @@ -60,7 +60,7 @@ export default class OperationalPolicyModal extends React.Component { this.allPolicies = LOOP_CACHE.getOperationalPolicyProperty(); } // Provision all policies ID first - if (this.policyIds.length == 0 && this.allPolicies['operational_policy'] != undefined) { + if (this.policyIds.length === 0 && this.allPolicies['operational_policy'] !== undefined) { for (let i = 0; i < this.allPolicies['operational_policy']['policies'].length; i++) { this.policyIds.push(this.allPolicies['operational_policy']['policies'][i]['id']); @@ -536,7 +536,7 @@ export default class OperationalPolicyModal extends React.Component { </span> </div> </div> - + </Modal.Body> <Modal.Footer> <Button variant="secondary" onClick={this.handleClose}> diff --git a/ui-react/src/components/loop_viewer/logs/ClosedLoopLogs.js b/ui-react/src/components/loop_viewer/logs/ClosedLoopLogs.js index 709cec96..ef7a3aef 100644 --- a/ui-react/src/components/loop_viewer/logs/ClosedLoopLogs.js +++ b/ui-react/src/components/loop_viewer/logs/ClosedLoopLogs.js @@ -22,7 +22,6 @@ */ import React from 'react'; import Table from 'react-bootstrap/Table'; -import './ClosedLoopLogs.css'; export default class ClosedLoopViewLogs extends React.Component { render() { diff --git a/ui-react/src/components/menu/MenuBar.js b/ui-react/src/components/menu/MenuBar.js index 85d32c53..1a7c5d4e 100644 --- a/ui-react/src/components/menu/MenuBar.js +++ b/ui-react/src/components/menu/MenuBar.js @@ -40,7 +40,7 @@ export default class MenuBar extends React.Component { return ( <Navbar.Collapse id="basic-navbar-nav" className="justify-content-center"> <NavDropdown title="Closed Loop" id="basic-nav-dropdown"> - <StyledNavDropdownItem href="#action/3.1">Open CL</StyledNavDropdownItem> + <StyledNavDropdownItem href="/openLoop">Open CL</StyledNavDropdownItem> <StyledNavDropdownItem href="#action/3.2">Properties CL</StyledNavDropdownItem> <StyledNavDropdownItem href="#action/3.3">Close Model</StyledNavDropdownItem> </NavDropdown> @@ -64,4 +64,3 @@ export default class MenuBar extends React.Component { ); } } - diff --git a/ui-react/src/index.js b/ui-react/src/index.js index 1b2f2f59..eed3935e 100644 --- a/ui-react/src/index.js +++ b/ui-react/src/index.js @@ -24,13 +24,14 @@ import React from 'react'; import ReactDOM from 'react-dom'; import OnapClamp from './OnapClamp'; import { Route, BrowserRouter } from 'react-router-dom' - +import LoopModal from './components/dialogs/LoopModal'; import OperationalPolicyModal from './components/dialogs/OperationalPolicy/OperationalPolicyModal'; const routing = ( <BrowserRouter > <OnapClamp /> <Route path="/operationalPolicyModal" render={() => <OperationalPolicyModal />} /> + <Route path="/openLoop" component={ LoopModal } /> </BrowserRouter> ); |