Fix bug in operational policy

[clamp.git] / ui-react / src / components / menu / MenuBar.js

diff --git a/ui-react/src/components/menu/MenuBar.js b/ui-react/src/components/menu/MenuBar.js
index bbfa82a..92380ab 100644 (file)
--- a/ui-react/src/components/menu/MenuBar.js
+++ b/ui-react/src/components/menu/MenuBar.js
@@ -24,7 +24,7 @@ import React from 'react';
 import Nav from 'react-bootstrap/Nav';
 import Navbar from 'react-bootstrap/Navbar';
 import NavDropdown from 'react-bootstrap/NavDropdown';
-import LoopUI from '../../LoopUI';
+import OnapConstants from '../../utils/OnapConstants';
 import 'bootstrap-css-only/css/bootstrap.min.css';
 import styled from 'styled-components';
 import { Link } from 'react-router-dom';
@@ -76,7 +76,7 @@ export default class MenuBar extends React.Component {
        };
 
        componentWillReceiveProps(newProps) {
-               if (newProps.loopName !== LoopUI.defaultLoopName) {
+               if (newProps.loopName !== OnapConstants.defaultLoopName) {
                        this.setState({ disabled: false });
                } else {
                        this.setState({ disabled: true });
@@ -87,25 +87,30 @@ export default class MenuBar extends React.Component {
                return (
 
                                <Navbar.Collapse>
-                                       <StyledNavDropdown title="Template">
-                                                       <NavDropdown.Item as={StyledLink} to="/viewToscaModal">View Tosca Model</NavDropdown.Item>
+                                       <StyledNavDropdown title="Loop Templates">
+                                                       <NavDropdown.Item as={StyledLink} to="/ViewLoopTemplatesModal">View All Templates</NavDropdown.Item>
                                        </StyledNavDropdown>
-                                       <StyledNavDropdown title="Closed Loop">
-                                                       <NavDropdown.Item as={StyledLink} to="/openLoop">Open CL</NavDropdown.Item>
-                                                       <NavDropdown.Item as={StyledLink} to="/loopProperties" disabled={this.state.disabled}>Properties CL</NavDropdown.Item>
-                                                       <NavDropdown.Item as={StyledLink} to="/closeLoop" disabled={this.state.disabled}>Close Model</NavDropdown.Item>
-                                       </StyledNavDropdown>
-                                       <StyledNavDropdown title="Manage">
-                                                       <NavDropdown.Item as={StyledLink} to="/submit" disabled={this.state.disabled}>Submit</NavDropdown.Item>
-                                                       <NavDropdown.Item as={StyledLink} to="/stop" disabled={this.state.disabled}>Stop</NavDropdown.Item>
-                                                       <NavDropdown.Item as={StyledLink} to="/restart" disabled={this.state.disabled}>Restart</NavDropdown.Item>
-                                                       <NavDropdown.Item as={StyledLink} to="/delete" disabled={this.state.disabled}>Delete</NavDropdown.Item>
-                                                       <NavDropdown.Item as={StyledLink} to="/deploy" disabled={this.state.disabled}>Deploy</NavDropdown.Item>
-                                                       <NavDropdown.Item as={StyledLink} to="/undeploy" disabled={this.state.disabled}>UnDeploy</NavDropdown.Item>
-                                       </StyledNavDropdown>
-                                       <StyledNavDropdown title="View">
+                                       <StyledNavDropdown title="Policy Models">
+                           <NavDropdown.Item as={StyledLink} to="/uploadToscaPolicyModal">Upload Tosca Model</NavDropdown.Item>
+                               <NavDropdown.Item as={StyledLink} to="/viewToscaPolicyModal">View Tosca Models</NavDropdown.Item>
+                    </StyledNavDropdown>
+                                       <StyledNavDropdown title="Loop Instance">
+                                               <NavDropdown.Item as={StyledLink} to="/createLoop">Create</NavDropdown.Item>
+                                                       <NavDropdown.Item as={StyledLink} to="/openLoop">Open</NavDropdown.Item>
+                                                       <NavDropdown.Item as={StyledLink} to="/loopProperties" disabled={this.state.disabled}>Properties</NavDropdown.Item>
+                                                       <NavDropdown.Item as={StyledLink} to="/closeLoop" disabled={this.state.disabled}>Close</NavDropdown.Item>
+                                                       <NavDropdown.Item as={StyledLink} to="/modifyLoop" disabled={this.state.disabled}>Modify</NavDropdown.Item>
                                                        <NavDropdown.Item as={StyledLink} to="/refreshStatus" disabled={this.state.disabled}>Refresh Status</NavDropdown.Item>
                                        </StyledNavDropdown>
+                                       <StyledNavDropdown title="Loop Operations">
+                                                       <NavDropdown.Item as={StyledLink} to="/submit" disabled={this.state.disabled}>Create and deploy to Policy Engine(SUBMIT)</NavDropdown.Item>
+                                                       <NavDropdown.Item as={StyledLink} to="/stop" disabled={this.state.disabled}>Undeploy from Policy Engine (STOP)</NavDropdown.Item>
+                                                       <NavDropdown.Item as={StyledLink} to="/restart" disabled={this.state.disabled}>ReDeploy to Policy Engine (RESTART)</NavDropdown.Item>
+                                                       <NavDropdown.Item as={StyledLink} to="/delete" disabled={this.state.disabled}>Delete loop instance (DELETE)</NavDropdown.Item>
+                                                       <NavDropdown.Divider />
+                                                       <NavDropdown.Item as={StyledLink} to="/deploy" disabled={this.state.disabled}>Deploy to DCAE (DEPLOY)</NavDropdown.Item>
+                                                       <NavDropdown.Item as={StyledLink} to="/undeploy" disabled={this.state.disabled}>UnDeploy to DCAE (UNDEPLOY)</NavDropdown.Item>
+                                       </StyledNavDropdown>
                                        <StyledNavDropdown title="Help">
                                                        <StyledNavLink href="https://wiki.onap.org/" target="_blank">Wiki</StyledNavLink>
                                                        <StyledNavLink href="mailto:onap-discuss@lists.onap.org?subject=CLAMP&body=Please send us suggestions or feature enhancements or defect. If possible, please send us the steps to replicate any defect.">Contact Us</StyledNavLink>