X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ui-react%2Fsrc%2FLoopUI.js;h=ff3c4445aa136b85bf02d1d91a5bbfc5793eb0b7;hb=ac42c4b3e7161a76bfa67cae9636ea63d7bd81f8;hp=b64cfbaa384713269e7362ade7985db98d4fffe2;hpb=b54c22cf12ebf4fda895e2b21d00cfac294447d7;p=clamp.git

diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index b64cfbaa..ff3c4445 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -33,6 +33,7 @@ import LoopLogs from './components/loop_viewer/logs/LoopLogs';
 import LoopStatus from './components/loop_viewer/status/LoopStatus';
 import UserService from './api/UserService';
 import LoopCache from './api/LoopCache';
+import LoopActionService from './api/LoopActionService';
 
 import { Route } from 'react-router-dom'
 import OpenLoopModal from './components/dialogs/OpenLoop/OpenLoopModal';
@@ -44,13 +45,31 @@ import LoopService from './api/LoopService';
 import PerformAction from './components/dialogs/PerformActions';
 import RefreshStatus from './components/dialogs/RefreshStatus';
 import DeployLoop from './components/dialogs/DeployLoop';
+import Alert from 'react-bootstrap/Alert';
+
+import { Link } from 'react-router-dom';
+
+const StyledMainDiv = styled.div`
+	background-color: ${props => props.theme.backgroundColor};
+`
 
 const ProjectNameStyled = styled.a`
 	vertical-align: middle;
 	padding-left: 30px;
-	font-size: 30px;
+	font-size: 36px;
+	font-weight: bold;
+`
+
+const StyledRouterLink = styled(Link)`
+	color: ${props => props.theme.menuFontColor};
+	background-color: ${props => props.theme.backgroundColor};
+`
 
+const StyledLoginInfo = styled.a`
+	color: ${props => props.theme.menuFontColor};
+	background-color: ${props => props.theme.backgroundColor};
 `
+
 const LoopViewDivStyled = styled.div`
 	height: 100%;
 	overflow: hidden;
@@ -83,15 +102,19 @@ export default class LoopUI extends React.Component {
 	state = {
 		userName: null,
 		loopName: LoopUI.defaultLoopName,
-		loopCache: new LoopCache({})
+		loopCache: new LoopCache({}),
+		showAlert: false
 	};
 
 	constructor() {
 		super();
 		this.getUser = this.getUser.bind(this);
+		this.logout = this.logout.bind(this);
 		this.updateLoopCache = this.updateLoopCache.bind(this);
 		this.loadLoop = this.loadLoop.bind(this);
 		this.closeLoop = this.closeLoop.bind(this);
+		this.showAlert =  this.showAlert.bind(this);
+		this.disableAlert =  this.disableAlert.bind(this);
 	}
 
 	componentWillMount() {
@@ -103,6 +126,14 @@ export default class LoopUI extends React.Component {
 			this.setState({ userName: user })
 		});
 	}
+	
+	logout() {
+		UserService.logout().then(user => {
+			this.setState({ userName: user });
+			window.location.reload();
+		});
+		
+	}
 
 	renderMenuNavBar() {
 		return (
@@ -113,7 +144,9 @@ export default class LoopUI extends React.Component {
 	renderUserLoggedNavBar() {
 		return (
 			<Navbar.Text>
-				Signed in as: <a href="/login">{this.state.userName}</a>
+			<StyledLoginInfo>Signed in as: </StyledLoginInfo>
+				<StyledRouterLink to="/userInfo">{this.state.userName}</StyledRouterLink>
+				<StyledRouterLink to="/logout/"> (logout)</StyledRouterLink>
 			</Navbar.Text>
 		);
 	}
@@ -127,10 +160,19 @@ export default class LoopUI extends React.Component {
 		);
 	}
 
+	renderAlertBar() {
+		return (
+				<Alert variant="danger" show={this.state.showAlert} onClose={this.disableAlert} dismissible>
+					{this.state.showMessage}
+				</Alert>
+		);
+	}
+
 	renderNavBar() {
 		return (
-			<Navbar expand="lg">
+			<Navbar >
 				{this.renderLogoNavBar()}
+				<Navbar.Toggle aria-controls="responsive-navbar-nav" />
 				{this.renderMenuNavBar()}
 				{this.renderUserLoggedNavBar()}
 			</Navbar>
@@ -170,14 +212,30 @@ export default class LoopUI extends React.Component {
 	}
 
 	updateLoopCache(loopJson) {
-		this.setState({ loopCache: new LoopCache(loopJson), loopName: this.state.loopCache.getLoopName() });
+		this.setState({ loopCache: new LoopCache(loopJson) });
+		this.setState({ loopName: this.state.loopCache.getLoopName() });
 		console.info(this.state.loopName+" loop loaded successfully");
 	}
 
+	showAlert(message) {
+		this.setState ({ showAlert: true, showMessage:message });
+	}
+
+	disableAlert() {
+		this.setState ({ showAlert: false });
+	}
+
 	loadLoop(loopName) {
 		LoopService.getLoop(loopName).then(loop => {
 			console.debug("Updating loopCache");
-			this.updateLoopCache(loop);
+			LoopActionService.refreshStatus(loopName).then(data => {
+				this.updateLoopCache(data);
+				this.props.history.push('/');
+			})
+			.catch(error => {
+				this.updateLoopCache(loop);
+				this.props.history.push('/');
+			});
 		});
 	}
 
@@ -185,28 +243,30 @@ export default class LoopUI extends React.Component {
 		this.setState({ loopCache: new LoopCache({}), loopName: LoopUI.defaultLoopName });
 		this.props.history.push('/');
 	}
-	
- render() {
+
+	render() {
 		return (
-				<div id="main_div">
+				<StyledMainDiv id="main_div">
 				<Route path="/operationalPolicyModal"
-					render={(routeProps) => (<OperationalPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
+					render={(routeProps) => (<OperationalPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop} showAlert={this.showAlert}/>)} />
 				<Route path="/configurationPolicyModal/:componentName" render={(routeProps) => (<ConfigurationPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
 				<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={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 />
+				<Route path="/submit" render={(routeProps) => (<PerformAction {...routeProps} loopAction="submit" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
+				<Route path="/stop" render={(routeProps) => (<PerformAction {...routeProps} loopAction="stop" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
+				<Route path="/restart" render={(routeProps) => (<PerformAction {...routeProps} loopAction="restart" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
+				<Route path="/delete" render={(routeProps) => (<PerformAction {...routeProps} loopAction="delete" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
+				<Route path="/undeploy" render={(routeProps) => (<PerformAction {...routeProps} loopAction="undeploy" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
+				<Route path="/deploy" render={(routeProps) => (<DeployLoop {...routeProps} loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
+				<Route path="/refreshStatus" render={(routeProps) => (<RefreshStatus {...routeProps} loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
+				<Route path="/logout" render={this.logout} />
+				<GlobalClampStyle />
+					{this.renderAlertBar()}
 					{this.renderNavBar()}
 					{this.renderLoopViewer()}
-				</div>
+				</StyledMainDiv>
 		);
 	}
 }