Commit 88ee40ff authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

added app instance id to exec table in frontend

parent e37e3c2e

js-apps/meep-frontend/src/js/containers/exec/exec-table.js

+16 −1
Original line number Diff line number Diff line
@@ -100,13 +100,24 @@ const execTableStyles = theme => ({ 
});



const execTableColumnData = [

  { id: 'name', numeric: false, disablePadding: false, label: 'NAME' },

  {

    id: 'name',

    numeric: false,

    disablePadding: false,

    label: 'NAME'

  },

  {

    id: 'logicalState',

    numeric: false,

    disablePadding: false,

    label: 'STATUS'

  },

  {

    id: 'id',

    numeric: false,

    disablePadding: false,

    label: 'APP INSTANCE ID'

  },

  {

    id: 'serviceMaps',

    numeric: false,
@@ -246,7 +257,11 @@ class ExecTable extends Component { 
                            >

                              {n.logicalState}

                            </TableCell>

                            <TableCell component='th' scope='row'>

                              {n.id ? n.id : 'N/A'}

                            </TableCell>

                            <TableCell>

                              {!n.ingressServiceMap && !n.egressServiceMap ? 'N/A' : ''}

                              {n.ingressServiceMap

                                ? _.map(n.ingressServiceMap, sm => {

                                  return (

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

+17 −1
Original line number Diff line number Diff line
@@ -58,7 +58,8 @@ import { 
  PAGE_HOME_INDEX,

  PAGE_CONFIGURE_INDEX,

  IDC_DIALOG_SIGN_IN,

  IDC_DIALOG_SESSION_TERMINATED

  IDC_DIALOG_SESSION_TERMINATED,

  ELEMENT_TYPE_EDGE_APP

} from '../meep-constants';



import {
@@ -112,6 +113,8 @@ import { 


import {

  FIELD_CONNECTIVITY_MODEL,

  FIELD_TYPE,

  FIELD_IMAGE,

  getElemByName,

  getElemFieldVal

} from '../util/elem-utils';
@@ -335,6 +338,19 @@ class MeepContainer extends Component { 
      .get(`${basepathMonEngine}/states?long=true&type=scenario&sandbox=${this.props.sandbox}`)

      .then(res => {

        var scenarioPodsPhases = res.data.podStatus;



        // Add app instance ID for Edge Apps

        if (this.props.exec && this.props.exec.table && this.props.exec.table.entries) {

          for (var i in scenarioPodsPhases) {

            var scenarioPod = scenarioPodsPhases[i];

            var elem = getElemByName(this.props.exec.table.entries, scenarioPod.name);

            let elemType = getElemFieldVal(elem, FIELD_TYPE);

            let elemImage = getElemFieldVal(elem, FIELD_IMAGE);

            if (elem && elemType === ELEMENT_TYPE_EDGE_APP && !elemImage.endsWith('meep-app-enablement')) {

              scenarioPodsPhases[i].id = elem.id;

            }

          }

        }

        this.props.changeScenarioPodsPhases(scenarioPodsPhases);

      })

      .catch(() => {