Merge pull request #202 from Ontotext-AD/gdb-4402

GDB-4402: Error when disconnecting cluster node in WB
Ontotext-AD · Mar 31, 2020 · b39584c · b39584c
2 parents d233e3b + 18f5ae2
commit b39584c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "graphdb-workbench",
-    "version": "1.3.0-RC5",
+    "version": "1.3.0-RC6",
     "description": "The web application for GraphDB APIs",
     "scripts": {
         "build": "webpack --config=webpack.config.prod.js",

diff --git a/src/js/angular/clustermanagement/controllers.js b/src/js/angular/clustermanagement/controllers.js
@@ -210,7 +210,7 @@ function ClusterManagementCtrl($scope, $http, $q, toastr, $repositories, $modal,
             });
     };
 
-    function disconnectWorker(master, worker, onSuccess) {
+    function disconnectWorker(d, master, worker, onSuccess) {
         ClusterRestService.disconnectWorker($scope.getLabel(master.location), $.param({
             workerURL: worker.location,
             masterLocation: getLocation(master)
@@ -233,7 +233,7 @@ function ClusterManagementCtrl($scope, $http, $q, toastr, $repositories, $modal,
         });
     }
 
-    function disconnectNodes(master, worker, onSuccess) {
+    function disconnectNodes(d, master, worker, onSuccess) {
         ClusterRestService.disconnectNodes($scope.getLabel(master.location), $.param({
             masterLocation: getLocation(master),
             masterNodeID: master.nodeID,
@@ -284,10 +284,10 @@ function ClusterManagementCtrl($scope, $http, $q, toastr, $repositories, $modal,
         $scope.setLoader(true, 'Disconnecting nodes...');
 
         if (worker.repositoryType === 'worker') {
-            disconnectWorker(master, worker, onSuccess);
+            disconnectWorker(d, master, worker, onSuccess);
         } else {
             // Both are masters, despite the var name worker
-            disconnectNodes(master, worker, onSuccess);
+            disconnectNodes(d, master, worker, onSuccess);
         }
     };
 

diff --git a/test-cypress/package-lock.json b/test-cypress/package-lock.json
diff --git a/test-cypress/package.json b/test-cypress/package.json
@@ -1,6 +1,6 @@
 {
     "name": "graphdb-workbench-tests",
-    "version": "1.3.0-RC5",
+    "version": "1.3.0-RC6",
     "description": "Cypress tests for GraphDB workbench",
     "scripts": {
         "start": "cypress open",