Commit 6cbbc204 authored by Simon Pastor's avatar Simon Pastor
Browse files

fix cleanup error

parent 05ec3084

js-apps/meep-frontend/src/js/containers/exec/view-pane.js

+4 −9
Original line number Diff line number Diff line
@@ -247,11 +247,6 @@ class ViewPane extends Component { 
    ueIds.unshift('None');

    poaIds.unshift('None');



    const selectedSourceView1 = appIds.includes(this.props.sourceNodeSelectedView1) ? this.props.sourceNodeSelectedView1 : 'None';

    const selectedDestView1 = appIds.includes(this.props.destNodeSelectedView1) ? this.props.destNodeSelectedView1 : 'None';

    const selectedSourceView2 = appIds.includes(this.props.sourceNodeSelectedView2) ? this.props.sourceNodeSelectedView2 : 'None';

    const selectedDestView2 = appIds.includes(this.props.destNodeSelectedView2) ? this.props.destNodeSelectedView2 : 'None';



    // Populate Dashboard view list using links from monitoring tab

    var dashboardViewsList = [

      VIEW_NAME_NONE,
@@ -284,10 +279,10 @@ class ViewPane extends Component { 
          poaIds={poaIds}

          view1Name={view1Name}

          view2Name={view2Name}

          sourceNodeSelectedView1={selectedSourceView1}

          destNodeSelectedView1={selectedDestView1}

          sourceNodeSelectedView2={selectedSourceView2}

          destNodeSelectedView2={selectedDestView2}

          sourceNodeSelectedView1={this.props.sourceNodeSelectedView1}

          destNodeSelectedView1={this.props.destNodeSelectedView1}

          sourceNodeSelectedView2={this.props.sourceNodeSelectedView2}

          destNodeSelectedView2={this.props.destNodeSelectedView2}

          changeView1={this.changeView1}

          changeView2={this.changeView2}

          changeSourceNodeSelectedView1={this.props.changeSourceNodeSelectedView1}

js-apps/meep-frontend/src/js/containers/exec/view-specific-pane.js

+6 −6
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ class ViewSpecificPane extends Component { 
                  onChange={e => {

                    this.props.changeSourceNodeSelected(e.target.value);

                  }}

                  value={this.props.sourceNodeSelected}

                  value={netSrcNodeIds.includes(this.props.sourceNodeSelected) ? this.props.sourceNodeSelected : 'None'}

                />

              </GridCell>

              <GridCell span={12}>
@@ -134,7 +134,7 @@ class ViewSpecificPane extends Component { 
                  onChange={e => {

                    this.props.changeDestNodeSelected(e.target.value);

                  }}

                  value={this.props.destNodeSelected}

                  value={netDstNodeIds.includes(this.props.destNodeSelected) ? this.props.destNodeSelected : 'None'}

                />

              </GridCell>

            </> : null
@@ -150,7 +150,7 @@ class ViewSpecificPane extends Component { 
                  onChange={e => {

                    this.props.changeSourceNodeSelected(e.target.value);

                  }}

                  value={this.props.sourceNodeSelected}

                  value={netSrcNodeIds.includes(this.props.sourceNodeSelected) ? this.props.sourceNodeSelected : 'None'}

                />

              </GridCell>

            </> : null
@@ -166,7 +166,7 @@ class ViewSpecificPane extends Component { 
                  onChange={e => {

                    this.props.changeSourceNodeSelected(e.target.value);

                  }}

                  value={this.props.sourceNodeSelected}

                  value={wirelessSrcNodeIds.includes(this.props.sourceNodeSelected) ? this.props.sourceNodeSelected : 'None'}

                />

              </GridCell>

              <GridCell span={12}>
@@ -177,7 +177,7 @@ class ViewSpecificPane extends Component { 
                  onChange={e => {

                    this.props.changeDestNodeSelected(e.target.value);

                  }}

                  value={this.props.destNodeSelected}

                  value={wirelessDstNodeIds.includes(this.props.destNodeSelected) ? this.props.destNodeSelected : 'None'}

                />

              </GridCell>

            </> : null
@@ -193,7 +193,7 @@ class ViewSpecificPane extends Component { 
                  onChange={e => {

                    this.props.changeSourceNodeSelected(e.target.value);

                  }}

                  value={this.props.sourceNodeSelected}

                  value={wirelessSrcNodeIds.includes(this.props.sourceNodeSelected) ? this.props.sourceNodeSelected : 'None'}

                />

              </GridCell>

            </> : null