Skip to content

fix: cleaning prefixes removes all instances instead of retaining wanted ones #237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
m90 merged 3 commits into from
Jan 30, 2024
Merged

fix: cleaning prefixes removes all instances instead of retaining wanted ones #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bdccc8e
fix: cleaning prefixes removes all instances instead of retaining wan…
m90 Jan 3, 2024
94078da
fix: do not try to clean prefixes at all
m90 Jan 29, 2024
230cb74
docs: add CHANGELOG
m90 Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# WBStack queryservice-ui

## 1.5

Remove custom cleaning of prefixes on Query Formatting (https://phabricator.wikimedia.org/T347023)

## 1.4

Feburary 2022 updates from upstream.
Expand Down
34 changes: 1 addition & 33 deletions wikibase/queryService/ui/queryHelper/QueryHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,44 +97,12 @@ wikibase.queryService.ui.queryHelper.QueryHelper = ( function( $, wikibase, _ )
*/
SELF.prototype.getQuery = function() {
try {
var q = this._query.getQueryString();
q = this._cleanQueryPrefixes( q ).trim();
return q.trim();
return this._query.getQueryString().trim();
} catch ( e ) {
return null;
}
};

/**
* Workaround for https://phabricator.wikimedia.org/T133316
*
* @private
*/
SELF.prototype._cleanQueryPrefixes = function( query ) {
var prefixRegex = /PREFIX ([a-z]+): <(.*)>/gi,
m,
prefixes = {},
cleanQuery = query.replace( prefixRegex, '' ).replace( /\n+/g, '\n' );

while ( ( m = prefixRegex.exec( query ) ) ) {
var prefix = m[1];
var uri = m[2].replace( /[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&' );

var newQuery = cleanQuery.replace( new RegExp( '<' + uri + '([^/>#]+?)>', 'gi' ),
prefix + ':$1' );

if ( cleanQuery !== newQuery ) {
cleanQuery = newQuery;
if ( !wikibase.queryService.RdfNamespaces.STANDARD_PREFIXES[prefix] ) {
prefixes[m[0]] = true;
}
}
}

cleanQuery = Object.keys( prefixes ).join( '\n' ) + '\n\n' + cleanQuery.trim();
return cleanQuery;
};

/**
* Draw visual editor to given element
*
Expand Down