jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/361056 )
Change subject: Support setting edge labels in graph view
......................................................................
Support setting edge labels in graph view
The special variable name ‘?edgeLabel’ is used for the edge label. To
support this, the edge variable is persisted across iterations over the
results, just like the node variable. This is not without problems: if
the label variable appears before the variable for the node to link to,
then edge refers to the previous edge, and edge labels will be shifted
(on the wrong edge). I think this is acceptable for now, since unusual
variable orders can already cause other problems (e. g., the image
variable has to appear after the first node variable).
Bug: T168715
Change-Id: Iebc3288a34d523de61b332a0ab7e4a1f752ad1f1
---
M wikibase/queryService/ui/resultBrowser/GraphResultBrowser.js
1 file changed, 7 insertions(+), 2 deletions(-)
Approvals:
Jonas Kress (WMDE): Looks good to me, approved
Lucas Werkmeister (WMDE): Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/wikibase/queryService/ui/resultBrowser/GraphResultBrowser.js
b/wikibase/queryService/ui/resultBrowser/GraphResultBrowser.js
index f2e3fa3..6c14ea5 100644
--- a/wikibase/queryService/ui/resultBrowser/GraphResultBrowser.js
+++ b/wikibase/queryService/ui/resultBrowser/GraphResultBrowser.js
@@ -125,7 +125,8 @@
edges = {},
rows = [],
format = this._getFormatter(),
- node = {};
+ node = {},
+ edge = {};
this._iterateResult( function( field, key, row, rowIndex ) {
if ( !field || !field.value ) {
@@ -141,7 +142,7 @@
title: label
};
if ( rows[rowIndex] ) {// create new edge
- var edge = {
+ edge = {
from: rows[rowIndex],
to: nodeId
};
@@ -174,6 +175,10 @@
node.font = { color: foreground };
}
}
+
+ if ( key === 'edgeLabel' ) {
+ edge.label = field.value;
+ }
} );
return {
--
To view, visit https://gerrit.wikimedia.org/r/361056
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iebc3288a34d523de61b332a0ab7e4a1f752ad1f1
Gerrit-PatchSet: 4
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE) <[email protected]>
Gerrit-Reviewer: Jonas Kress (WMDE) <[email protected]>
Gerrit-Reviewer: Lucas Werkmeister (WMDE) <[email protected]>
Gerrit-Reviewer: Smalyshev <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
