Rework deploy action and close model

Rework the deploy action and the close model feature.

Issue-ID: CLAMP-445, CLAMP-451
Change-Id: Ic122a584b676d50b9bddcac6e5553266b2281a01
Signed-off-by: xuegao <xg353y@intl.att.com>

8 files changed, 175 insertions, 26 deletions

diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index c7080a2b..5b8283f8 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -34,7 +34,7 @@ import LoopStatus from './components/loop_viewer/status/LoopStatus';
 import UserService from './api/UserService';
 import LoopCache from './api/LoopCache';
 
-import { Route, Redirect } from 'react-router-dom'
+import { Route } 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';
@@ -43,6 +43,7 @@ import UserInfo from './components/dialogs/UserInfo';
 import LoopService from './api/LoopService';
 import PerformAction from './components/menu/PerformActions';
 import RefreshStatus from './components/menu/RefreshStatus';
+import DeployLoop from './components/menu/DeployLoop';
 
 const ProjectNameStyled = styled.a`
 	vertical-align: middle;
@@ -90,6 +91,7 @@ export default class LoopUI extends React.Component {
 		this.getUser = this.getUser.bind(this);
 		this.updateLoopCache = this.updateLoopCache.bind(this);
 		this.loadLoop = this.loadLoop.bind(this);
+		this.closeLoop = this.closeLoop.bind(this);
 	}
 
 	componentWillMount() {
@@ -104,7 +106,7 @@ export default class LoopUI extends React.Component {
 
 	renderMenuNavBar() {
 		return (
-			<MenuBar/>
+			<MenuBar loopName={this.state.loopName}/>
 		);
 	}
 
@@ -168,8 +170,7 @@ export default class LoopUI extends React.Component {
 	}
 
 	updateLoopCache(loopJson) {
-		this.setState({ loopCache: new LoopCache(loopJson) });
-		this.setState({ loopName: this.state.loopCache.getLoopName() });
+		this.setState({ loopCache: new LoopCache(loopJson), loopName: this.state.loopCache.getLoopName() });
 		console.info(this.state.loopName+" loop loaded successfully");
 	}
 
@@ -180,7 +181,11 @@ export default class LoopUI extends React.Component {
 		});
 	}
 
-	render() {
+	closeLoop() {
+		this.setState({ loopCache: new LoopCache({}), loopName: LoopUI.defaultLoopName });
+		this.props.history.push('/');
+	}
+ render() {
 		return (
 				<div id="main_div">
 				<Route path="/operationalPolicyModal"
@@ -189,12 +194,13 @@ export default class LoopUI extends React.Component {
 				<Route path="/openLoop" render={(routeProps) => (<OpenLoopModal {...routeProps} loadLoopFunction={this.loadLoop} />)} />
 				<Route path="/loopProperties" render={(routeProps) => (<LoopProperties {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
 				<Route path="/userInfo" render={(routeProps) => (<UserInfo {...routeProps} />)} />
-				<Route path="/closeLoop" render={(routeProps) => (<Redirect to='/'/>)} />
+				<Route path="/closeLoop" render={this.closeLoop} />
 				<Route path="/submit" render={(routeProps) => (<PerformAction {...routeProps} loopAction="submit" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache}/>)} />
 				<Route path="/stop" render={(routeProps) => (<PerformAction {...routeProps} loopAction="stop" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache}/>)} />
 				<Route path="/restart" render={(routeProps) => (<PerformAction {...routeProps} loopAction="restart" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache}/>)} />
 				<Route path="/delete" render={(routeProps) => (<PerformAction {...routeProps} loopAction="delete" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache}/>)} />
 				<Route path="/undeploy" render={(routeProps) => (<PerformAction {...routeProps} loopAction="undeploy" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache}/>)} />
+				<Route path="/deploy" render={(routeProps) => (<DeployLoop {...routeProps} loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache}/>)} />
 				<Route path="/refreshStatus" render={(routeProps) => (<RefreshStatus {...routeProps} loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache}/>)} />
 					<GlobalClampStyle />
 					{this.renderNavBar()}
diff --git a/ui-react/src/React-Spinner.jpg b/ui-react/src/React-Spinner.jpg
deleted file mode 100644
index 22768976..00000000
--- a/ui-react/src/React-Spinner.jpg
+++ /dev/null
diff --git a/ui-react/src/components/dialogs/DeployLoop.js b/ui-react/src/components/dialogs/DeployLoop.js
new file mode 100644
index 00000000..2ec395d2
--- /dev/null
+++ b/ui-react/src/components/dialogs/DeployLoop.js
@@ -0,0 +1,128 @@
+/*-
+ * ============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 LoopActionService from '../../api/LoopActionService';
+import LoopService from '../../api/LoopService';
+import Button from 'react-bootstrap/Button';
+import Modal from 'react-bootstrap/Modal';
+import Form from 'react-bootstrap/Form';
+import styled from 'styled-components';
+
+const ModalStyled = styled(Modal)`
+	background-color: transparent;
+`
+const FormStyled = styled(Form.Group)`
+	padding: .25rem 1.5rem;
+`
+export default class DeployLoop extends React.Component {
+	state = {
+		loopCache: this.props.loopCache,
+		temporaryPropertiesJson: JSON.parse(JSON.stringify(this.props.loopCache.getGlobalProperties())),
+		show: true
+	};
+	constructor(props, context) {
+		super(props, context);
+
+		this.handleSave = this.handleSave.bind(this);
+		this.handleClose = this.handleClose.bind(this);
+		this.handleChange = this.handleChange.bind(this);
+		this.refreshStatus = this.refreshStatus.bind(this);
+		this.renderDeployParam = this.renderDeployParam.bind(this);
+	}
+	componentWillReceiveProps(newProps) {
+		this.setState({
+			loopName: newProps.loopCache.getLoopName(),
+			show: true
+		});
+	}
+	handleClose(){
+		this.props.history.push('/');
+	}
+	handleSave(e) {
+		const loopName = this.props.loopCache.getLoopName();
+		// save the global propserties
+		LoopService.updateGlobalProperties(loopName, this.state.temporaryPropertiesJson).then(resp => {
+			this.setState({ show: false });
+
+			console.log("Perform action: deploy");
+			LoopActionService.performAction(loopName, "deploy").then(pars => {
+				alert("Action deploy successfully performed");
+				// refresh status and update loop logs
+				this.refreshStatus(loopName);
+			})
+			.catch(error => {
+				alert("Action deploy failed");
+				// refresh status and update loop logs
+				this.refreshStatus(loopName);
+			});
+		});
+	}
+
+	refreshStatus(loopName) {
+		LoopActionService.refreshStatus(loopName).then(data => {
+			this.props.updateLoopFunction(data);
+			this.props.history.push('/');
+		})
+		.catch(error => {
+			alert("Refresh status failed");
+			this.props.history.push('/');
+		});
+	}
+	handleChange(event) {
+		let deploymentParam = this.state.temporaryPropertiesJson["dcaeDeployParameters"];
+		deploymentParam[event.target.name] = event.target.value;
+
+		this.setState({temporaryPropertiesJson:{dcaeDeployParameters: deploymentParam}});
+	}
+	renderDeployParam() {
+		if (typeof (this.state.temporaryPropertiesJson) === "undefined") {
+			 return "";
+		}
+
+		const deployJson = this.state.temporaryPropertiesJson["dcaeDeployParameters"];
+		var indents = [];
+		Object.keys(deployJson).map((item,key) =>
+		indents.push(<FormStyled>
+				<Form.Label>{item}</Form.Label>
+				<Form.Control type="text" name={item} onChange={this.handleChange} defaultValue={deployJson[item]}></Form.Control>
+			</FormStyled>));
+
+			return indents;
+	}
+
+
+	render() {
+		return (
+					<ModalStyled size="lg" show={this.state.show} onHide={this.handleClose} >
+						<Modal.Header closeButton>
+							<Modal.Title>Deployment parameters</Modal.Title>
+						</Modal.Header>
+						{this.renderDeployParam()}
+						<Modal.Footer>
+							<Button variant="secondary" type="null" onClick={this.handleClose}>Cancel</Button>
+							<Button variant="primary" type="submit" onClick={this.handleSave}>Deploy</Button>
+						</Modal.Footer>
+					</ModalStyled>
+		);
+	}
+}
diff --git a/ui-react/src/components/dialogs/LoopProperties.js b/ui-react/src/components/dialogs/LoopProperties.js
index dac77655..fa82a7e4 100644
--- a/ui-react/src/components/dialogs/LoopProperties.js
+++ b/ui-react/src/components/dialogs/LoopProperties.js
@@ -30,7 +30,6 @@ import LoopService from '../../api/LoopService';
 const ModalStyled = styled(Modal)`
 	background-color: transparent;
 `
-
 export default class LoopProperties extends React.Component {
 
 	state = {
@@ -45,7 +44,7 @@ export default class LoopProperties extends React.Component {
 		this.handleClose = this.handleClose.bind(this);
 		this.handleSave = this.handleSave.bind(this);
 		this.handleChange = this.handleChange.bind(this);
-		
+
 		this.renderDcaeParameters = this.renderDcaeParameters.bind(this);
 		this.renderAllParameters = this.renderAllParameters.bind(this);
 		this.getDcaeParameters = this.getDcaeParameters.bind(this);
@@ -55,7 +54,7 @@ export default class LoopProperties extends React.Component {
 		this.setState({
 			loopCache: newProps.loopCache,
 			temporaryPropertiesJson: JSON.parse(JSON.stringify(newProps.loopCache.getGlobalProperties())),
-			
+
 		});
 	}
 
@@ -90,7 +89,7 @@ export default class LoopProperties extends React.Component {
 		} else {
 			return "";
 		}
-		
+
 	}
 
 	renderDcaeParameters() {
diff --git a/ui-react/src/components/menu/PerformActions.js b/ui-react/src/components/dialogs/PerformActions.js
index 9c34e141..9c34e141 100644
--- a/ui-react/src/components/menu/PerformActions.js
+++ b/ui-react/src/components/dialogs/PerformActions.js
diff --git a/ui-react/src/components/menu/RefreshStatus.js b/ui-react/src/components/dialogs/RefreshStatus.js
index cf08655e..cf08655e 100644
--- a/ui-react/src/components/menu/RefreshStatus.js
+++ b/ui-react/src/components/dialogs/RefreshStatus.js
diff --git a/ui-react/src/components/loop_viewer/svg/LoopSvg.js b/ui-react/src/components/loop_viewer/svg/LoopSvg.js
index 3ac2f31f..1b1e2428 100644
--- a/ui-react/src/components/loop_viewer/svg/LoopSvg.js
+++ b/ui-react/src/components/loop_viewer/svg/LoopSvg.js
@@ -61,13 +61,14 @@ class LoopViewSvg extends React.Component {
 		return this.state.svgContent !== nextState.svgContent;
 	}
 
-	componentWillReceiveProps(newProps) {
-		this.setState({
-			loopCache: newProps.loopCache,
-			componentModalMapping: LoopComponentConverter.buildMapOfComponents(newProps.loopCache),
-
-		});
-		this.getSvg(newProps.loopCache.getLoopName());
+	componentWillReceiveProps(newProps) {	
+		if (this.state.loopCache !== newProps.loopCache) {
+			this.setState({
+				loopCache: newProps.loopCache,
+				componentModalMapping: LoopComponentConverter.buildMapOfComponents(newProps.loopCache),
+			});
+			this.getSvg(newProps.loopCache.getLoopName());
+		}
 	}
 
 	getSvg(loopName) {
@@ -79,6 +80,8 @@ class LoopViewSvg extends React.Component {
 					this.setState({ svgContent: LoopViewSvg.emptySvg })
 				}
 			});
+		} else {
+			this.setState({ svgContent: LoopViewSvg.emptySvg })
 		}
 	}
 
diff --git a/ui-react/src/components/menu/MenuBar.js b/ui-react/src/components/menu/MenuBar.js
index 5022152e..121787ff 100644
--- a/ui-react/src/components/menu/MenuBar.js
+++ b/ui-react/src/components/menu/MenuBar.js
@@ -24,6 +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 'bootstrap-css-only/css/bootstrap.min.css';
 import styled from 'styled-components';
 import { Link } from 'react-router-dom'
@@ -56,25 +57,37 @@ const StyledNavLink = styled(Nav.Link)`
 	}
 `;
 export default class MenuBar extends React.Component {
+	state = {
+		loopName: this.props.loopName,
+		disabled: true
+	};
+
+	componentWillReceiveProps(newProps) {
+		if (newProps.loopName !== LoopUI.defaultLoopName) {
+			this.setState({ disabled: false });
+		} else {
+			this.setState({ disabled: true });
+		}
+	}
 
 	render () {
 		return (
 				<Navbar.Collapse>
 					<NavDropdown title="Closed Loop">
 							<NavDropdown.Item as={StyledLink} to="/openLoop">Open CL</NavDropdown.Item>
-							<NavDropdown.Item as={StyledLink} to="/loopProperties">Properties CL</NavDropdown.Item>
-							<NavDropdown.Item as={StyledLink} to="/closeLoop">Close Model</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>
 					</NavDropdown>
 					<NavDropdown title="Manage">
-							<NavDropdown.Item as={StyledLink} to="/submit">Submit</NavDropdown.Item>
-							<NavDropdown.Item as={StyledLink} to="/stop">Stop</NavDropdown.Item>
-							<NavDropdown.Item as={StyledLink} to="/restart">Restart</NavDropdown.Item>
-							<NavDropdown.Item as={StyledLink} to="/delete">Delete</NavDropdown.Item>
-							<NavDropdown.Item as={StyledLink} to="/deploy">Deploy</NavDropdown.Item>
-							<NavDropdown.Item as={StyledLink} to="/undeploy">UnDeploy</NavDropdown.Item>
+							<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>
 					</NavDropdown>
 					<NavDropdown title="View">
-							<NavDropdown.Item as={StyledLink} to="/refreshStatus">Refresh Status</NavDropdown.Item>
+							<NavDropdown.Item as={StyledLink} to="/refreshStatus" disabled={this.state.disabled}>Refresh Status</NavDropdown.Item>
 					</NavDropdown>
 					<NavDropdown title="Help">
 							<StyledNavLink href="https://wiki.onap.org/" target="_blank">Wiki</StyledNavLink>