1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web/ synced 2025-03-09 00:00:01 +01:00

cosmetic code cleanups

This commit is contained in:
Steffen Vogel 2021-03-08 14:53:08 +01:00
parent 05ce521376
commit 0da8791056
3 changed files with 35 additions and 15 deletions

View file

@ -40,7 +40,6 @@ class TableColumn extends Component {
checkboxDisabled: null,
labelStyle: null,
labelModifier: null
};
render() {

View file

@ -83,12 +83,13 @@ class CustomTable extends Component {
<OverlayTrigger
key={contentkey}
placement={'bottom'}
overlay={<Tooltip id={`tooltip-${"export"}`}>Download {contentvalue}</Tooltip>} >
overlay={<Tooltip id={`tooltip-${"export"}`}>Download {contentvalue}</Tooltip>}
>
<Button
variant='table-control-button'
onClick={() => child.props.onDownload(contentkey)}
disabled={child.props.onDownload == null}>
{contentkey + ' ' }
{contentkey + ' '}
<Icon icon='file-download' />
</Button>
</OverlayTrigger>);

View file

@ -746,11 +746,20 @@ class Scenario extends React.Component {
dataKey='id'
modifier={(id, result) => this.modifyResultNoColumn(id, result)}
/>
<TableColumn title='Description' dataKey='description' />
<TableColumn title='Created at' dataKey='createdAt' />
<TableColumn title='Last update' dataKey='updatedAt' />
<TableColumn
title='Files/Data'
title='Description'
dataKey='description'
/>
<TableColumn
title='Created at'
dataKey='createdAt'
/>
<TableColumn
title='Last update'
dataKey='updatedAt'
/>
<TableColumn
title='Files'
dataKey='resultFileIDs'
linkKey='filebuttons'
data={this.state.files}
@ -758,7 +767,6 @@ class Scenario extends React.Component {
onDownload={(index) => this.downloadResultData(index)}
/>
<TableColumn
title='Options'
width='300'
editButton
downloadAllButton
@ -855,7 +863,11 @@ class Scenario extends React.Component {
exportButton
onExport={(index) => this.signalsAutoConf(index)}
/>
<TableColumn title='Infrastructure Component' dataKey='icID' modifier={(icID) => this.getICName(icID)} />
<TableColumn
title='Infrastructure Component'
dataKey='icID'
modifier={(icID) => this.getICName(icID)}
/>
<TableColumn
title=''
width='200'
@ -888,7 +900,7 @@ class Scenario extends React.Component {
: <div />
}
< div style={{ clear: 'both' }} />
<div style={{ clear: 'both' }} />
<EditConfigDialog
show={this.state.editConfigModal}
@ -977,13 +989,23 @@ class Scenario extends React.Component {
<h2 style={tableHeadingStyle}>Users sharing this scenario</h2>
<div>
<Table data={this.state.scenario.users}>
<TableColumn title='Name' dataKey='username' />
<TableColumn title='Mail' dataKey='mail' />
<TableColumn
title='Name'
dataKey='username'
/>
<TableColumn
title='Mail'
dataKey='mail'
/>
<TableColumn
title=''
width='200'
deleteButton
onDelete={(index) => this.setState({ deleteUserModal: true, deleteUserName: this.state.scenario.users[index].username, modalUserIndex: index })}
onDelete={(index) => this.setState({
deleteUserModal: true,
deleteUserName: this.state.scenario.users[index].username,
modalUserIndex: index
})}
/>
</Table>
@ -1009,8 +1031,6 @@ class Scenario extends React.Component {
</div>
<DeleteDialog title="user from scenario:" name={this.state.deleteUserName} show={this.state.deleteUserModal} onClose={(c) => this.closeDeleteUserModal(c)} />
</div>;
}
}