Commit 68eaa9cd authored by Muhammad Umair Khan's avatar Muhammad Umair Khan
Browse files

relocate Tilt UI to 'Dev Workflow' navigation tab

parent b204813a

js-apps/meep-frontend/src/js/components/meep-top-bar.js

+9 −0
Original line number Diff line number Diff line
@@ -37,11 +37,13 @@ import { 
import {

  MEEP_TAB_EXEC,

  MEEP_TAB_MON,

  MEEP_TAB_DEV,

  MEEP_TAB_SET,

  MEEP_TAB_CFG,

  MEEP_TAB_HOME,

  PAGE_EXECUTE,

  PAGE_MONITOR,

  PAGE_DEV,

  PAGE_SETTINGS,

  PAGE_CONFIGURE,

  PAGE_HOME,
@@ -52,6 +54,7 @@ import { 
  PAGE_CONFIGURE_INDEX,

  PAGE_EXECUTE_INDEX,

  PAGE_MONITOR_INDEX,

  PAGE_DEV_INDEX,

  PAGE_SETTINGS_INDEX,

  MEEP_HELP_GUI_URL

} from '@/js/meep-constants';
@@ -173,6 +176,12 @@ class MeepTopBar extends Component { 
                      label="Monitor"

                      onClick={() => { this.handleItemClick(PAGE_MONITOR, PAGE_MONITOR_INDEX); }}

                    />

                    <Tab

                      data-cy={MEEP_TAB_DEV}

                      style={{visibility:hideTabs?'hidden':null}}

                      label="Dev Workflow"

                      onClick={() => { this.handleItemClick(PAGE_DEV, PAGE_DEV_INDEX); }}

                    />

                    <Tab

                      data-cy={MEEP_TAB_SET}

                      style={{visibility:hideTabs?'hidden':null}}

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

+14 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import { 
  PAGE_CONFIGURE,

  PAGE_EXECUTE,

  PAGE_MONITOR,

  PAGE_DEV,

  PAGE_SETTINGS,

  PAGE_HOME,

  STATUS_SIGNED_IN,
@@ -1165,6 +1166,19 @@ class MeepContainer extends Component { 
        />

      );



    case PAGE_DEV:

      return (

        <iframe

          src="/tilt/"

          style={{

            width: '100%',

            height: 'calc(100vh - 64px)',

            border: 'none',

            backgroundColor: '#ffffff'

          }}

        />

      );



    case PAGE_MONITOR:

      return <MonitorPageContainer />;

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

+0 −7
Original line number Diff line number Diff line
@@ -138,13 +138,6 @@ const MonitorPageHeadlineBar = props => { 
                >

                  OPEN GRAFANA

                </Button>

                <Button

                  raised

                  style={styles.button}

                  onClick={() => window.open(tiltURL, '_blank')}

                >

                  OPEN TILT

                </Button>

              </div>

            </GridCell>

          </GridInner>

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

+4 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ export const TYPE_EXEC = 'EXEC'; 
export const PAGE_CONFIGURE = 'PAGE_CONFIGURE';

export const PAGE_EXECUTE = 'PAGE_EXECUTE';

export const PAGE_MONITOR = 'PAGE_MONITOR';

export const PAGE_DEV = 'PAGE_DEV';

export const PAGE_SETTINGS = 'PAGE_SETTINGS';

export const PAGE_HOME = 'PAGE_HOME';
@@ -39,7 +40,8 @@ export const PAGE_HOME_INDEX = 0; 
export const PAGE_CONFIGURE_INDEX = 1;

export const PAGE_EXECUTE_INDEX = 2;

export const PAGE_MONITOR_INDEX = 3;

export const PAGE_SETTINGS_INDEX = 4;

export const PAGE_DEV_INDEX = 4;

export const PAGE_SETTINGS_INDEX = 5;



// URLs

export const MEEP_HELP_GUI_URL = 'https://interdigitalinc.github.io/AdvantEDGE/docs/usage/gui';
@@ -56,6 +58,7 @@ export const MEEP_ISSUES_URL = 'https://github.com/InterDigitalInc/AdvantEDGE/is 
export const MEEP_TAB_CFG = 'meep-tab-cfg';

export const MEEP_TAB_EXEC = 'meep-tab-exec';

export const MEEP_TAB_MON = 'meep-tab-mon';

export const MEEP_TAB_DEV = 'meep-tab-dev';

export const MEEP_TAB_SET = 'meep-tab-set';

export const MEEP_TAB_HOME = 'meep-tab-home';

export const MEEP_LBL_SCENARIO_NAME = 'meep-lbl-scenario-name';