Milimetric has submitted this change and it was merged.
Change subject: Add support for displayName config parameter
......................................................................
Add support for displayName config parameter
Bug: T134924
Change-Id: I16b62bed0ec99905c209dedd3886ccdda80389ff
---
M src/components/metric-selector/bindings.js
M src/components/metric-selector/metric-selector.js
M test/components/metric-selector.js
3 files changed, 11 insertions(+), 4 deletions(-)
Approvals:
Milimetric: Verified; Looks good to me, approved
diff --git a/src/components/metric-selector/bindings.js
b/src/components/metric-selector/bindings.js
index 290c32f..dae8669 100644
--- a/src/components/metric-selector/bindings.js
+++ b/src/components/metric-selector/bindings.js
@@ -14,8 +14,9 @@
return {controlsDescendantBindings: true};
},
update: function(element, valueAccessor) {
- var metric = ko.unwrap(valueAccessor());
- ko.utils.setTextContent(element, metric.name.replace(re, '$1 $2'));
+ var metric = ko.unwrap(valueAccessor()),
+ metricName = metric.displayName || metric.name.replace(re, '$1
$2');
+ ko.utils.setTextContent(element, metricName);
}
};
});
diff --git a/src/components/metric-selector/metric-selector.js
b/src/components/metric-selector/metric-selector.js
index 7b6c1ce..afe6e7e 100644
--- a/src/components/metric-selector/metric-selector.js
+++ b/src/components/metric-selector/metric-selector.js
@@ -46,7 +46,8 @@
var defaultMetrics = [];
metrics.forEach(function (category) {
category.metrics.forEach(function (metric) {
- if ($.inArray(metric.name, names) >= 0) {
+ if ($.inArray(metric.name, names) >= 0 ||
+ $.inArray(metric.displayName, names) >= 0) {
defaultMetrics.push(metric);
}
});
diff --git a/test/components/metric-selector.js
b/test/components/metric-selector.js
index b372fcf..a27878a 100644
--- a/test/components/metric-selector.js
+++ b/test/components/metric-selector.js
@@ -10,7 +10,7 @@
it('should process params', function() {
var metricA = {name: 'a', submetric: 'a_1'},
metricB = {name: 'b', submetric: 'b_1'},
- metricC = {name: 'c', submetric: 'c_1'},
+ metricC = {name: 'c', submetric: 'c_1', displayName:
'display'},
metricsConfig = [
{name: 'Something', metrics: [metricA, metricB]},
{name: 'Else', metrics: [metricC]},
@@ -35,6 +35,11 @@
instance = new MetricSelector(params);
expect(instance.addedMetrics()).toEqual([metricB]);
+ // both name or displayName can be used to set metrics
+ params.defaultSelection = ['display'];
+ instance = new MetricSelector(params);
+ expect(instance.addedMetrics()).toEqual([metricC]);
+
// defaultSelection can be observable, and the instance reacts to
changes
params.defaultSelection = ko.observable();
instance = new MetricSelector(params);
--
To view, visit https://gerrit.wikimedia.org/r/288051
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I16b62bed0ec99905c209dedd3886ccdda80389ff
Gerrit-PatchSet: 1
Gerrit-Project: analytics/dashiki
Gerrit-Branch: master
Gerrit-Owner: Mforns <[email protected]>
Gerrit-Reviewer: Milimetric <[email protected]>
Gerrit-Reviewer: Nuria <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
