Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/195767
Change subject: Set dropdown initial values to saved values
......................................................................
Set dropdown initial values to saved values
And re-use submit function to get initial data
Change-Id: I64c74faed90923b8851695676745bca60faef85f
---
M src/app/widgetBase.js
M src/components/widgets/x-by-y/x-by-y.js
2 files changed, 16 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/67/195767/1
diff --git a/src/app/widgetBase.js b/src/app/widgetBase.js
index 2fdf2fd..3def589 100644
--- a/src/app/widgetBase.js
+++ b/src/app/widgetBase.js
@@ -33,7 +33,6 @@
};
self.saveWidgetConfig = function(){
-
if( self.instanceID ){
$.ajax({
method: 'PUT',
@@ -207,7 +206,7 @@
self.chartSaved(false);
};
- return(this);
+ return this;
}
return( WidgetBase );
diff --git a/src/components/widgets/x-by-y/x-by-y.js
b/src/components/widgets/x-by-y/x-by-y.js
index 7a42f96..e45843b 100644
--- a/src/components/widgets/x-by-y/x-by-y.js
+++ b/src/components/widgets/x-by-y/x-by-y.js
@@ -12,21 +12,6 @@
WidgetBase.call( this, params );
var self = this;
-
- if ( self.chartSaved() ) {
- var chartDataCall =
self.getChartData(self.config.queryString);
-
- $.when( chartDataCall ).then( function( dataArray ){
- self.retrievedResults(dataArray.results);
- self.dataLoading(false);
- self.preDataLoading(false);
-
- self.chartData =
self.processData(self.retrievedResults(), params.configuration.timeBreakout);
-
- self.makeChart(self.chartData);
- });
- }
-
self.showSlice = ko.observable();
self.bySlice = ko.observable();
self.timeChoice = ko.observable();
@@ -298,6 +283,8 @@
//populate user choices dynamically
self.populateChoices = (function(){
+ //Populating the dropdowns may reset this to false;
+ var wasSaved = self.chartSaved();
//populate y slices
$.get( 'metadata/x-by-y', function(reqData){
self.metadata = reqData;
@@ -324,7 +311,10 @@
self.xSlices(xArray);
self.timeChoices(timeArray);
self.groupChoices(groupArray);
-
+ if ( wasSaved ) {
+ self.timeChoice(
self.config.timeBreakout );
+ self.chartSaved( true );
+ }
});
})();
@@ -338,6 +328,7 @@
self.queryRequest.timeBreakout = self.timeChoice();
self.queryString =
self.convertToQuery(self.queryRequest);
+ self.config.showSlice = self.showSlice();
self.config.queryString = self.queryString;
self.config.timeBreakout =
self.queryRequest.timeBreakout;
self.config.chartData = self.chartData;
@@ -347,19 +338,25 @@
$.when( chartDataCall ).then( function( dataArray ){
self.retrievedResults(dataArray.results);
self.dataLoading(false);
+ self.preDataLoading(false);
self.chartData =
self.processData(self.retrievedResults(), self.timeChoice());
self.makeChart(self.chartData);
$('#loadingModal').modal('hide');
- self.chartSaved(false);
});
};
- return(this);
+ if ( self.chartSaved() ) {
+ self.showSlice( self.config.showSlice );
+ self.timeChoice( self.config.timeBreakout );
+ self.submitXY();
+ }
+
+ return this;
}
--
To view, visit https://gerrit.wikimedia.org/r/195767
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I64c74faed90923b8851695676745bca60faef85f
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg <eeggles...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
