From 0dc1365a83adf8e91389c7e83eab7be48253f7e9 Mon Sep 17 00:00:00 2001 From: Laura Fuentes Grau Date: Sat, 25 Jan 2020 18:57:56 +0100 Subject: [PATCH] wip: Cancel restores old dashboard --- src/dashboard/dashboard.js | 26 ++++++++++++++++++++++++-- src/widget/widget.js | 5 +++-- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/src/dashboard/dashboard.js b/src/dashboard/dashboard.js index 5b2e7bd..7180a81 100644 --- a/src/dashboard/dashboard.js +++ b/src/dashboard/dashboard.js @@ -62,7 +62,7 @@ class Dashboard extends Component { let dashboards = DashboardStore.getState() let rawDashboard = dashboards[props.match.params.dashboard - 1]; - + if (rawDashboard) { dashboard = Map(rawDashboard); @@ -163,6 +163,7 @@ class Dashboard extends Component { modalData: null, modalIndex: null, widgetChangeData: [], + widgetAddData:[], maxWidgetHeight: maxHeight || null, dropZoneHeight: maxHeight +80 || null, @@ -303,6 +304,11 @@ class Dashboard extends Component { token: this.state.sessionToken, data: widget }); + + let tempChanges = this.state.widgetAddData; + tempChanges.push(widget); + + this.setState({ widgetAddData: tempChanges}) /*let widgets = []; widgets = this.state.dashboard.get('widgets'); @@ -396,6 +402,8 @@ class Dashboard extends Component { saveEditing() { // Provide the callback so it can be called when state change is applied // TODO: Check if callback is needed + + this.state.widgetChangeData.forEach( widget => { AppDispatcher.dispatch({ type: 'widgets/start-edit', @@ -420,7 +428,21 @@ class Dashboard extends Component { } cancelEditing() { - this.setState({ editing: false, widgetChangeData: [] }); + console.log("cancelEditing the add data: "); + console.log(this.state.widgetAddData); + this.state.widgetAddData.forEach( widget => { + AppDispatcher.dispatch({ + type: 'widgets/start-remove', + data: widget, + token: this.state.sessionToken + }); + }); + AppDispatcher.dispatch({ + type: 'widgets/start-load', + token: this.state.sessionToken, + param: '?dashboardID=1' + }); + this.setState({ editing: false, widgetChangeData: [], widgetAddData: [] }); }; diff --git a/src/widget/widget.js b/src/widget/widget.js index b32f96f..0efb6dc 100644 --- a/src/widget/widget.js +++ b/src/widget/widget.js @@ -82,11 +82,12 @@ class Widget extends React.Component { if (this.state.sessionToken == null) { return; } - AppDispatcher.dispatch({ + + /*AppDispatcher.dispatch({ type: 'files/start-load', token: this.state.sessionToken, param: '?objectID=1&objectType=widget' - }); + });*/ AppDispatcher.dispatch({ type: 'simulationModels/start-load',