Commit 346445d0 authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

minor frontend fixes

parent e120917c

js-apps/meep-frontend/src/js/containers/exec/exec-page-scenario-buttons.js

+3 −3
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ class ExecPageScenarioButtons extends Component { 
      this.props.sandbox &&

      !this.props.podsPending &&

      !this.props.podsTerminating &&

      !this.props.podsTerminated

      this.props.okToTerminate

    );

  }
@@ -72,7 +72,7 @@ class ExecPageScenarioButtons extends Component { 
      this.props.sandbox &&

      !this.props.podsPending &&

      !this.props.podsTerminating &&

      !this.props.podsTerminated

      this.props.okToTerminate

    );

  }
@@ -81,7 +81,7 @@ class ExecPageScenarioButtons extends Component { 
      this.props.sandbox &&

      !this.props.podsPending &&

      !this.props.podsTerminating &&

      !this.props.podsTerminated

      this.props.okToTerminate

    );

  }

js-apps/meep-frontend/src/js/containers/idc-map.js

+4 −4
Original line number Diff line number Diff line
@@ -210,10 +210,10 @@ class IDCMap extends Component { 
  createMap() {

    // Get stored configuration

    var cfg = this.getCfg();

    var lat = cfg.center ? cfg.center.lat : DEFAULT_MAP_LATITUDE;

    var lng = cfg.center ? cfg.center.lng : DEFAULT_MAP_LONGITUDE;

    var zoom = cfg.zoom ? cfg.zoom : DEFAULT_MAP_ZOOM;

    var baselayerName = cfg.baselayerName ? cfg.baselayerName : DEFAULT_MAP_STYLE;

    var lat = (cfg && cfg.center) ? cfg.center.lat : DEFAULT_MAP_LATITUDE;

    var lng = (cfg && cfg.center) ? cfg.center.lng : DEFAULT_MAP_LONGITUDE;

    var zoom = (cfg && cfg.zoom) ? cfg.zoom : DEFAULT_MAP_ZOOM;

    var baselayerName = (cfg && cfg.baselayerName) ? cfg.baselayerName : DEFAULT_MAP_STYLE;

 

    // Create Map instance

    var domNode = ReactDOM.findDOMNode(this);

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

+3 −1
Original line number Diff line number Diff line
@@ -324,7 +324,9 @@ class MeepContainer extends Component { 
    // TODO set a timer of 2 seconds

    this.props.execChangeScenarioState(EXEC_STATE_DEPLOYED);

    setTimeout(() => {

      if (this.props.exec.state.scenario === EXEC_STATE_DEPLOYED) {

        this.props.execChangeOkToTerminate(true);

      }

    }, 2000);

  }

js-apps/meep-frontend/src/js/util/scenario-utils.js

+4 −2
Original line number Diff line number Diff line
@@ -575,7 +575,8 @@ export function updateElementInScenario(scenario, element) { 
              coordinates: JSON.parse(path)

            };

            pl.geoData.eopMode = getElemFieldVal(element, FIELD_GEO_EOP_MODE);

            pl.geoData.velocity = getElemFieldVal(element, FIELD_GEO_VELOCITY);

            const velocity = getElemFieldVal(element, FIELD_GEO_VELOCITY);

            pl.geoData.velocity = velocity ? velocity : null;



            pl.label = name;

            pl.name = name;
@@ -1098,7 +1099,8 @@ export function createPL(uniqueId, name, type, element) { 
      coordinates: JSON.parse(path)

    };

    pl.geoData.eopMode = getElemFieldVal(element, FIELD_GEO_EOP_MODE);

    pl.geoData.velocity = getElemFieldVal(element, FIELD_GEO_VELOCITY);

    const velocity = getElemFieldVal(element, FIELD_GEO_VELOCITY);

    pl.geoData.velocity = velocity ? velocity : null;

  }



  return pl;