From 1a4de97f84c712740353ca9622ed8bc321781f7c Mon Sep 17 00:00:00 2001 From: desislava Date: Mon, 30 Mar 2020 15:00:24 +0300 Subject: [PATCH 1/2] Prepare 1.3.0-RC4 --- package-lock.json | 2 +- package.json | 2 +- test-cypress/package-lock.json | 2 +- test-cypress/package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4c194e336..f5efde2d6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "graphdb-workbench", - "version": "1.3.0-RC3", + "version": "1.3.0-RC4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 598621337..3db4b72c9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "graphdb-workbench", - "version": "1.3.0-RC3", + "version": "1.3.0-RC4", "description": "The web application for GraphDB APIs", "scripts": { "build": "webpack --config=webpack.config.prod.js", diff --git a/test-cypress/package-lock.json b/test-cypress/package-lock.json index 7897e856d..be92768fb 100644 --- a/test-cypress/package-lock.json +++ b/test-cypress/package-lock.json @@ -1,6 +1,6 @@ { "name": "graphdb-workbench-tests", - "version": "1.3.0-RC3", + "version": "1.3.0-RC4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/test-cypress/package.json b/test-cypress/package.json index baaec6aba..1671aed0a 100644 --- a/test-cypress/package.json +++ b/test-cypress/package.json @@ -1,6 +1,6 @@ { "name": "graphdb-workbench-tests", - "version": "1.3.0-RC3", + "version": "1.3.0-RC4", "description": "Cypress tests for GraphDB workbench", "scripts": { "start": "cypress open", From d9d47e500d426dad3aab73a7f0ab77d9a0b559fd Mon Sep 17 00:00:00 2001 From: desislava Date: Mon, 30 Mar 2020 15:26:20 +0300 Subject: [PATCH 2/2] GDB-4395 Fix autocomplete triples in similarity search --- .../similarity/controllers/similarity-list.controller.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/js/angular/similarity/controllers/similarity-list.controller.js b/src/js/angular/similarity/controllers/similarity-list.controller.js index 029ce3b58..204129493 100644 --- a/src/js/angular/similarity/controllers/similarity-list.controller.js +++ b/src/js/angular/similarity/controllers/similarity-list.controller.js @@ -18,6 +18,10 @@ function SimilarityCtrl($scope, $interval, toastr, $repositories, ModalService, }; const iriForQuery = function (iri) { + // Do not put brackets on nested triples + if (iri.startsWith("<<") && iri.endsWith(">>")) { + return iri; + } return '<' + iri + '>'; }; @@ -195,7 +199,7 @@ function SimilarityCtrl($scope, $interval, toastr, $repositories, ModalService, $scope.lastSearch.termOrSubject = termOrSubject; - const headers = {Accept: 'application/sparql-results+json'}; + const headers = {Accept: 'application/x-sparqlstar-results+json, application/sparql-results+json;q=0.9, */*;q=0.8'}; let sparqlQuery; if (searchType === 'searchAnalogical') { sparqlQuery = ($scope.selected.analogicalQuery) ? $scope.selected.analogicalQuery : $scope.searchQueries['analogical'];