Commit aa16ab4f authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

Merge branch 'develop'

parents cc26bb5d 136f952d

js-apps/frontend/src/js/components/dialogs/news-dialog.js

+5 −7
Original line number Diff line number Diff line
@@ -29,13 +29,11 @@ class NewsDialog extends Component { 
            <p><b>October 2021</b></p>

          </Typography>

          <Typography use="body1">

            <p>

            The following APIs are supported as Beta features:

            <ul>

              <li>MEC011 - Edge Platform Application Enablement (v2.1.1)</li>

              <li>MEC021 - Application Mobility Service API (v2.1.1)</li>

            </ul>

            </p>

            <p>

              Usage details are available in the <a href={WIKI_HELP_URL} target="_blank">MEC Sandbox Wiki</a><br/>

              Questions & feedback are appreciated on the <a href={WIKI_DISCUSSION_BOARD_URL} target="_blank">Slack Discussion Board</a>

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

+1 −1
Original line number Diff line number Diff line
@@ -1210,7 +1210,7 @@ class AppContainer extends Component { 
          onClose={() => {

            this.closeDialog();

          }}

          mepNames={this.props.mepList.meps}

          mepNames={this.props.mepList}

        />

        <NewsDialog

          title='MEC Sandbox Beta Features'

js-apps/frontend/src/js/util/scenario-utils.js

+2 −2
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ export function parseUes(scenario) { 


export function parseMeps(scenario) {

  if (!scenario) {

    return null;

    return [];

  }



  var meps = new Array();
@@ -449,7 +449,7 @@ export function parseMeps(scenario) { 
  if (nbMeps === 0) {

    meps.push('NOT AVAILABLE');

  }

  return { meps: meps};

  return meps;

}



export function parseEdgeApps(scenario) {

js-apps/frontend/webpack.config.js

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ const ExtractTextPlugin = require('extract-text-webpack-plugin'); 
const HtmlWebpackPlugin = require('html-webpack-plugin');



var extractPlugin = new ExtractTextPlugin({

  filename: 'bundle.css'

  filename: 'bundle.css?[hash]'

});

var htmlPlugin = new HtmlWebpackPlugin({

  template: 'src/index.html',
@@ -18,7 +18,7 @@ module.exports = env => { 
      './src/js/app-controller.js'

    ],

    output: {

      filename: 'bundle.js',

      filename: 'bundle.js?[hash]',

      path: path.resolve(__dirname, 'dist')

    },

    node: {