Commit 43c5968c authored by Francis Renaud's avatar Francis Renaud
Browse files

Added exec experimental tab

parent b9c7ccfe

js-apps/meep-frontend/src/js/containers/exec/exec-page-container.js

+5 −3
Original line number Diff line number Diff line
@@ -42,7 +42,8 @@ import { 
  // Event types

  UE_MOBILITY_EVENT,

  NETWORK_CHARACTERISTICS_EVENT,

  PAGE_EXECUTE

  PAGE_EXECUTE,

  PAGE_EXPERIMENTAL_EXECUTE

} from '../../state/ui';



import {
@@ -216,7 +217,7 @@ class ExecPageContainer extends Component { 
  }



  render() {

    if (this.props.page !== PAGE_EXECUTE) {

    if (this.props.page !== PAGE_EXECUTE && this.props.page !== PAGE_EXPERIMENTAL_EXECUTE) {

      return null;

    }
@@ -269,7 +270,8 @@ class ExecPageContainer extends Component { 
                  <GridCell span={spanLeft}>

                    <Elevation className="component-style" z={2}>

                      <div style={{padding: 10}}>

                        <DashboardContainer />

                        {this.props.experimental ? (<DashboardContainer />) : (<IDCVis type={TYPE_EXEC} />)}

                        

                      </div>

                    </Elevation>

                  </GridCell>

js-apps/meep-frontend/src/js/containers/meep-container.js

+16 −2
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ import { 
import {

  PAGE_CONFIGURE,

  PAGE_EXECUTE,

  PAGE_EXPERIMENTAL_EXECUTE,

  PAGE_MONITOR,

  PAGE_SETTINGS

} from '../state/ui';
@@ -96,7 +97,7 @@ class MeepContainer extends Component { 
  }



  startRefreshCycle() {

    // this.startPodsPhasesPeriodicCheck();

    this.startPodsPhasesPeriodicCheck();

    this.monitorTabFocus();

  }
@@ -126,7 +127,7 @@ class MeepContainer extends Component { 
        this.stopCorePodsPhasesPeriodicCheck();

        this.stopAutomaticRefresh();

      } else {

        // this.startPodsPhasesPeriodicCheck();

        this.startPodsPhasesPeriodicCheck();



        if (this.props.automaticRefresh) {

          this.startAutomaticRefresh();
@@ -337,6 +338,19 @@ class MeepContainer extends Component { 
        </>

      );



    case PAGE_EXPERIMENTAL_EXECUTE:

      return (

        <>

        <ExecPageContainer style={{width: '100%'}}

          experimental={true}

          api={this.meepExecApi}

          cfgApi={this.meepCfgApi}

          refreshScenario={() => {this.refreshScenario();}}

          deleteScenario={() => {this.deleteScenario(TYPE_EXEC);}}

        />

        </>

      );



    case PAGE_SETTINGS:

      return (

        <SettingsPageContainer style={{width: '100%'}}

js-apps/meep-frontend/src/js/containers/meep-drawer.js

+6 −1
Original line number Diff line number Diff line
@@ -8,11 +8,12 @@ 
 */

import { connect } from 'react-redux';

import React, { Component }  from 'react';

import { PAGE_CONFIGURE, PAGE_EXECUTE, PAGE_MONITOR, PAGE_SETTINGS } from '../state/ui';

import { PAGE_CONFIGURE, PAGE_EXECUTE, PAGE_EXPERIMENTAL_EXECUTE, PAGE_MONITOR, PAGE_SETTINGS } from '../state/ui';



import {

  MEEP_TAB_CFG,

  MEEP_TAB_EXEC,

  MEEP_TAB_EXP_EXEC,

  MEEP_TAB_MON,

  MEEP_TAB_SET

} from '../meep-constants';
@@ -61,6 +62,10 @@ class MeepDrawer extends Component { 
                <Icon icon="forward" iconOptions={{strategy: 'ligature'}} style={iconStyles}/>

                <span style={textStyles}>Execute</span>

              </ListItem>

              <ListItem data-cy={MEEP_TAB_EXP_EXEC} style={this.styleForPage(PAGE_EXECUTE)} onClick = {() => {this.handleItemClick(PAGE_EXPERIMENTAL_EXECUTE);}}>

                <Icon icon="forward" iconOptions={{strategy: 'ligature'}} style={iconStyles}/>

                <span style={textStyles}>Execute (Exp.)</span>

              </ListItem>

              <ListItem data-cy={MEEP_TAB_MON} style={this.styleForPage(PAGE_MONITOR)} onClick = {() => {this.handleItemClick(PAGE_MONITOR);}}>

                <Icon icon="tv" iconOptions={{strategy: 'ligature'}} style={iconStyles}/>

                <span style={textStyles}>Monitor</span>

js-apps/meep-frontend/src/js/meep-constants.js

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ export const TYPE_EXEC = 'EXEC'; 
// MEEP IDs

export const MEEP_TAB_CFG = 'meep-tab-cfg';

export const MEEP_TAB_EXEC = 'meep-tab-exec';

export const MEEP_TAB_EXP_EXEC = 'meep-tab-exp-exec';

export const MEEP_TAB_MON = 'meep-tab-mon';

export const MEEP_TAB_SET = 'meep-tab-set';

export const MEEP_LBL_SCENARIO_NAME = 'meep-lbl-scenario-name';

js-apps/meep-frontend/src/js/state/ui/index.js

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ import { updateObject } from '../../util/object-util'; 


export const PAGE_CONFIGURE = 'page-configure-link';

export const PAGE_EXECUTE = 'page-execute-link';

export const PAGE_EXPERIMENTAL_EXECUTE = 'page-experimental-execute-link';

export const PAGE_MONITOR = 'page-monitor-link';

export const PAGE_SETTINGS = 'page-settings-link';