[MediaWiki-commits] [Gerrit] Show actual SQL instead of query string in db modal - change (wikimedia...dash)

[Ejegg (Code Review)]

Ejegg has submitted this change and it was merged.

Change subject: Show actual SQL instead of query string in db modal
......................................................................


Show actual SQL instead of query string in db modal

edit: actually include the data.js file. :p
edit: put return results into obj

Change-Id: Ib6e2a70aaaed70d0c574c42b02ef9e08f4d2bbab
---
M routes/data.js
M src/components/widgets/fraud-gauge/fraud-gauge.html
M src/components/widgets/fraud-gauge/fraud-gauge.js
3 files changed, 6 insertions(+), 4 deletions(-)

Approvals:
  Ejegg: Looks good to me, approved



diff --git a/routes/data.js b/routes/data.js
index 82ff0a9..77a8719 100644
--- a/routes/data.js
+++ b/routes/data.js
@@ -220,6 +220,6 @@
                        res.json( { error: 'Query error: ' + error } );
                        return;
                }
-               res.json( results );
+               res.json( { results: results, sqlQuery: sqlQuery } );
        });
 };
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.html 
b/src/components/widgets/fraud-gauge/fraud-gauge.html
index 1df020c..ed3ca18 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.html
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.html
@@ -115,7 +115,7 @@
                                 <button type="button" class="close" 
data-dismiss="modal"><span aria-hidden="true">&times;</span><span 
class="sr-only">Close</span></button>
                                 <h4 class="modal-title">Fraud Gauge SQL:</h4>
                             </div>
-                            <div class="modal-body" data-bind="text: 
queryString"></div>
+                            <div class="modal-body" data-bind="text: 
queryStringSQL"></div>
                         </div><!-- /.modal-content -->
                     </div><!-- /.modal-dialog -->
                 </div><!-- /.modal -->
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.js 
b/src/components/widgets/fraud-gauge/fraud-gauge.js
index 5ebf1d2..554fee9 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.js
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.js
@@ -47,7 +47,8 @@
     self.gaugeValue = ko.observable(0);
     self.filtersSelected = ko.observable(false);
     self.gaugeIsSetUp = ko.observable(false);
-    self.queryString = ko.observable('This widget hasn\'t been set up yet!');
+    self.queryString = ko.observable('');
+    self.queryStringSQL = ko.observable('This widget hasn\'t been set up 
yet!');
 
     //broken down data from above
     self.filters = ko.observableArray($.map(self.data.filters, function(val, 
i){return[val]}));
@@ -263,7 +264,8 @@
         $.get( '/data/fraud?' + $.param({ '$filter': self.queryString() 
}).replace(
           /\+/g, '%20' ), function ( dataget ) {
           self.gaugeIsSetUp(true);
-          self.gaugeValue(parseFloat(dataget[0].fraud_percent).toFixed(2) );
+          
self.gaugeValue(parseFloat(dataget.results[0].fraud_percent).toFixed(2) );
+          self.queryStringSQL(dataget.sqlQuery);
 
           self.gauge = c3.generate({
               bindto: '#FraudRiskScoreGauge',

-- 
To view, visit https://gerrit.wikimedia.org/r/173632
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib6e2a70aaaed70d0c574c42b02ef9e08f4d2bbab
Gerrit-PatchSet: 5
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ssmith <ssm...@wikimedia.org>
Gerrit-Reviewer: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits