Yurik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/325143
Change subject: Updated shared graph lib - tabular support
......................................................................
Updated shared graph lib - tabular support
Change-Id: I5aaee38092fb277fc2409e07f51c1c3a808d333a
---
M lib/graph2.compiled.js
1 file changed, 9 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Graph
refs/changes/43/325143/1
diff --git a/lib/graph2.compiled.js b/lib/graph2.compiled.js
index bd95538..d1bb42e 100644
--- a/lib/graph2.compiled.js
+++ b/lib/graph2.compiled.js
@@ -495,7 +495,6 @@
* Performs post-processing of the data requested by the graph's spec, and
throw on error
*/
VegaWrapper.prototype.parseDataOrThrow = function parseDataOrThrow(data, opt) {
- var result;
switch (opt.graphProtocol) {
case 'wikiapi:':
data = this.parseMWApiResponse(data);
@@ -510,30 +509,14 @@
break;
case 'tabular:':
data = this.parseMWApiResponse(data).jsondata;
- result = [];
- data.rows.forEach(function(v) {
- var row = {};
- for (var i = 0; i < data.headers.length; i++) {
- row[data.headers[i]] = v[i];
+ var fields = data.schema.fields.map(function(v) { return v.name;
});
+ data.data = data.data.map(function(v) {
+ var row = {}, i;
+ for (i = 0; i < fields.length; i++) {
+ row[fields[i]] = v[i];
}
- result.push(row);
+ return row;
});
- data = result;
- break;
- case 'tabularinfo:':
- data = this.parseMWApiResponse(data).jsondata;
- result = {
- license: data.license,
- info: data.info,
- types: {},
- titles: {},
- count: data.rows ? data.rows.length : 0
- };
- for (var i = 0; i < data.headers.length; i++) {
- result.types[data.headers[i]] = data.types[i];
- result.titles[data.headers[i]] = data.titles[i];
- }
- data = result;
break;
case 'wikidatasparql:':
data = JSON.parse(data);
@@ -568,10 +551,10 @@
'use strict';
/* global require */
- var wrapper,
- VegaWrapper = require( 'graph-shared' );
+ var VegaWrapper = require( 'graph-shared' );
- wrapper = new VegaWrapper( {
+ // eslint-disable-next-line no-new
+ new VegaWrapper( {
datalib: vg.util,
useXhr: true,
isTrusted: mw.config.get( 'wgGraphIsTrusted' ),
--
To view, visit https://gerrit.wikimedia.org/r/325143
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5aaee38092fb277fc2409e07f51c1c3a808d333a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Graph
Gerrit-Branch: master
Gerrit-Owner: Yurik <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
