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 token in projects container

Browse source
This commit is contained in:
Markus Grigull 2017-07-27 10:52:30 +02:00
parent 723e2df3d1
commit adeb3e666b
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/containers/project.js
View file

@ -42,25 +42,26 @@ class Visualizations extends Component {
let currentProjects = ProjectStore.getState();
let currentVisualizations = VisualizationStore.getState();
let sessionToken = UserStore.getState().token;
if (prevState) {
var projectUpdate = prevState.project;
// Compare content of the visualizations array, reload projects if changed
if (JSON.stringify(prevState.visualizations) !== JSON.stringify(currentVisualizations)) {
Visualizations.loadProjects();
Visualizations.loadProjects(sessionToken);
}
// Compare content of the projects array, update visualizations if changed
if (JSON.stringify(prevState.projects) !== JSON.stringify(currentProjects)) {
projectUpdate = Visualizations.findProjectInState(currentProjects, props.params.project);
Visualizations.loadVisualizations(projectUpdate.visualizations);
Visualizations.loadVisualizations(projectUpdate.visualizations, sessionToken);
}
return {
projects: currentProjects,
visualizations: currentVisualizations,
sessionToken: UserStore.getState().token,
sessionToken,
newModal: prevState.newModal,
deleteModal: prevState.deleteModal,
@ -74,13 +75,13 @@ class Visualizations extends Component {
let initialProject = Visualizations.findProjectInState(currentProjects, props.params.project);
// If projects have been loaded already but visualizations not (redirect from Projects page)
if (initialProject && (!currentVisualizations || currentVisualizations.length === 0)) {
Visualizations.loadVisualizations(initialProject.visualizations);
Visualizations.loadVisualizations(initialProject.visualizations, sessionToken);
}
return {
projects: currentProjects,
visualizations: currentVisualizations,
sessionToken: UserStore.getState().token,
sessionToken,
newModal: false,
deleteModal: false,
@ -96,23 +97,23 @@ class Visualizations extends Component {
return projects.find((project) => project._id === projectId);
}
static loadProjects() {
static loadProjects(token) {
AppDispatcher.dispatch({
type: 'projects/start-load',
token: this.state.sessionToken
token
});
}
static loadVisualizations(visualizations) {
static loadVisualizations(visualizations, token) {
AppDispatcher.dispatch({
type: 'visualizations/start-load',
data: visualizations,
token: this.state.sessionToken
token
});
}
componentWillMount() {
Visualizations.loadProjects();
Visualizations.loadProjects(this.state.sessionToken);
}
closeNewModal(data) {