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

MeepDrawer fixes to remove unnecessary scrollbar

parent af028099

js-apps/meep-frontend/package.json

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
    "test:verbose": "jest --verbose true",

    "test:coverage": "jest --verbose true --coverage --colors",

    "build": "webpack",

    "build:dev": "webpack-serve --port 8091 --host 10.3.16.78"

    "build:dev": "webpack-serve --port 8091 --host 10.3.16.105"

  },

  "author": "",

  "license": "ISC",

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

+0 −4
Original line number Diff line number Diff line
@@ -46,10 +46,6 @@ select { 
    -ms-appearance: none;

}



#meep-container {

    width: 100%;

}



// UI

#meep-container {

    width: 100%;

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

+19 −16
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ import { 


// MEEP Controller REST API JS client

var basepath = 'http://' + location.host + location.pathname + 'v1';

// const basepath = 'http://10.3.16.137:30000/v1';

// const basepath = 'http://10.3.16.105:30000/v1';



meepCtrlRestApiClient.ApiClient.instance.basePath = basepath.replace(

  /\/+$/,
@@ -442,24 +442,27 @@ class MeepContainer extends Component { 
    const flexString = this.props.mainDrawerOpen ? '0 0 250px' : '0 0 0px';



    return (

      <div style={{ width: '100%' }}>

      <div style={{ display: 'table', width: '100%', height: '100%' }}>

        <div style={{ display: 'table-row' }}>

          <MeepTopBar

            title=""

            toggleMainDrawer={() => this.props.toggleMainDrawer()}

            corePodsRunning={this.props.corePodsRunning}

            corePodsErrors={this.props.corePodsErrors}

          />



        <div style={{ display: 'flex' }}>

        </div>

        <div style={{ display: 'table-row', height: '100%' }}>

          <div style={{ display: 'flex', height: '100%' }}>

            <div

              className="component-style"

            style={{ overflow: 'hidden', flex: flexString, marginTop: '5px' }}

              style={{ flex: flexString, borderRight: '1px solid #e4e4e4', overflow: 'hidden' }}

            >

            <MeepDrawer open={this.props.mainDrawerOpen} style={{ flex: 1 }} />

              <MeepDrawer open={this.props.mainDrawerOpen} />

            </div>

            <div style={{ flex: '1', padding: 10 }}>{this.renderPage()}</div>

          </div>

        </div>

      </div>

    );

  }

}

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

+60 −74
Original line number Diff line number Diff line
@@ -54,13 +54,7 @@ class MeepDrawer extends Component { 


  render() {

    return (

      <div

        className="component-style"

        style={{ overflow: 'hidden', position: 'relative' }}

      >

        <div style={containerStyle} open={this.props.open}>

          <div style={{ marginTop: '-80px' }}>

            <div className="idcc-margin-top mdc-top-app-bar--fixed-adjust"></div>

      <div className="component-style" open={this.props.open}>

        <List>

          <ListItem

            data-cy={MEEP_TAB_CFG}
@@ -120,17 +114,10 @@ class MeepDrawer extends Component { 
          </ListItem>

        </List>

      </div>

        </div>

      </div>

    );

  }

}



const containerStyle = {

  borderRight: '1px solid #e4e4e4',

  height: '100vh'

};



const textStyles = {

  marginLeft: '30px',

  marginRight: '90px',
@@ -149,8 +136,7 @@ const mapDispatchToProps = dispatch => { 


const mapStateToProps = state => {

  return {

    currentPage: state.ui.page,

    mainDrawerOpen: state.ui.mainDrawerOpen

    currentPage: state.ui.page

  };

};

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

+1 −0
Original line number Diff line number Diff line
@@ -337,6 +337,7 @@ class MonitorPageContainer extends Component { 
          currentDashboard={this.props.currentDashboard}

          isEditMode={() => this.isEditMode()}

          startEditMode={() => this.startEditMode()}

          open={this.props.mainDrawerOpen}

        />

        <MainPane

          editedDashboardOptions={this.props.editedDashboardOptions}