GDB-6329 - add new license is expired message

src/js/angular/core/directives.js

@@ -258,9 +258,9 @@ function multiRequired() {
 
 const SEARCH_DISPLAY_TYPE = {table: 'table', visual: 'visual'};
 
-searchResourceInput.$inject = ['$location', 'toastr', 'ClassInstanceDetailsService', 'AutocompleteRestService', '$rootScope', '$q', '$sce', 'LocalStorageAdapter', 'LSKeys', '$repositories', '$translate'];
+searchResourceInput.$inject = ['$location', 'toastr', 'ClassInstanceDetailsService', 'AutocompleteRestService', '$rootScope', '$q', '$sce', 'LocalStorageAdapter', 'LSKeys', '$repositories', '$translate', '$licenseService'];
 
-function searchResourceInput($location, toastr, ClassInstanceDetailsService, AutocompleteRestService, $rootScope, $q, $sce, LocalStorageAdapter, LSKeys, $repositories, $translate) {
+function searchResourceInput($location, toastr, ClassInstanceDetailsService, AutocompleteRestService, $rootScope, $q, $sce, LocalStorageAdapter, LSKeys, $repositories, $translate, $licenseService) {
     return {
         restrict: 'EA',
         scope: {
@@ -324,7 +324,7 @@ function searchResourceInput($location, toastr, ClassInstanceDetailsService, Aut
             };
 
             $scope.$watch('namespacespromise', function () {
-                if (angular.isDefined($scope.namespacespromise)) {
+                if (angular.isDefined($scope.namespacespromise) && $scope.isLicenseValid()) {
                     $scope.namespacespromise.success(function (data) {
                         element.namespaces = data.results.bindings.map(function (e) {
                             return {
@@ -339,6 +339,10 @@ function searchResourceInput($location, toastr, ClassInstanceDetailsService, Aut
                 }
             });
 
+            $scope.isLicenseValid = function() {
+                return $licenseService.isLicenseValid();
+            }
+
             $scope.$watch('autocompletepromisestatus', function () {
                 if (!$repositories.isActiveRepoFedXType() && angular.isDefined($scope.autocompletepromisestatus)) {
                     $scope.autocompletepromisestatus.success(function (response) {

src/js/angular/core/services/license.service.js

@@ -23,6 +23,8 @@ function licenseService($rootScope, LicenseRestService, $translate) {
                 that.loadingLicense = false;
                 updateProductType(that.license);
             });
+        }). finally(function () {
+            $rootScope.$broadcast('license.set')
         });
     };
 

src/js/angular/core/services/repositories.service.js

@@ -419,4 +419,11 @@ repositories.service('$repositories', ['$http', 'toastr', '$rootScope', '$timeou
                 that.init();
             }
         });
+
+        window.addEventListener('load', function () {
+            that.repository = {
+                id: localStorage.getItem(that.repositoryStorageName) || '',
+                location: localStorage.getItem(that.repositoryStorageLocationName) || ''
+            };
+        });
     }]);

src/js/angular/explore/controllers.js

@@ -2,6 +2,7 @@ import 'angular/utils/file-types';
 import YASR from 'lib/yasr.bundled';
 import {saveAs} from 'lib/FileSaver-patch';
 import {decodeHTML} from "../../../app";
+import 'angular/core/services/license.service';
 
 const modules = [
     'ngCookies',
@@ -11,7 +12,8 @@ const modules = [
     'graphdb.framework.core',
     'graphdb.framework.core.services.repositories',
     'graphdb.framework.explore.services',
-    'graphdb.workbench.utils.filetypes'
+    'graphdb.workbench.utils.filetypes',
+    'graphdb.framework.core.services.licenseService'
 ];
 
 angular
@@ -82,9 +84,9 @@ function ExploreCtrl($scope, $http, $location, toastr, $routeParams, $repositori
     };
 
     $scope.$watch(function () {
-        return $repositories.getActiveRepository();
+            return $repositories.getActiveRepository();
     }, function () {
-        if ($scope.getActiveRepository()) {
+        if ($scope.getActiveRepository() && $scope.isLicenseValid()) {
             if ($scope.usedPrefixes) {
                 $scope.loadResource();
             } else {

src/js/angular/graphexplore/controllers/dependencies-chord.controller.js

@@ -22,7 +22,9 @@ const allGraphs = {
     }
 };
 Object.defineProperty(global, 'allGraphs', {
-    get: () => {return allGraphs;}
+    get: () => {
+        return allGraphs;
+    }
 });
 
 angular
@@ -145,7 +147,7 @@ function DependenciesChordCtrl($scope, $rootScope, $repositories, toastr, $timeo
                 }
                 if ($scope.status.indexOf('ERROR;') === 0) {
                     $scope.status = STATUS.ERROR;
-                    toastr.error($translate.instant('graphexplore.error.dependencies.calc', {error:$scope.status.substring('ERROR;'.length)}));
+                    toastr.error($translate.instant('graphexplore.error.dependencies.calc', {error: $scope.status.substring('ERROR;'.length)}));
                 }
             })
             .error(function (data) {
@@ -208,7 +210,7 @@ function DependenciesChordCtrl($scope, $rootScope, $repositories, toastr, $timeo
 
     $scope.$watch('direction', function () {
         if (!$repositories.getActiveRepository() ||
-                $scope.isSystemRepository() || $repositories.isActiveRepoFedXType()) {
+            $scope.isSystemRepository() || $repositories.isActiveRepoFedXType() || !$scope.isLicenseValid()) {
             return;
         }
         initView();
@@ -239,7 +241,7 @@ function DependenciesChordCtrl($scope, $rootScope, $repositories, toastr, $timeo
         GraphDataRestService.calculateRelationships(selectedGraph.contextID.uri)
             .success(function (data) {
                 if (data.indexOf('ERROR;') === 0) {
-                    toastr.error($translate.instant('graphexplore.error.dependencies.calc', {error:$scope.status.substring('ERROR;'.length)}));
+                    toastr.error($translate.instant('graphexplore.error.dependencies.calc', {error: $scope.status.substring('ERROR;'.length)}));
                 } else {
                     getRelationshipsStatus();
                 }
@@ -301,6 +303,11 @@ function DependenciesChordCtrl($scope, $rootScope, $repositories, toastr, $timeo
             $scope.status = STATUS.NO_REPO;
             return;
         }
+
+        if (!$scope.isLicenseValid()) {
+            return;
+        }
+
         initView();
     }
 

src/js/angular/graphexplore/controllers/graphs-visualizations.controller.js

@@ -1111,7 +1111,7 @@ function GraphsVisualizationsCtrl($scope, $rootScope, $repositories, $licenseSer
     // time but then we'll be called again by the event, so we need the above flag to avoid double
     // initialization and weirdness.
     function initForRepository(newRepo) {
-        if (!$repositories.getActiveRepository() || $scope.hasInitedRepository && !newRepo) {
+        if (!$scope.isLicenseValid() || !$repositories.getActiveRepository() || $scope.hasInitedRepository && !newRepo) {
             return;
         }
 
@@ -1134,12 +1134,12 @@ function GraphsVisualizationsCtrl($scope, $rootScope, $repositories, $licenseSer
 
                 checkAutocompleteStatus();
             }).error(function (data) {
-                toastr.error(getError(data), $translate.instant('graphexplore.error.view.will.not.work'));
+                    toastr.error(getError(data), $translate.instant('graphexplore.error.view.will.not.work'));
             });
     }
 
     function checkAutocompleteStatus() {
-        if ($licenseService.isLicenseValid()) {
+        if ($scope.isLicenseValid()) {
             $scope.getAutocompletePromise = AutocompleteRestService.checkAutocompleteStatus();
         }
     }

src/js/angular/graphexplore/controllers/rdf-class-hierarchy.controller.js

@@ -53,20 +53,27 @@ function RdfClassHierarchyCtlr($scope, $rootScope, $location, $repositories, $li
 
     let selectedGraph = allGraphs;
 
+    $scope.isLicenseValid = function () {
+        return $licenseService.isLicenseValid();
+    };
+
     const initView = function () {
-        if (!$scope.getActiveRepository()) {
+        if (!$scope.getActiveRepository() ||
+                !$licenseService.isLicenseValid()) {
             return;
         }
         return RDF4JRepositoriesRestService.resolveGraphs()
             .success(function (graphsInRepo) {
                 $scope.graphsInRepo = graphsInRepo.results.bindings;
                 setSelectedGraphFromCache();
             }).error(function (data) {
-            $scope.repositoryError = getError(data);
-            toastr.error(getError(data), $translate.instant('graphexplore.error.getting.graphs'));
-        });
+                    $scope.repositoryError = getError(data);
+                    toastr.error(getError(data), $translate.instant('graphexplore.error.getting.graphs'));
+            });
     };
 
+    initView();
+
     const setSelectedGraphFromCache = function () {
         const selGraphFromCache = LocalStorageAdapter.get(`classHierarchy-selectedGraph-${$repositories.getActiveRepository()}`);
         if (selGraphFromCache !== null && $scope.graphsInRepo.some(graph => graph.contextID.uri === selGraphFromCache.contextID.uri)) {
@@ -115,8 +122,6 @@ function RdfClassHierarchyCtlr($scope, $rootScope, $location, $repositories, $li
     $scope.instancesQueryObj.query = "";
     $scope.instancesFilterFunc = instancesFilterFunc;
 
-    initView();
-
     $scope.$watch('instancesObj.items', function () {
         if ($scope.instancesObj.items.length > 0) {
             $timeout(function () {
@@ -156,7 +161,10 @@ function RdfClassHierarchyCtlr($scope, $rootScope, $location, $repositories, $li
                 toastr.warning($translate.instant('graphexplore.disabling.animations', {classLimit: classLimit}),
                     $translate.instant('graphexplore.reducing.visual.effects'));
             } else {
-                toastr.warning($translate.instant('graphexplore.browser.performance', {browser: bowser.name, classLimit: classLimit}),
+                toastr.warning($translate.instant('graphexplore.browser.performance', {
+                        browser: bowser.name,
+                        classLimit: classLimit
+                    }),
                     $translate.instant('graphexplore.reducing.visual.effects'));
             }
         };
@@ -264,8 +272,8 @@ function RdfClassHierarchyCtlr($scope, $rootScope, $location, $repositories, $li
                         .search("name", name);
                 }
             }).error(function () {
-                toastr.error($translate.instant('graphexplore.error.request.failed', {name: name}));
-            });
+            toastr.error($translate.instant('graphexplore.error.request.failed', {name: name}));
+        });
     }
 
     function onGoToDomainRangeGraphView(event, selectedClass) {
@@ -317,7 +325,7 @@ function RdfClassHierarchyCtlr($scope, $rootScope, $location, $repositories, $li
                 _.each(response, function (value, key) {
                     const obj = {};
                     // TODO extract in core function isTriple(str)
-                    obj.type = (value.startsWith("<<") && value.endsWith(">>")) ? "triple": "uri";
+                    obj.type = (value.startsWith("<<") && value.endsWith(">>")) ? "triple" : "uri";
                     obj.absUri = encodeURIComponent(value);
                     obj.absUriNonEncoded = value;
                     obj.resolvedUri = key;
@@ -426,10 +434,8 @@ function RdfClassHierarchyCtlr($scope, $rootScope, $location, $repositories, $li
     }
 
     let currentActiveRepository = $repositories.getActiveRepository();
+
     function onRepositoryIsSet() {
-        if (!$licenseService.isLicenseValid()) {
-            return;
-        }
         if (currentActiveRepository === $repositories.getActiveRepository()) {
             return;
         } else {
@@ -445,10 +451,12 @@ function RdfClassHierarchyCtlr($scope, $rootScope, $location, $repositories, $li
     }
 
     function getClassHierarchyData() {
-
+        if (!$licenseService.isLicenseValid()) {
+            return;
+        }
         refreshDiagramExternalElements();
 
-        if (!$scope.isSystemRepository() && $scope.isLicenseValid()) {
+        if (!$scope.isSystemRepository()) {
             $scope.hierarchyError = false;
             $scope.loader = true;
             GraphDataRestService.getClassHierarchyData(selectedGraph.contextID.uri)
@@ -472,11 +480,6 @@ function RdfClassHierarchyCtlr($scope, $rootScope, $location, $repositories, $li
         return $scope.classHierarchyData.classCount && $scope.getActiveRepositoryNoError() && !$scope.isSystemRepository();
     };
 
-    $scope.isLicenseValid = function () {
-        return $licenseService.isLicenseValid();
-    };
-
-
     $scope.chosenGraph = function (graph) {
         selectedGraph = graph;
         getClassHierarchyData();
@@ -490,4 +493,10 @@ function RdfClassHierarchyCtlr($scope, $rootScope, $location, $repositories, $li
     $scope.isAllGraphsSelected = function () {
         return $scope.getSelGraphValue() === 'all.graphs.label'
     }
+
+    window.addEventListener('load', initView);
+
+    $scope.$on('$destroy', function (event) {
+        window.removeEventListener('load', initView);
+    });
 }