X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ui-react%2Fsrc%2FLoopUI.js;h=5491ab187caf0314531b821dab42f5e8146087e1;hb=083e5a2aefd76bb1fc25bcb5528b7288b059c1c2;hp=11808da38ce150694da2837431bcfb3635ab5061;hpb=f6b2625c5876c5ef1b8ead0b3962362fb2924f95;p=clamp.git
diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index 11808da3..5491ab18 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -27,8 +27,9 @@ 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 SvgGenerator from './components/loop_viewer/svg/SvgGenerator';
import LoopLogs from './components/loop_viewer/logs/LoopLogs';
import LoopStatus from './components/loop_viewer/status/LoopStatus';
import UserService from './api/UserService';
@@ -36,17 +37,22 @@ import LoopCache from './api/LoopCache';
import LoopActionService from './api/LoopActionService';
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';
-import LoopProperties from './components/dialogs/LoopProperties';
-import UserInfo from './components/dialogs/UserInfo';
+import CreateLoopModal from './components/dialogs/Loop/CreateLoopModal';
+import OpenLoopModal from './components/dialogs/Loop/OpenLoopModal';
+import ModifyLoopModal from './components/dialogs/Loop/ModifyLoopModal';
+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 ViewToscaModals from './components/dialogs/ViewToscaModals/ViewToscaModals';
+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 Spinner from 'react-bootstrap/Spinner';
import { Link } from 'react-router-dom';
@@ -54,6 +60,11 @@ const StyledMainDiv = styled.div`
background-color: ${props => props.theme.backgroundColor};
`
+const StyledSpinnerDiv = styled.div`
+ justify-content: center !important;
+ display: flex !important;
+`;
+
const ProjectNameStyled = styled.a`
vertical-align: middle;
padding-left: 30px;
@@ -98,24 +109,29 @@ const LoopViewBodyDivStyled = styled.div`
export default class LoopUI extends React.Component {
- static defaultLoopName="Empty (NO loop loaded yet)";
-
state = {
userName: null,
- loopName: LoopUI.defaultLoopName,
+ loopName: OnapConstants.defaultLoopName,
loopCache: new LoopCache({}),
- showAlert: false
+ showSucAlert: false,
+ showFailAlert: false,
+ busyLoadingCount: 0
};
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.showSucAlert = this.showSucAlert.bind(this);
+ this.showFailAlert = this.showFailAlert.bind(this);
this.disableAlert = this.disableAlert.bind(this);
+ this.setBusyLoading = this.setBusyLoading.bind(this);
+ this.clearBusyLoading = this.clearBusyLoading.bind(this);
+ this.isBusyLoading = this.isBusyLoading.bind(this);
+ this.renderGlobalStyle = this.renderGlobalStyle.bind(this);
+ this.renderSvg = this.renderSvg.bind(this);
}
componentWillMount() {
@@ -127,14 +143,6 @@ 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 (
@@ -147,7 +155,6 @@ export default class LoopUI extends React.Component {
Signed in as:
{this.state.userName}
- (logout)
);
}
@@ -163,9 +170,14 @@ export default class LoopUI extends React.Component {
renderAlertBar() {
return (
-
+
+
+ {this.state.showMessage}
+
+
{this.state.showMessage}
+
);
}
@@ -183,15 +195,20 @@ export default class LoopUI extends React.Component {
renderLoopViewHeader() {
return (
- Loop Viewer - {this.state.loopName}
+ Loop Viewer - {this.state.loopName} - ({this.state.loopCache.getTemplateName()})
);
}
+ renderSvg() {
+ return (
+
+ )
+ }
renderLoopViewBody() {
return (
-
+ {this.renderSvg()}
@@ -213,58 +230,189 @@ export default class LoopUI extends React.Component {
}
updateLoopCache(loopJson) {
- this.setState({ loopCache: new LoopCache(loopJson) });
- this.setState({ loopName: this.state.loopCache.getLoopName() });
+
+ // If call with an empty object for loopJson, this is a reset to empty
+ // from someplace like PerformActions for the case where we are "deleting"
+ // a Control Loop model. Set the loopName to the default.
+
+ if (loopJson === null) {
+ this.setState({ loopName: OnapConstants.defaultLoopName });
+ this.setState({ loopCache: new LoopCache({}) });
+ } else {
+ this.setState({ loopCache: new LoopCache(loopJson) });
+ this.setState({ loopName: this.state.loopCache.getLoopName() });
+ }
console.info(this.state.loopName+" loop loaded successfully");
+ }
+
+ showSucAlert(message) {
+ this.setState ({ showSucAlert: true, showMessage:message });
}
- showAlert(message) {
- this.setState ({ showAlert: true, showMessage:message });
+ showFailAlert(message) {
+ this.setState ({ showFailAlert: true, showMessage:message });
}
disableAlert() {
- this.setState ({ showAlert: false });
+ this.setState ({ showSucAlert: false, showFailAlert: false });
}
loadLoop(loopName) {
+ this.setBusyLoading();
LoopService.getLoop(loopName).then(loop => {
console.debug("Updating loopCache");
LoopActionService.refreshStatus(loopName).then(data => {
this.updateLoopCache(data);
+ this.clearBusyLoading();
this.props.history.push('/');
})
.catch(error => {
this.updateLoopCache(loop);
+ this.clearBusyLoading();
this.props.history.push('/');
});
});
}
+ setBusyLoading() {
+ this.setState((state,props) => ({ busyLoadingCount: ++state.busyLoadingCount }));
+ }
+
+ clearBusyLoading() {
+ this.setState((state,props) => ({ busyLoadingCount: --state.busyLoadingCount }));
+ }
+
+ isBusyLoading() {
+ if (this.state.busyLoadingCount === 0) {
+ return false;
+ } else {
+ return true;
+ }
+ }
+
closeLoop() {
- this.setState({ loopCache: new LoopCache({}), loopName: LoopUI.defaultLoopName });
+ this.setState({ loopCache: new LoopCache({}), loopName: OnapConstants.defaultLoopName });
this.props.history.push('/');
}
+ renderRoutes() {
+ return(
+
+ ()} />
+ ()} />
+ ()} />
+ ()} />
+
+ ()}
+ />
+ ()}
+ />
+ ()}
+ />
+ ()}
+ />
+ ()}
+ />
+
+ ()} />
+
+
+ ()}
+ />
+ ()}
+ />
+ ()}
+ />
+ ()}
+ />
+ ()}
+ />
+ ()}
+ />
+ ()}
+ />
+
+ );
+ }
+
+ renderGlobalStyle() {
+ return (
+
+ );
+ };
+
+
+ renderSpinner() {
+ if (this.isBusyLoading()) {
+ return (
+
+
+ Loading...
+
+
+ );
+ } else {
+ return ();
+ }
+ }
+
render() {
return (
- ()} />
- ()} />
- ()} />
- ()} />
- ()} />
- ()} />
-
- ()} />
- ()} />
- ()} />
- ()} />
- ()} />
- ()} />
- ()} />
-
-
+ {this.renderGlobalStyle()}
+ {this.renderRoutes()}
+ {this.renderSpinner()}
{this.renderAlertBar()}
{this.renderNavBar()}
{this.renderLoopViewer()}