Commit 81782287 authored by Nikhil Doifode's avatar Nikhil Doifode
Browse files

Added reset element function in store instead of updating the element on... 

Added reset element function in store instead of updating the element on network-charac container close
parent 70417fef

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

+10 −4
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import { 


import {

  execChangeSelectedScenarioElement,

  execResetSelectedScenarioElement,

  execUEs,

  execPOAs,

  execMobTypes,
@@ -117,10 +118,14 @@ class EventCreationPane extends Component { 
  }



  updateElement(values) {

    if (values === null) {

      this.props.resetSelectedScenarioElement();

    } else {

      var element = updateObject({}, this.props.selectedScenarioElement);

      element = updateObject(element, values);

      this.props.changeSelectedScenarioElement(element);

    }

  }



  render() {

    if (this.props.page !== PAGE_EXECUTE || this.props.hide) {
@@ -208,7 +213,8 @@ const mapDispatchToProps = dispatch => { 
  return {

    changeEvent: event => dispatch(uiExecChangeCurrentEvent(event)),

    changeSelectedScenarioElement: element =>

      dispatch(execChangeSelectedScenarioElement(element))

      dispatch(execChangeSelectedScenarioElement(element)),

    resetSelectedScenarioElement: () => dispatch(execResetSelectedScenarioElement())

  };

};

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

+1 −4
Original line number Diff line number Diff line
@@ -159,10 +159,7 @@ class NetworkCharacteristicsEventPane extends Component { 


  onNetworkCharacPaneClose(e) {

    e.preventDefault();

    var updatedElem = updateObject({}, this.props.element);

    setElemFieldVal(updatedElem, FIELD_NAME, '');

    setElemFieldVal(updatedElem, FIELD_TYPE, '');

    this.props.updateElement(updatedElem);

    this.props.updateElement(null);

    this.props.onClose(e);

  }

js-apps/meep-frontend/src/js/state/exec/selected-scenario-element.js

+13 −1
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ import { createElem } from '../../util/elem-utils'; 


const EXEC_CHANGE_SELECTED_SCENARIO_ELEMENT =

  'EXEC_CHANGE_SELECTED_SCENARIO_ELEMENT';

const EXEC_RESET_SELECTED_SCENARIO_ELEMENT =

  'EXEC_RESET_SELECTED_SCENARIO_ELEMENT';



// CFG_SET_EDITED_ELEMENT

function execChangeSelectedScenarioElement(element) {
@@ -28,7 +30,15 @@ function execChangeSelectedScenarioElement(element) { 
  };

}



export { execChangeSelectedScenarioElement };

// EXEC_RESET_ELEMENT

function execResetSelectedScenarioElement() {

  return {

    type: EXEC_RESET_SELECTED_SCENARIO_ELEMENT,

    payload: 'dummy'

  };

}



export { execChangeSelectedScenarioElement, execResetSelectedScenarioElement };



const initialState = createElem('dummy');
@@ -36,6 +46,8 @@ export function execSelectedScenarioElement(state = initialState, action) { 
  switch (action.type) {

  case EXEC_CHANGE_SELECTED_SCENARIO_ELEMENT:

    return updateObject({}, action.payload);

  case EXEC_RESET_SELECTED_SCENARIO_ELEMENT:

    return createElem('dummy');

  default:

    return state;

  }