Merge "Rework user info window"
authorSébastien Determe <sebastien.determe@intl.att.com>
Mon, 29 Jul 2019 11:17:58 +0000 (11:17 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 29 Jul 2019 11:17:58 +0000 (11:17 +0000)
1  2 
ui-react/src/LoopUI.js

diff --combined ui-react/src/LoopUI.js
@@@ -38,6 -38,8 +38,8 @@@ import { Route, Redirect } from 'react-
  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';
  
  const ProjectNameStyled = styled.a`
        vertical-align: middle;
@@@ -46,7 -48,7 +48,7 @@@
  
  `
  const LoopViewDivStyled = styled.div`
 -      height: 90vh;
 +      height: 100%;
        overflow: hidden;
        margin-left: 10px;
        margin-right: 10px;
@@@ -104,7 -106,7 +106,7 @@@ export default class LoopUI extends Rea
  
        renderMenuNavBar() {
                return (
-                       <MenuBar />
+                       <MenuBar loopCache={this.state.loopCache}/>
                );
        }
  
        renderLoopViewHeader() {
                return (
                        <LoopViewHeaderDivStyled>
 -                              Loop Viewer - <LoopViewLoopNameSpanStyled id="loop_name">{this.state.loopName}</LoopViewLoopNameSpanStyled>
 +                              Loop Viewer - {this.state.loopName}
                        </LoopViewHeaderDivStyled>
                );
        }
                return (
                        <LoopViewBodyDivStyled>
                                <LoopSvg loopCache={this.state.loopCache} />
 +                              <LoopStatus loopCache={this.state.loopCache}/>
                                <LoopLogs loopCache={this.state.loopCache} />
 -                              <LoopStatus />
                        </LoopViewBodyDivStyled>
                );
        }
  
+       getLoopCache() {
+               return this.state.loopCache;
+       }
        renderLoopViewer() {
                return (
                        <LoopViewDivStyled>
                                        render={(routeProps) => (<OperationalPolicyModal {...routeProps} loopCache={this.state.loopCache} />)} />
                                <Route path="/configurationPolicyModal/:componentName" render={(routeProps) => (<ConfigurationPolicyModal {...routeProps} loopCache={this.state.loopCache} />)} />
                                <Route path="/openLoop" render={(routeProps) => (<OpenLoopModal {...routeProps} updateLoopCacheFunction={this.updateLoopCache} />)} />
+                               <Route path="/loopProperties" render={(routeProps) => (<LoopProperties {...routeProps} loopCache={this.getLoopCache()} />)} />
+                               <Route path="/userInfo" render={(routeProps) => (<UserInfo {...routeProps} />)} />
                                <Route path="/closeLoop" render={(routeProps) => (<Redirect to='/'/>)} />
                        </div>
                );