jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/387800 )
Change subject: Add support for hiding columns in formatRow
......................................................................
Add support for hiding columns in formatRow
This adds a new `hide` option for result views, listing variables which
should not appear in a result block formatted by formatRow() (which is
used by the Map, Image Grid and Timeline result views).
Example:
#defaultView:Map{"hide": "?coordinates"}
#defaultView:Map{"hide": ["?rgb", "?shape"]}
Change-Id: I3c6ec22a1585f6e3e799725b36d4cc9b7853c24a
---
M wikibase/queryService/ui/resultBrowser/helper/FormatterHelper.js
M wikibase/tests/queryService/ui/resultBrowser/helper/FormatterHelper.test.js
2 files changed, 27 insertions(+), 1 deletion(-)
Approvals:
Smalyshev: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wikibase/queryService/ui/resultBrowser/helper/FormatterHelper.js
b/wikibase/queryService/ui/resultBrowser/helper/FormatterHelper.js
index 6b6f4bf..0ea5bc5 100644
--- a/wikibase/queryService/ui/resultBrowser/helper/FormatterHelper.js
+++ b/wikibase/queryService/ui/resultBrowser/helper/FormatterHelper.js
@@ -69,7 +69,7 @@
$result = $( '<div/>' );
$.each( row, function( key, value ) {
- if ( self._isLabelField( key, row ) ) {
+ if ( self._isLabelField( key, row ) ||
self._isHiddenField( key ) ) {
return;
}
@@ -93,6 +93,15 @@
};
/**
+ * @param {string} key
+ * @return {boolean}
+ * @private
+ */
+ SELF.prototype._isHiddenField = function( key ) {
+ return this.getOptions().getColumnNames( 'hide', [] ).indexOf(
key ) !== -1;
+ };
+
+ /**
* @param {object} row
* @param {string} key
* @return {string|null}
diff --git
a/wikibase/tests/queryService/ui/resultBrowser/helper/FormatterHelper.test.js
b/wikibase/tests/queryService/ui/resultBrowser/helper/FormatterHelper.test.js
index b08858a..ee31e01 100644
---
a/wikibase/tests/queryService/ui/resultBrowser/helper/FormatterHelper.test.js
+++
b/wikibase/tests/queryService/ui/resultBrowser/helper/FormatterHelper.test.js
@@ -86,4 +86,21 @@
} );
} );
+ QUnit.test( '_isHiddenField', function( assert ) {
+ var Options = wb.queryService.ui.resultBrowser.helper.Options;
+
+ helper.setOptions( new Options( {} ) );
+ assert.strictEqual( helper._isHiddenField( 'foo' ), false );
+
+ helper.setOptions( new Options( { hide: '?bar' } ) );
+ assert.strictEqual( helper._isHiddenField( 'bar' ), true );
+
+ helper.setOptions( new Options( { hide: [ '?bar', '?baz' ] } )
);
+ assert.strictEqual( helper._isHiddenField( 'foo' ), false );
+ assert.strictEqual( helper._isHiddenField( 'bar' ), true );
+ assert.strictEqual( helper._isHiddenField( 'baz' ), true );
+
+ helper.setOptions( new Options( {} ) );
+ } );
+
}( QUnit, wikibase ) );
--
To view, visit https://gerrit.wikimedia.org/r/387800
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3c6ec22a1585f6e3e799725b36d4cc9b7853c24a
Gerrit-PatchSet: 2
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE) <[email protected]>
Gerrit-Reviewer: Jonas Kress (WMDE) <[email protected]>
Gerrit-Reviewer: Smalyshev <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
