Commit 1e9277d2 authored by Francis Renaud's avatar Francis Renaud
Browse files

Eliminated old experimental exec tab

parent 872c808e

js-apps/meep-frontend/src/js/containers/exec/event-creation-pane.js

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import { updateObject } from '../../util/object-util'; 
import MobilityEventPane from './mobility-event-pane';

import NetworkCharacteristicsEventPane from './network-characteristics-event-pane';



import { uiExecChangeCurrentEvent, MOBILITY_EVENT, NETWORK_CHARACTERISTICS_EVENT, PAGE_EXPERIMENTAL_EXECUTE } from '../../state/ui';

import { uiExecChangeCurrentEvent, MOBILITY_EVENT, NETWORK_CHARACTERISTICS_EVENT } from '../../state/ui';

import {

  execChangeSelectedScenarioElement,

  execUEs,
@@ -116,7 +116,7 @@ class EventCreationPane extends Component { 
  }



  render() {

    if (this.props.page !== PAGE_EXECUTE && this.props.page !== PAGE_EXPERIMENTAL_EXECUTE) { return null; }

    if (this.props.page !== PAGE_EXECUTE) { return null; }



    return (

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

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

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

  MOBILITY_EVENT,

  NETWORK_CHARACTERISTICS_EVENT,

  PAGE_EXECUTE,

  PAGE_EXPERIMENTAL_EXECUTE

  PAGE_EXECUTE

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



import {
@@ -60,8 +59,6 @@ import { 
} from '../../state/exec';



import {

  TYPE_EXEC,



  // States

  EXEC_STATE_IDLE

} from '../../meep-constants';
@@ -223,7 +220,7 @@ class ExecPageContainer extends Component { 
  }



  render() {

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

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

      return null;

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

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

                  <div>

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

                        

                    <DashboardContainer showAppsView={true}/>

                  </div>

                  {/* </Elevation> */}

                </GridCell>

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

+0 −14
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ import { 
import {

  PAGE_CONFIGURE,

  PAGE_EXECUTE,

  PAGE_EXPERIMENTAL_EXECUTE,

  PAGE_MONITOR,

  PAGE_SETTINGS

} from '../state/ui';
@@ -346,19 +345,6 @@ 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

+1 −5
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


import { connect } from 'react-redux';

import React, { Component }  from 'react';

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

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



import {

  MEEP_TAB_CFG,
@@ -70,10 +70,6 @@ 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/state/ui/index.js

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 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';