Mforns has uploaded a new change for review.
https://gerrit.wikimedia.org/r/286424
Change subject: Fix issues in metrics-by-project breakdown
......................................................................
Fix issues in metrics-by-project breakdown
There was a problem in the comunitation between wikimetrics.js and
dygraphs.js around the line patterns used for breakdowns. The var
used to store the used projects was not resetting properly when
the dataset changed.
Bug: T133944
Change-Id: I05fc69490f54e9e56e3f69f7d395c2ba45a5977f
---
M src/components/visualizers/dygraphs-timeseries/bindings.js
M src/components/visualizers/wikimetrics/wikimetrics.js
2 files changed, 15 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/dashiki
refs/changes/24/286424/1
diff --git a/src/components/visualizers/dygraphs-timeseries/bindings.js
b/src/components/visualizers/dygraphs-timeseries/bindings.js
index 9d2d8ca..add65e5 100644
--- a/src/components/visualizers/dygraphs-timeseries/bindings.js
+++ b/src/components/visualizers/dygraphs-timeseries/bindings.js
@@ -25,7 +25,7 @@
data = ko.unwrap(val.data),
annotations = ko.unwrap(val.annotations),
colors = val.colors,
- patterns = val.patterns,
+ patterns = ko.unwrap(val.patterns),
graph = $element.find('div.graph')[0];
if (data && data.header.length) {
diff --git a/src/components/visualizers/wikimetrics/wikimetrics.js
b/src/components/visualizers/wikimetrics/wikimetrics.js
index 938f9dc..a25316f 100644
--- a/src/components/visualizers/wikimetrics/wikimetrics.js
+++ b/src/components/visualizers/wikimetrics/wikimetrics.js
@@ -94,19 +94,21 @@
return visualizer.colors[i % visualizer.colors.length];
};
- this.patternProject = [];
+ // The patternScale assigns patterns to the labels passed,
+ // and remembers them so that they are reusable.
+ // Whenever the dataset changes, resets to empty.
+ this.patternScale = ko.computed(function () {
+ ko.unwrap(this.datasets);
+ var patternProject = [];
-
- // patterns differentiate 'all-access' versus 'mobile-web'
- // data for one project
- this.patternScale = function (patternLabel) {
- // repeat pattern if more than dashes.length
- var i = _.indexOf(visualizer.patternProject, patternLabel);
- if (i === -1) {
- i = visualizer.patternProject.push(patternLabel) - 1;
- }
- return visualizer.patterns[i % visualizer.patterns.length];
- }
+ return function (patternLabel) {
+ var i = _.indexOf(patternProject, patternLabel);
+ if (i === -1) {
+ i = patternProject.push(patternLabel) - 1;
+ }
+ return visualizer.patterns[i % visualizer.patterns.length];
+ };
+ }, this);
this.format = numberUtils.numberFormatter('kmb');
--
To view, visit https://gerrit.wikimedia.org/r/286424
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I05fc69490f54e9e56e3f69f7d395c2ba45a5977f
Gerrit-PatchSet: 1
Gerrit-Project: analytics/dashiki
Gerrit-Branch: master
Gerrit-Owner: Mforns <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
