Commit 21b04d76 authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

Merge branch 'stf599-hotfix'

parents afbb016f 6d673324

build.sh

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ install_package() { 
    echo ""

    echo "+ Installing $1"

    rm -rf $BASEDIR/js-packages/$1

    mkdir -p $BASEDIR/js-packages/$1

    cp -r $MEEPDIR/js-packages/$1 $BASEDIR/js-packages

    cd $BASEDIR/js-packages/$1

    npm ci

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

+3 −1
Original line number Diff line number Diff line
@@ -16,7 +16,9 @@ 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_.28Slack_channels.29';

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';

js-apps/frontend/src/js/containers/top-bar-container.js

+18 −3
Original line number Diff line number Diff line
@@ -26,7 +26,9 @@ import { 
  PAGE_SANDBOX,

  STATUS_SIGNED_IN,

  DIALOG_HELP_GETTING_STARTED,

  HELP_WIKI_URL

  WIKI_HELP_URL,

  WIKI_DISCUSSION_BOARD_URL,

  WIKI_REPORT_ISSUE_URL

} from '../app-constants';



/*eslint-disable */
@@ -120,14 +122,27 @@ class TopBarContainer extends Component { 
                        >

                          <Typography use="body1">Getting started</Typography>

                        </MenuItem>

                        <div style={{ width: '100%', borderTop: '1px solid #e4e4e4'}} />

                        <MenuItem

                          onClick={() => {

                            window.open(HELP_WIKI_URL,'_blank');

                            window.open(WIKI_HELP_URL,'_blank');

                          }}

                        >

                          <Typography use="body1">Wiki</Typography>

                        </MenuItem>

                        <MenuItem

                          onClick={() => {

                            window.open(WIKI_DISCUSSION_BOARD_URL,'_blank');

                          }}

                        >

                          <Typography use="body1">Join Slack</Typography>

                        </MenuItem>

                        <MenuItem

                          onClick={() => {

                            window.open(WIKI_REPORT_ISSUE_URL,'_blank');

                          }}

                        >

                          <Typography use="body1">Report Issue</Typography>

                        </MenuItem>

                      </Menu>



                      <Button