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

WIP, Add some TODOs in new scenario container, backend responses of scenarios endpoint require adaptions for frontend compatibility

Browse source
This commit is contained in:
Sonja Happ 2019-08-20 16:40:51 +02:00
parent 67b7b876fd
commit ae2314312a
2 changed files with 32 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/scenario/scenarios-data-manager.js
View file

@ -25,7 +25,7 @@ import AppDispatcher from "../common/app-dispatcher";
class ScenariosDataManager extends RestDataManager {
constructor() {
super('scenario', '/scenarios');
super('scenario', '/scenarios', ['id', 'name', 'running', 'simulationModelIDs', 'userIDs', 'dashboardIDs', 'startParameters' ]);
}
getSimulationModels(token, id) {

35
src/scenario/scenarios.js
View file

@ -49,6 +49,7 @@ class Scenarios extends Component {
const scenarios = ScenarioStore.getState();
const simulationModels = SimulationModelStore.getState();
const simulators = SimulatorStore.getState();
const dashboards = []; // TODO get dashboards with DashboadStore.getState() here
const sessionToken = UserStore.getState().token;
@ -56,6 +57,7 @@ class Scenarios extends Component {
scenarios,
simulationModels,
simulators,
dashboards,
sessionToken,
newModal: false,
@ -78,9 +80,13 @@ class Scenarios extends Component {
componentDidUpdate() {
const simulationModelIds = [];
const simulatorIds = [];
const dashboardIds = [];
for (let scenario of this.state.scenarios) {
for (let modelId of scenario.simulationModels) {
// collect missing simulationModels
// TODO response of backend has to contain simulationModelIDs and dashboardIDs per scenario
for (let modelId of scenario.simulationModelIDs) {
const model = this.state.simulationModels.find(m => m != null && m.id === modelId);
if (model == null) {
@ -89,12 +95,23 @@ class Scenarios extends Component {
continue;
}
if (this.state.simulators.includes(s => s._id === model.simulator) === false) {
simulatorIds.push(model.simulator);
// collect missing simulators
if (this.state.simulators.includes(s => s.id === model.simulatorID) === false) {
simulatorIds.push(model.simulatorID);
}
}
// collect missing dashboards
for (let dashboardId of scenario.dashboardIDs) {
const dashboard = this.state.dashboards.find(d => d != null && d.id === dashboardId);
if (dashboard == null) {
dashboardIds.push(dashboardId);
}
}
}
// load missing simulationModels
if (simulationModelIds.length > 0) {
AppDispatcher.dispatch({
type: 'simulationModels/start-load',
@ -103,6 +120,7 @@ class Scenarios extends Component {
});
}
// load missing simulators
if (simulatorIds.length > 0) {
AppDispatcher.dispatch({
type: 'simulators/start-load',
@ -110,6 +128,15 @@ class Scenarios extends Component {
token: this.state.sessionToken
});
}
// load missing dashboards
if (dashboardIds.length > 0) {
AppDispatcher.dispatch( {
type: 'dashboards/start-load',
data: dashboardIds,
token: this.state.sessionToken
})
}
}
closeNewModal(data) {
@ -270,7 +297,7 @@ class Scenarios extends Component {
});
}
}
}
};
render() {
const buttonStyle = {