mirror of
https://git.rwth-aachen.de/acs/public/villas/web/
synced 2025-03-16 00:00:03 +01:00
fix broken disable property of ICAction (closes #293)
This commit is contained in:
parent
dccbc2e56c
commit
9ff1495058
3 changed files with 12 additions and 5 deletions
src
|
@ -64,7 +64,11 @@ class InfrastructureComponents extends Component {
|
|||
}
|
||||
}
|
||||
|
||||
static calculateState() {
|
||||
static calculateState(prevState, props) {
|
||||
if (prevState == null) {
|
||||
prevState = {};
|
||||
}
|
||||
|
||||
const ics = InfrastructureComponentStore.getState().sort((a, b) => {
|
||||
if (a.state !== b.state) {
|
||||
return InfrastructureComponents.statePrio(a.state) > InfrastructureComponents.statePrio(b.state);
|
||||
|
@ -100,7 +104,7 @@ class InfrastructureComponents extends Component {
|
|||
modalIC: {},
|
||||
deleteModal: false,
|
||||
icModal: false,
|
||||
selectedICs: [],
|
||||
selectedICs: prevState.selectedICs || [],
|
||||
currentUser: JSON.parse(localStorage.getItem("currentUser"))
|
||||
};
|
||||
}
|
||||
|
|
|
@ -110,7 +110,7 @@ class Scenario extends React.Component {
|
|||
deleteConfigModal: false,
|
||||
importConfigModal: false,
|
||||
newConfig: prevState.newConfig || false,
|
||||
selectedConfigs: [],
|
||||
selectedConfigs: prevState.selectedConfigs || [],
|
||||
filesEditModal: prevState.filesEditModal || false,
|
||||
filesEditSaveState: prevState.filesEditSaveState || [],
|
||||
|
||||
|
|
|
@ -43,7 +43,10 @@ class Scenarios extends Component {
|
|||
return [ScenarioStore, DashboardStore, WidgetStore, ConfigStore, SignalStore];
|
||||
}
|
||||
|
||||
static calculateState() {
|
||||
static calculateState(prevState, props) {
|
||||
if (prevState == null) {
|
||||
prevState = {};
|
||||
}
|
||||
|
||||
return {
|
||||
scenarios: ScenarioStore.getState(),
|
||||
|
@ -58,7 +61,7 @@ class Scenarios extends Component {
|
|||
importModal: false,
|
||||
modalScenario: {},
|
||||
|
||||
selectedScenarios: []
|
||||
selectedScenarios: prevState.selectedScenarios || []
|
||||
};
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue