Merge pull request #51 from wbstack/addshore-wmde.5-update

Update to include changes created by addshore as part of wmde.5-update

Author: tarrow

.github/dependabot.yml

@@ -5,12 +5,8 @@ updates:
   schedule:
     interval: daily
   open-pull-requests-limit: 10
-- package-ecosystem: docker
+- package-ecosystem: npm
   directory: "/"
   schedule:
     interval: daily
   open-pull-requests-limit: 10
-  ignore:
-  - dependency-name: node
-    versions:
-    - "15"

.github/workflows/dependabot-gerrit.yml

@@ -0,0 +1,15 @@
+name: Dependabot to Gerrit
+on:
+  pull_request_target:
+    types: [opened, reopened, synchronize, closed]
+jobs:
+  open-or-update-change:
+    runs-on: ubuntu-latest
+    if: github.actor == 'dependabot[bot]'
+    steps:
+      - name: Run dependabot gerrit action
+        uses: wmde/dependabot-gerrit-action@main
+        with:
+            password: ${{ secrets.DEPENDABOT_GERRIT_PASSWORD }}
+            user: Addbot
+            email: addshorewiki+addbot-dependabot@gmail.com

.stylelintrc

@@ -3,7 +3,7 @@
 	"rules": {
 		"color-named": null,
 		"declaration-no-important": null,
-		"declaration-property-value-blacklist": null,
+		"declaration-property-unit-disallowed-list": null,
 		"no-descending-specificity": null,
 		"selector-max-id": null
 	}

Gruntfile.js

@@ -72,7 +72,8 @@ module.exports = function( grunt ) {
 		banana: {
 			all: 'i18n/',
 					options: {
-						disallowBlankTranslations: false
+						disallowBlankTranslations: false,
+						requireKeyPrefix: 'wdqs-'
 					}
 				},
 		clean: {
@@ -179,6 +180,10 @@ module.exports = function( grunt ) {
 							],
 							dest: buildFolder + '/default-config.json',
 							filter: 'isFile'
+						},
+						{// query builder dropdown image
+							src: 'wikibase/queryService/ui/304px_querybuilder_final.gif',
+							dest: buildFolder + '/',
 						}
 				]
 			}
@@ -335,7 +340,7 @@ module.exports = function( grunt ) {
 		'test', 'browser_test', 'clean', 'shell:cloneDeploy', 'clean:deploy', 'only_build'
 	] );
 	grunt.registerTask( 'deploy', [
-		'build-for-deploy', 'shell:commitDeploy', 'shell:review'
+		'build_for_deploy', 'shell:commitDeploy', 'shell:review'
 	] );
 	grunt.registerTask( 'security', [
 		'clean', 'shell:cloneDeploy', 'clean:deploy', 'only_build', 'shell:commitDeploy', 'shell:formatPatchDeploy'

default-config.json

@@ -14,7 +14,7 @@
     },
     "urlShortener": "tinyurl",
     "query-builder": {
-      "server": "https://query-builder-test.toolforge.org/"
+      "server": "https://query.wikidata.org/querybuilder/"
     }
   },
   "brand": {
@@ -27,5 +27,6 @@
     "root": "./",
     "index": "./index.html"
   },
+  "showBanner": false,
   "prefixes": {}
 }

dist/css/style.min.css

@@ -529,6 +529,7 @@ <h3 data-role="title" class="modal-title pull-left explorer-title">Explorer</h3>
 	<script src="wikibase/queryService/api/Tracking.js"></script>
 	<script src="wikibase/queryService/api/UrlShortener.js"></script>
 	<script src="wikibase/queryService/RdfNamespaces.js"></script>
+	<script src="wikibase/queryService/ui/Banner.js"></script>
 	<script src="wikibase/queryService/ui/queryHelper/QueryHelper.js"></script>
 	<script src="wikibase/queryService/ui/queryHelper/SparqlQuery.js"></script>
 	<script src="wikibase/queryService/ui/queryHelper/SelectorBox.js"></script>

dist/js/wdqs.min.js

@@ -1,41 +1,29 @@
-// https://github.com/BorderCloud/SPARQL-JAVA
-import com.bordercloud.sparql.Endpoint;
-import com.bordercloud.sparql.EndpointException;
-import java.util.ArrayList;
-import java.util.HashMap;
+// https://github.com/eclipse/rdf4j
+import org.eclipse.rdf4j.query.resultio.sparqljson.SPARQLResultsJSONWriter;
+import org.eclipse.rdf4j.repository.RepositoryException;
+import org.eclipse.rdf4j.repository.sparql.SPARQLRepository;
+import java.util.Collections;
 
-public class Main {
+/**
+ * Wikidata RDF4J SPARQL example
+ */
+public class App
+{
+    public static void main( String[] args )
+    {
+        String sparqlEndpoint = "{ENDPOINT_URL}";
+        SPARQLRepository repo = new SPARQLRepository(sparqlEndpoint);
 
-    public static void main(String[] args) {
-        String endpointUrl = "{ENDPOINT_URL}";
+        String userAgent = "Wikidata RDF4J Java Example/0.1 (https://query.wikidata.org/)";
+        repo.setAdditionalHttpHeaders( Collections.singletonMap("User-Agent", userAgent ) );
 
         String querySelect = {SPARQL_QUERY};
 
-        try {
-            HashMap data = retrieveData(endpointUrl, querySelect);
-            printResult(data, 30);
-        } catch (EndpointException eex) {
-            eex.printStackTrace();
+        try{
+            repo.getConnection().prepareTupleQuery(querySelect).evaluate(new SPARQLResultsJSONWriter(System.out));
+        } catch ( Exception exception ) {
+            exception.printStackTrace();
         }
-    }
-
-    public static HashMap<String, HashMap> retrieveData(String endpointUrl, String query) throws EndpointException {
-        Endpoint sp = new Endpoint(endpointUrl, false);
-        sp.setUserAgentRequestHeader("WDQS-Example Java"); // TODO adjust this; see https://w.wiki/CX6
-        HashMap<String, HashMap> rs = sp.query(query);
-        return rs;
-    }
 
-    public static void printResult(HashMap<String, HashMap> rs , int size) {
-      for (String variable : (ArrayList<String>) rs.get("result").get("variables")) {
-        System.out.print(String.format("%-"+size+"."+size+"s", variable ) + " | ");
-      }
-      System.out.print("\n");
-      for (HashMap value : (ArrayList<HashMap>) rs.get("result").get("rows")) {
-        for (String variable : (ArrayList<String>) rs.get("result").get("variables")) {
-          System.out.print(String.format("%-"+size+"."+size+"s", value.get(variable)) + " | ");
-        }
-        System.out.print("\n");
-      }
     }
-}
+}

embed.html

@@ -1,6 +1,7 @@
 {
 	"@metadata": {
 		"authors": [
+			"Fraxinus.cs",
 			"Pupsik-ipa",
 			"Андрей"
 		]
@@ -25,7 +26,7 @@
 	"wdqs-app-result-csv": "CSV-афаил",
 	"wdqs-dialog-examples-preview-result": "Иахәаԥштәуп алҵшәа",
 	"wdqs-dialog-key-shortcut-close-button": "Иарктәуп",
-	"wdqs-ve-filter": "Афильтр",
+	"wdqs-ve-filter": "Араӡага",
 	"wdqs-ve-show": "Иаарԥштәуп",
 	"wdqs-ve-or": "ма",
 	"wdqs-ve-sb-other": "Даҽакы",