Mirrors/VILLASweb
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web/ synced 2025-03-09 00:00:01 +01:00
Code Issues Releases Wiki Activity

fix labelManipulation function of ICs (naming of labels changed with transition to bootstrap 4.5), state now showing colored.

Browse source
This commit is contained in:
Sonja Happ 2020-06-23 15:04:36 +02:00
parent 5ea80ae44d
commit 85390df0b8
3 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/common/table.js
View file

@ -85,15 +85,18 @@ class CustomTable extends Component {
labelContent = child.props.labelModifier(labelContent, data);
}
let labelStyle = child.props.labelStyle(data[labelKey], data)
cell.push(<span>
&nbsp;
<FormLabel column={false} classes={child.props.labelStyle(data[labelKey], data)}>
<FormLabel column={false} className={labelStyle}>
{labelContent.toString()}
</FormLabel>
</span>
);
}
if (child.props.dataIndex) {
cell.push(index);
}

23
src/ic/ics.js
View file

@ -220,39 +220,40 @@ class InfrastructureComponents extends Component {
return Date.now() - new Date(component.stateUpdatedAt) > fiveMinutes;
}
static stateLabelStyle(state, component){
var style = [ 'label' ];
stateLabelStyle(state, component){
var style = [ 'badge' ];
if (InfrastructureComponents.isICOutdated(component) && state !== 'shutdown') {
style.push('label-outdated');
style.push('badge-outdated');
}
switch (state) {
case 'running':
style.push('label-success');
style.push('badge-success');
break;
case 'paused':
style.push('label-info');
style.push('badge-info');
break;
case 'idle':
style.push('label-primary');
style.push('badge-primary');
break;
case 'error':
style.push('label-danger');
style.push('badge-danger');
break;
case 'shutdown':
style.push('label-warning');
style.push('badge-warning');
break;
default:
style.push('label-default');
style.push('badge-default');
}
return style.join(' ');
return style.join(' ')
}
static stateUpdateModifier(updatedAt) {
@ -273,7 +274,7 @@ class InfrastructureComponents extends Component {
<Table data={this.state.ics}>
<TableColumn checkbox onChecked={(index, event) => this.onICChecked(index, event)} width='30' />
<TableColumn title='Name' dataKeys={['name', 'rawProperties.name']} />
<TableColumn title='State' labelKey='state' tooltipKey='error' labelModifier={InfrastructureComponents.stateLabelModifier} labelStyle={InfrastructureComponents.stateLabelStyle} />
<TableColumn title='State' labelKey='state' tooltipKey='error' labelStyle={(state, component) => this.stateLabelStyle(state, component)} />
<TableColumn title='Category' dataKeys={['category', 'rawProperties.category']} />
<TableColumn title='Type' dataKeys={['type', 'rawProperties.type']} />
<TableColumn title='Location' dataKeys={['properties.location', 'rawProperties.location']} />

2
src/styles/app.css
View file

@ -400,6 +400,6 @@ body {
margin-right: 0 !important;
}
.label-outdated {
.badge-outdated {
opacity: 0.4;
}