Change order of Graph and Table tabs

Signed-off-by: Julius Volz <julius.volz@gmail.com>
This commit is contained in:
Julius Volz 2019-02-17 12:02:54 +01:00
parent 4e439ae630
commit 0901f48e82
2 changed files with 19 additions and 19 deletions

View file

@ -11,7 +11,7 @@ body {
} }
.expression-input textarea { .expression-input textarea {
font-family: Menlo,Monaco,Consolas,'Courier New',monospace; /* font-family: Menlo,Monaco,Consolas,'Courier New',monospace; */
resize: none; resize: none;
} }

View file

@ -234,14 +234,6 @@ class Panel extends Component<PanelProps, PanelState> {
<Row> <Row>
<Col> <Col>
<Nav tabs> <Nav tabs>
<NavItem>
<NavLink
className={this.props.options.type === 'graph' ? 'active' : ''}
onClick={() => { this.setOptions({type: 'graph'}); }}
>
Graph
</NavLink>
</NavItem>
<NavItem> <NavItem>
<NavLink <NavLink
className={this.props.options.type === 'table' ? 'active' : ''} className={this.props.options.type === 'table' ? 'active' : ''}
@ -250,8 +242,26 @@ class Panel extends Component<PanelProps, PanelState> {
Table Table
</NavLink> </NavLink>
</NavItem> </NavItem>
<NavItem>
<NavLink
className={this.props.options.type === 'graph' ? 'active' : ''}
onClick={() => { this.setOptions({type: 'graph'}); }}
>
Graph
</NavLink>
</NavItem>
</Nav> </Nav>
<TabContent activeTab={this.props.options.type}> <TabContent activeTab={this.props.options.type}>
<TabPane tabId="table">
{this.props.options.type === 'table' &&
<>
<div className="table-controls">
<TimeInput endTime={this.props.options.endTime} range={this.props.options.range} onChangeEndTime={this.handleChangeEndTime} />
</div>
<DataTable data={this.state.data} />
</>
}
</TabPane>
<TabPane tabId="graph"> <TabPane tabId="graph">
{this.props.options.type === 'graph' && {this.props.options.type === 'graph' &&
<> <>
@ -270,16 +280,6 @@ class Panel extends Component<PanelProps, PanelState> {
</> </>
} }
</TabPane> </TabPane>
<TabPane tabId="table">
{this.props.options.type === 'table' &&
<>
<div className="table-controls">
<TimeInput endTime={this.props.options.endTime} range={this.props.options.range} onChangeEndTime={this.handleChangeEndTime} />
</div>
<DataTable data={this.state.data} />
</>
}
</TabPane>
</TabContent> </TabContent>
</Col> </Col>
</Row> </Row>