[MediaWiki-commits] [Gerrit] Fraud gauge widget refactor - change (wikimedia...dash)
Ejegg has submitted this change and it was merged.
Change subject: Fraud gauge widget refactor
..
Fraud gauge widget refactor
fixed saving
fixed to use logStateChange
fixed linting errors.
PS: I can't figure out why the save button doesn't logically hide on
first load. Ideas?
Change-Id: I97821c63e25ab10bc08ea3cb5ea5de0204eb0db0
---
M src/app/widgetBase.js
M src/bower_modules
M src/components/widgets/fraud-gauge/fraud-gauge.html
M src/components/widgets/fraud-gauge/fraud-gauge.js
M src/css/style.css
5 files changed, 284 insertions(+), 275 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
diff --git a/src/app/widgetBase.js b/src/app/widgetBase.js
index ba71d70..92b46b7 100644
--- a/src/app/widgetBase.js
+++ b/src/app/widgetBase.js
@@ -16,6 +16,7 @@
self.retrievedResults = ko.observable();
self.queryStringSQL = ko.observable('This widget hasn\'t
been set up yet!');
+ self.tempConfig = ko.observable();
self.config = params.configuration || {};
self.instanceID = params.widgetInstance;
self.widgetCode = params.widgetCode;
@@ -39,6 +40,7 @@
};
self.saveWidgetConfig = function(){
+
if( self.instanceID ){
$.ajax({
method: 'PUT',
@@ -50,6 +52,7 @@
}),
success: function( data ) {
self.chartSaved(true);
+ self.logStateChange(false);
}
});
} else {
@@ -64,6 +67,7 @@
success: function( data ) {
self.instanceID = data.id;
self.chartSaved(true);
+ self.logStateChange(false);
}
});
}
diff --git a/src/bower_modules b/src/bower_modules
index 1323394..2a4a5f0 16
--- a/src/bower_modules
+++ b/src/bower_modules
-Subproject commit 132339455dc0bf26fe7599f2bb57c70800f92b9f
+Subproject commit 2a4a5f03b54988ec09e76ef69362c39655481918
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.html
b/src/components/widgets/fraud-gauge/fraud-gauge.html
index e3b9fed..ccd42ec 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.html
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.html
@@ -1,11 +1,13 @@
div class=row
-div data-bind=attr: {class: columnSize}
+div data-bind=attr: { class: columnSize }
div class=panel panel-purple id=fraudGaugeWidget
div class=panel-heading
span data-bind='text: title'/span
div class=btn-group btn-group-xs pull-right
button type=button class=btn btn-default dropdown-toggle
data-toggle=modal data-target=#sqlModali class=fa
fa-database/i/button
-button type=button class=btn btn-default
data-toggle=modal data-target=#modifyModali class=fa
fa-edit/i/button
+button type=button class=btn btn-default
data-toggle=modal data-target=#modifyModal data-bind=click:
renderPercentRangeCharti class=fa fa-edit/i/button
+button type=button class=btn btn-danger
data-bind=visible: !chartSaved() optionStateChanged, click:
saveWidgetConfigi class=fa fa-save/i/button
+button type=button class=btn btn-success
data-bind=visible: chartSaved !optionStateChanged()i class=fa
fa-save/i Saved/button
/div
/div
div class=panel-body
@@ -14,14 +16,14 @@
div class=gauge
div class=row
-h3 class=text-center data-bind=visible:
gaugeIsSetUp(), text: selectedTimePeriod/h3
+h3 class=text-center data-bind=visible: configSet,
text: selectedTimePeriod/h3
/div
-div class=row id=specifiedFraudGauge
data-bind=visible: gaugeIsSetUp
+div class=row id=specifiedFraudGauge
data-bind=visible: configSet
div id=FraudRiskScoreGauge/div
/div
-div class=row id=unspecifiedFraudGauge
data-bind=visible: !gaugeIsSetUp()
+div class=row id=unspecifiedFraudGauge
data-bind=visible: !configSet()
div class=col-md-12
div class=setupAsk
h3This widget hasn't been set up yet./h3
@@ -30,7 +32,7 @@
/div
[MediaWiki-commits] [Gerrit] Fraud gauge widget refactor - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196614
Change subject: Fraud gauge widget refactor
..
Fraud gauge widget refactor
Change-Id: I97821c63e25ab10bc08ea3cb5ea5de0204eb0db0
---
M src/app/widgetBase.js
M src/components/widgets/fraud-gauge/fraud-gauge.html
M src/components/widgets/fraud-gauge/fraud-gauge.js
M src/css/style.css
4 files changed, 269 insertions(+), 273 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/14/196614/1
diff --git a/src/app/widgetBase.js b/src/app/widgetBase.js
index ba71d70..30a52c1 100644
--- a/src/app/widgetBase.js
+++ b/src/app/widgetBase.js
@@ -26,6 +26,7 @@
self.chartWidth = ko.observable('900');
self.chartHeight= ko.observable('550');
self.chartLoaded= ko.observable(false);
+ self.chartModified = ko.observable(false);
self.getChartData = function( qs ){
self.dataLoading(true);
@@ -50,6 +51,7 @@
}),
success: function( data ) {
self.chartSaved(true);
+ self.chartModified(false);
}
});
} else {
@@ -64,6 +66,7 @@
success: function( data ) {
self.instanceID = data.id;
self.chartSaved(true);
+ self.chartModified(false);
}
});
}
diff --git a/src/components/widgets/fraud-gauge/fraud-gauge.html
b/src/components/widgets/fraud-gauge/fraud-gauge.html
index e3b9fed..633a953 100644
--- a/src/components/widgets/fraud-gauge/fraud-gauge.html
+++ b/src/components/widgets/fraud-gauge/fraud-gauge.html
@@ -1,11 +1,13 @@
div class=row
-div data-bind=attr: {class: columnSize}
+div class=col-md-6
div class=panel panel-purple id=fraudGaugeWidget
div class=panel-heading
span data-bind='text: title'/span
div class=btn-group btn-group-xs pull-right
button type=button class=btn btn-default dropdown-toggle
data-toggle=modal data-target=#sqlModali class=fa
fa-database/i/button
button type=button class=btn btn-default
data-toggle=modal data-target=#modifyModali class=fa
fa-edit/i/button
+button type=button class=btn btn-danger
data-bind=visible: chartModified, click: saveWidgetConfigi class=fa
fa-save/i/button
+button type=button class=btn btn-success
data-bind=visible: chartSaved !chartModified()i class=fa fa-save/i
Saved/button
/div
/div
div class=panel-body
@@ -14,14 +16,14 @@
div class=gauge
div class=row
-h3 class=text-center data-bind=visible:
gaugeIsSetUp(), text: selectedTimePeriod/h3
+h3 class=text-center data-bind=visible:
chartSaved, text: selectedTimePeriod/h3
/div
-div class=row id=specifiedFraudGauge
data-bind=visible: gaugeIsSetUp
+div class=row id=specifiedFraudGauge
data-bind=visible: chartSaved
div id=FraudRiskScoreGauge/div
/div
-div class=row id=unspecifiedFraudGauge
data-bind=visible: !gaugeIsSetUp()
+div class=row id=unspecifiedFraudGauge
data-bind=visible: !chartSaved()
div class=col-md-12
div class=setupAsk
h3This widget hasn't been set up yet./h3
@@ -30,7 +32,7 @@
/div
/div
-div class=row id=fraudGaugeMeta data-bind=visible:
gaugeIsSetUp()
+div class=row id=fraudGaugeMeta data-bind=visible:
chartSaved
p class=text-centerspan data-bind=visible:
filtersSelected()By: /spanspan class=label label-info data-bind=text:
selectedFilters/span/p
/div
@@ -46,14 +48,14 @@
form role=form class=fraudForm
div class=form-group
div class=well
-label
for=fraudPercentSliderFraud Percent Ranges/label
+label
for=fraudPercentRangesFraud Percent Ranges/label
