Commit 1b398d4d authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

new monitoring dashboard page when logged in as admin

parent ed9b2229

js-apps/frontend/package-lock.json

+8 −0
Original line number Diff line number Diff line
@@ -12092,6 +12092,14 @@ 
        }

      }

    },

    "react-iframe": {

      "version": "1.8.0",

      "resolved": "https://registry.npmjs.org/react-iframe/-/react-iframe-1.8.0.tgz",

      "integrity": "sha512-NYi89+rEqREwQxW9sDf+akh6/dtwWd3bOjByoVEIQ7SicOxVawRMer3pLdWjFaHXpuxTB9NqobPf/Ohj2iAKkg==",

      "requires": {

        "object-assign": "^4.1.1"

      }

    },

    "react-is": {

      "version": "16.11.0",

      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.11.0.tgz",

js-apps/frontend/package.json

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
    "prop-types": "15.6.2",

    "react": "^16.8.6",

    "react-dom": "^16.8.6",

    "react-iframe": "^1.8.0",

    "react-redux": "^5.1.1",

    "redux": "^4.0.1",

    "redux-thunk": "^2.3.0",

js-apps/frontend/src/css/app-controller.scss

+4 −0
Original line number Diff line number Diff line
@@ -90,6 +90,10 @@ select { 
.ui-main {

    padding: 16px;

}

.ui-dashboard {

    width: 100%;

    height: calc(100vh - 124px);

}

.component-style {

    background-color: #FFFFFF;

}

js-apps/frontend/src/js/app-constants.js

+8 −3
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ export const HOST_PATH = location.origin; 
// Pages

export const PAGE_HOME = 'HOME';

export const PAGE_SANDBOX = 'SANDBOX';

export const PAGE_DASHBOARD = 'DASHBOARD';



// Networks

export const DEFAULT_NO_NETWORK_FILE_SELECTED = 'Select a network';
@@ -16,7 +17,10 @@ export const MIN_SCREEN_WIDTH = 840; 
export const MIN_SCREEN_HEIGHT = 0;



// URLs

export const HELP_WIKI_URL = 'https://mecwiki.etsi.org/index.php?title=MEC_Sandbox_Help';

export const WIKI_HELP_URL = 'https://mecwiki.etsi.org/index.php?title=MEC_Sandbox_Help';

export const WIKI_DISCUSSION_BOARD_URL = 'https://mecwiki.etsi.org/index.php?title=MEC_Sandbox_Help#Discussion_Board';

export const WIKI_REPORT_ISSUE_URL = 'https://mecwiki.etsi.org/index.php?title=MEC_Sandbox_Help#Reporting_Issues';



export const ETSI_MEC_URL = 'https://www.etsi.org/technologies/multi-access-edge-computing';

export const ETSI_PORTAL_URL = 'https://portal.etsi.org/tb.aspx?tbid=826&SubTB=826';

export const ETSI_FORGE_URL = 'https://forge.etsi.org';
@@ -26,9 +30,10 @@ export const ETSI_TERMS_OF_USE_URL = 'https://forge.etsi.org/mec-sandbox-terms-a 
export const ETSI_CONTACT_URL = 'https://www.etsi.org/contact';

export const ETSI_MEC_OVERVIEW_PDF_URL = 'https://www.etsi.org/images/files/technologies/ETSI-MEC-Public-Overview.pdf';



export const DASHBOARD_MEC_SANDBOX_URL = HOST_PATH + '/grafana/d/meep-session-info/mec-sandbox-dashboard?orgId=1&from=now-1h&to=now&refresh=15s&kiosk&theme=light';

export const DASHBOARD_NODE_EXPORTER_URL = HOST_PATH + '/grafana/d/meep-node-exporter/node-exporter-full?orgId=1&from=now-1h&to=now&refresh=30s&kiosk&theme=light';



// IDs

export const TAB_HOME = 'tab-home';

export const TAB_SANDBOX = 'tab-sandbox1';

export const SANDBOX_NETWORK_FILES = 'sandbox-network-files';

export const SANDBOX_MEC_API = 'sandbox-mec-api';

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

+17 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ import { TopAppBarFixedAdjust } from '@rmwc/top-app-bar'; 
import TopBarContainer from './top-bar-container';

import HomePageContainer from './home/home-page-container';

import SandboxPageContainer from './sandbox/sandbox-page-container';

import DashboardPageContainer from './dashboard/dashboard-page-container';

import Footer from '../components/footer';



// import SignInDialog from '../components/dialogs/sign-in-dialog';
@@ -30,6 +31,7 @@ import { 
  HOST_PATH,

  PAGE_HOME,

  PAGE_SANDBOX,

  PAGE_DASHBOARD,

  DEFAULT_NO_NETWORK_FILE_SELECTED,

  MIN_SCREEN_WIDTH,

  MIN_SCREEN_HEIGHT,
@@ -66,6 +68,7 @@ import { 
  uiSandboxChangeApiDetailedData,

  uiChangeSignInStatus,

  uiChangeSignInUsername,

  uiChangeSignInUserRole,

  uiSandboxChangeUpdateUeInProgressCount,

  uiSandboxChangeActivationInProgressCount,

  uiSandboxChangeActivationInProgressScenarioName
@@ -176,10 +179,16 @@ class AppContainer extends Component { 
      if (sandboxName) {

        // Store Sandbox name

        this.props.changeSandboxName(sandboxName);



        // Get user name & role to configure frontend

        let userName = params.get('user');

        if (userName) {

          this.props.changeSignInUsername(userName);

        }

        let userRole = params.get('role');

        if (userRole) {

          this.props.changeSignInUserRole(userRole);

        }



        // Reset network

        this.props.changeNetworkFileSelected(DEFAULT_NO_NETWORK_FILE_SELECTED);
@@ -911,6 +920,13 @@ class AppContainer extends Component { 
        />

      );



    case PAGE_DASHBOARD:

      return (

        <DashboardPageContainer

          style={{ width: '100%' }}

        />

      );



    default:

      return null;

    }
@@ -1046,6 +1062,7 @@ const mapDispatchToProps = dispatch => { 
    changeApiDetailedData: row => dispatch(uiSandboxChangeApiDetailedData(row)),

    changeSignInStatus: status => dispatch(uiChangeSignInStatus(status)),

    changeSignInUsername: name => dispatch(uiChangeSignInUsername(name)),

    changeSignInUserRole: role => dispatch(uiChangeSignInUserRole(role)),

    // SBOX

    changeScenario: scenario => dispatch(sboxChangeScenario(scenario)),

    changeTable: table => dispatch(sboxChangeTable(table)),