Merge pull request #335 from Ontotext-AD/prepare-1.5.0

Prepare 1.5.0

package.json

@@ -1,6 +1,6 @@
 {
     "name": "graphdb-workbench",
-    "version": "1.5.0-RC3",
+    "version": "1.5.0",
     "description": "The web application for GraphDB APIs",
     "scripts": {
         "build": "webpack --config=webpack.config.prod.js",

src/js/angular/controllers.js

@@ -707,7 +707,8 @@ function mainCtrl($scope, $menuItems, $jwtAuth, $http, toastr, $location, $repos
         }
 
         if (!$repositories.getActiveRepository() || $repositories.getActiveRepository() === 'SYSTEM'
-            || !$scope.hasRole(UserRole.ROLE_USER)) {
+            // Don't call getQueries for Ontop type repository
+            || $repositories.isActiveRepoOntopType() || !$scope.hasRole(UserRole.ROLE_USER)) {
             // No monitoring if no active repo, the active repo is the system repo or the current user
             // isn't a repo admin.
             $scope.queryCount = 0;

src/js/angular/graphexplore/directives/domain-range-graph.directive.js

@@ -139,7 +139,7 @@ function domainRangeGraphDirective($rootScope, $window, $repositories, GraphData
          */
         function prepareForSVGImageExport() {
             // get css rules for the diagram
-            var cssRules = SVG.Export.getCSSRules("css/domain-range-graph.css");
+            var cssRules = SVG.Export.getCSSRules("css/domain-range-graph.css?v=[AIV]{version}[/AIV]");
 
             // inline css rules in a defs tag
             $("defs").append('<style type="text/css"><![CDATA[' + cssRules + ']]></style>');

src/js/angular/graphexplore/directives/rdf-class-hierarchy.directive.js

@@ -95,7 +95,7 @@ function classHierarchyDirective($rootScope, $location, GraphDataRestService, $w
          */
         function prepareForSVGImageExport() {
             // get css rules for the diagram
-            var cssRules = SVG.Export.getCSSRules("css/rdf-class-hierarchy-labels.css");
+            var cssRules = SVG.Export.getCSSRules("css/rdf-class-hierarchy-labels.css?v=[AIV]{version}[/AIV]");
             // inline css rules in a defs tag
             d3.selectAll("#main-group")
                 .append("defs");

src/js/angular/repositories/controllers.js

@@ -497,7 +497,8 @@ function AddRepositoryCtrl($scope, toastr, $repositories, $location, Upload, isE
     };
 
     $scope.isOntopRepoFileUploaded = function() {
-        return $scope.repositoryInfo.params.propertiesFile.value.length > 0
+        return $scope.repositoryInfo.params.propertiesFile &&
+                $scope.repositoryInfo.params.propertiesFile.value.length > 0
     };
 
     $scope.validateOntopPropertiesConnection = function() {
@@ -778,7 +779,8 @@ function EditRepositoryCtrl($scope, $routeParams, toastr, $repositories, $locati
     };
 
     $scope.isOntopRepoFileUploaded = function() {
-        return $scope.repositoryInfo.params.propertiesFile.value.length > 0
+        return $scope.repositoryInfo.params.propertiesFile &&
+                $scope.repositoryInfo.params.propertiesFile.value.length > 0
     };
 
     $scope.validateOntopPropertiesConnection = function() {

test-cypress/package.json

@@ -1,6 +1,6 @@
 {
     "name": "graphdb-workbench-tests",
-    "version": "1.5.0-RC3",
+    "version": "1.5.0",
     "description": "Cypress tests for GraphDB workbench",
     "scripts": {
         "start": "cypress open",