Merge pull request #237 from wbstack/fr/keep-prefix

m90 · web-flow · commit 3df8a5dc6d33 · 2024-01-30T10:57:00.000+01:00
fix: cleaning prefixes removes all instances instead of retaining wanted ones
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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.
diff --git a/wikibase/queryService/ui/queryHelper/QueryHelper.js b/wikibase/queryService/ui/queryHelper/QueryHelper.js
@@ -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
 	 *
