Commit 9f6b9346 authored by Simon Pastor's avatar Simon Pastor
Browse files

v1.6

parent edfcea48

js-apps/meep-frontend/src/js/components/dialogs/id-save-replay-dialog.js

+7 −1
Original line number Diff line number Diff line
@@ -17,7 +17,11 @@ 
import React, { Component } from 'react';

import { TextField, TextFieldHelperText } from '@rmwc/textfield';

import IDDialog from './id-dialog';

import { MEEP_DLG_SAVE_REPLAY } from '../../meep-constants';

import { 

  MEEP_DLG_SAVE_REPLAY,

  MEEP_DLG_SAVE_REPLAY_NAME,

  MEEP_DLG_SAVE_REPLAY_DESCRIPTION

} from '../../meep-constants';



class IDSaveReplayDialog extends Component {

  constructor(props) {
@@ -94,6 +98,7 @@ class IDSaveReplayDialog extends Component { 
          }

          onChange={e => this.changeReplayName(e.target.value)}

          value={this.replayName}

          data-cy={MEEP_DLG_SAVE_REPLAY_NAME}

        />

        <TextFieldHelperText validationMsg={true}>

          <span>{this.state.replayErr}</span>
@@ -108,6 +113,7 @@ class IDSaveReplayDialog extends Component { 
          }

          onChange={e => this.changeDescription(e.target.value)}

          value={this.description}

          data-cy={MEEP_DLG_SAVE_REPLAY_DESCRIPTION}

        />

        <TextFieldHelperText validationMsg={true}>

          <span>{this.state.descriptionErr}</span>

js-apps/meep-frontend/src/js/containers/cfg/cfg-network-element-container.js

+12 −6
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ import { 
  CFG_ELEM_WIRELESS_TYPE,

  CFG_ELEM_INGRESS_SVC_MAP,

  CFG_ELEM_EGRESS_SVC_MAP,

  CFG_ELEM_META_DISPLAY_MAP_COLOR,

  CFG_BTN_NEW_ELEM,

  CFG_BTN_DEL_ELEM,

  CFG_BTN_CLONE_ELEM,
@@ -936,6 +937,7 @@ const TypeRelatedFormFields = ({ onUpdate, onEditLocation, onEditPath, element } 
            validate={validateColor}

            label="Zone Color"

            fieldName={FIELD_META_DISPLAY_MAP_COLOR}

            cydata={CFG_ELEM_META_DISPLAY_MAP_COLOR}

          />

          { !element.editColor ? null :

            <div style={ styles.popover }>
@@ -1138,7 +1140,7 @@ const TypeRelatedFormFields = ({ onUpdate, onEditLocation, onEditPath, element } 
            />

          </GridCell>

        </Grid>

        {isWireless ?

        {isWireless ? (

          <Grid>

            <CfgTextFieldCell

              span={12}
@@ -1149,8 +1151,10 @@ const TypeRelatedFormFields = ({ onUpdate, onEditLocation, onEditPath, element } 
              fieldName={FIELD_WIRELESS_TYPE}

              cydata={CFG_ELEM_WIRELESS_TYPE}

            />

          </Grid> : <></>

        }

          </Grid>

        ) : (

          <></>

        )}



        <Grid>

          <CfgTextFieldCell
@@ -1249,7 +1253,7 @@ const TypeRelatedFormFields = ({ onUpdate, onEditLocation, onEditPath, element } 
            />

          </GridCell>

        </Grid>

        {isWireless ?

        {isWireless ? (

          <Grid>

            <CfgTextFieldCell

              span={12}
@@ -1260,8 +1264,10 @@ const TypeRelatedFormFields = ({ onUpdate, onEditLocation, onEditPath, element } 
              fieldName={FIELD_WIRELESS_TYPE}

              cydata={CFG_ELEM_WIRELESS_TYPE}

            />

          </Grid> : <></>

        }

          </Grid> 

        ) : ( 

          <></>

        )}

        

        <Grid>

          <CfgTextFieldCell

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

+1 −0
Original line number Diff line number Diff line
@@ -596,6 +596,7 @@ class CfgPageContainer extends Component { 
          title="Open Scenario"

          open={this.props.currentDialog === IDC_DIALOG_OPEN_SCENARIO}

          options={this.props.scenarios}

          onDismiss={() => { this.closeDialog();}}

          onClose={() => {

            this.closeDialog();

          }}

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

+4 −1
Original line number Diff line number Diff line
@@ -44,8 +44,10 @@ import { 
  VIEW_NAME_NONE,

  MAP_VIEW,

  NET_TOPOLOGY_VIEW,

  DEFAULT_DASHBOARD_OPTIONS

  DEFAULT_DASHBOARD_OPTIONS,

  EXEC_BTN_DASHBOARD_BTN_CLOSE

} from '../../meep-constants';



import { updateObject } from '../../util/object-util';



const styles = {
@@ -251,6 +253,7 @@ const DashboardConfiguration = props => { 
              outlined

              style={styles.button}

              onClick={() => props.onCloseDashCfg()}

              data-cy={EXEC_BTN_DASHBOARD_BTN_CLOSE}

            >

            Close

            </Button>

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

+13 −0
Original line number Diff line number Diff line
@@ -28,6 +28,14 @@ import { 
  uiExecChangeAutomationNetCharMode

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



import {

  EXEC_BTN_EVENT_BTN_AUTOMATION_CHKBOX_MOVEMENT,

  EXEC_BTN_EVENT_BTN_AUTOMATION_CHKBOX_MOBILITY,

  EXEC_BTN_EVENT_BTN_AUTOMATION_CHKBOX_POAS_IN_RANGE,

  EXEC_BTN_EVENT_BTN_AUTOMATION_CHKBOX_NETCHAR,

  EXEC_BTN_EVENT_BTN_AUTOMATION_BTN_CLOSE

} from '../../meep-constants';



const AUTO_TYPE_MOVEMENT = 'MOVEMENT';

const AUTO_TYPE_MOBILITY = 'MOBILITY';

const AUTO_TYPE_POAS_IN_RANGE = 'POAS-IN-RANGE';
@@ -132,6 +140,7 @@ class EventAutomationPane extends Component { 
            <Checkbox

              checked={this.props.automationMovementMode}

              onChange={e => this.setMovementMode(e.target.checked)}

              data-cy={EXEC_BTN_EVENT_BTN_AUTOMATION_CHKBOX_MOVEMENT}

            >

              Movement

            </Checkbox>
@@ -140,6 +149,7 @@ class EventAutomationPane extends Component { 
            <Checkbox

              checked={this.props.automationMobilityMode}

              onChange={e => this.setMobilityMode(e.target.checked)}

              data-cy={EXEC_BTN_EVENT_BTN_AUTOMATION_CHKBOX_MOBILITY}

            >

              Mobility

            </Checkbox>
@@ -148,6 +158,7 @@ class EventAutomationPane extends Component { 
            <Checkbox

              checked={this.props.automationPoasInRangeMode}

              onChange={e => this.setPoasInRangeMode(e.target.checked)}

              data-cy={EXEC_BTN_EVENT_BTN_AUTOMATION_CHKBOX_POAS_IN_RANGE}

            >

              POAs in range

            </Checkbox>
@@ -156,6 +167,7 @@ class EventAutomationPane extends Component { 
            <Checkbox

              checked={this.props.automationNetCharMode}

              onChange={e => this.setNetCharMode(e.target.checked)}

              data-cy={EXEC_BTN_EVENT_BTN_AUTOMATION_CHKBOX_NETCHAR}

            >

              Network Characteristics

            </Checkbox>
@@ -169,6 +181,7 @@ class EventAutomationPane extends Component { 
                outlined

                style={styles.button}

                onClick={this.props.onClose}

                data-cy={EXEC_BTN_EVENT_BTN_AUTOMATION_BTN_CLOSE}

              >

                Close

              </Button>