X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ui-react%2Fsrc%2FLoopUI.js;h=bc3f2355edd414c696a47e0f0fe47e025363c73e;hb=425d25cd4ffbdae99722e6d8d38a41f2b2b365b1;hp=9389ad656df0a28ba10e62597c13872287cb65a5;hpb=d0d65631dfda6b43339e5c3dd1f1c336040d6672;p=clamp.git
diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index 9389ad65..bc3f2355 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -27,23 +27,33 @@ import MenuBar from './components/menu/MenuBar';
import Navbar from 'react-bootstrap/Navbar';
import logo from './logo.png';
import { GlobalClampStyle } from './theme/globalStyle.js';
+import OnapConstants from './utils/OnapConstants';
import LoopSvg from './components/loop_viewer/svg/LoopSvg';
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';
+import CreateLoopModal from './components/dialogs/Loop/CreateLoopModal';
+import OpenLoopModal from './components/dialogs/Loop/OpenLoopModal';
+import ModifyLoopModal from './components/dialogs/Loop/ModifyLoopModal';
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';
+import PolicyModal from './components/dialogs/Policy/PolicyModal';
+import LoopPropertiesModal from './components/dialogs/Loop/LoopPropertiesModal';
+import UserInfoModal from './components/dialogs/UserInfoModal';
import LoopService from './api/LoopService';
+import UploadToscaPolicyModal from './components/dialogs/Tosca/UploadToscaPolicyModal';
+import ViewToscaPolicyModal from './components/dialogs/Tosca/ViewToscaPolicyModal';
+import ViewLoopTemplatesModal from './components/dialogs/Tosca/ViewLoopTemplatesModal';
+import ManageDictionaries from './components/dialogs/ManageDictionaries/ManageDictionaries';
import PerformAction from './components/dialogs/PerformActions';
import RefreshStatus from './components/dialogs/RefreshStatus';
-import DeployLoop from './components/dialogs/DeployLoop';
+import DeployLoopModal from './components/dialogs/Loop/DeployLoopModal';
+import Alert from 'react-bootstrap/Alert';
import { Link } from 'react-router-dom';
@@ -95,20 +105,22 @@ const LoopViewBodyDivStyled = styled.div`
export default class LoopUI extends React.Component {
- static defaultLoopName="Empty (NO loop loaded yet)";
-
state = {
userName: null,
- loopName: LoopUI.defaultLoopName,
- loopCache: new LoopCache({})
+ loopName: OnapConstants.defaultLoopName,
+ 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() {
@@ -120,6 +132,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 (
@@ -146,6 +166,14 @@ export default class LoopUI extends React.Component {
);
}
+ renderAlertBar() {
+ return (
+
+ {this.state.showMessage}
+
+ );
+ }
+
renderNavBar() {
return (
@@ -190,40 +218,66 @@ 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('/');
+ });
});
}
closeLoop() {
- this.setState({ loopCache: new LoopCache({}), loopName: LoopUI.defaultLoopName });
+ this.setState({ loopCache: new LoopCache({}), loopName: OnapConstants.defaultLoopName });
this.props.history.push('/');
}
-
- render() {
+
+ render() {
return (
+ ()} />
+ ()} />
+ ()} />
+ ()} />
()} />
- ()} />
+ render={(routeProps) => ()} />
+ ()} />
+ ()} />
+ ()} />
()} />
- ()} />
- ()} />
+ ()} />
+ ()} />
+
+ ()} />
- ()} />
- ()} />
- ()} />
- ()} />
- ()} />
- ()} />
- ()} />
-
+ ()} />
+ ()} />
+ ()} />
+ ()} />
+ ()} />
+ ()} />
+ ()} />
+
+
+ {this.renderAlertBar()}
{this.renderNavBar()}
{this.renderLoopViewer()}