From 36a6aaefca77c0e4142eb542d3168cd8162b0d65 Mon Sep 17 00:00:00 2001 From: Pavel Mihaylov Date: Tue, 31 Mar 2020 18:21:52 +0300 Subject: [PATCH 1/2] GDB-4402: Error when disconnecting cluster node in WB --- src/js/angular/clustermanagement/controllers.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/js/angular/clustermanagement/controllers.js b/src/js/angular/clustermanagement/controllers.js index 6a073b83b..6e55bbd78 100644 --- 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); } }; From f840bac881534c69a6c6213fc248311e7f129880 Mon Sep 17 00:00:00 2001 From: Pavel Mihaylov Date: Tue, 31 Mar 2020 18:30:06 +0300 Subject: [PATCH 2/2] Updated version to 1.3.0-RC6 --- 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 c6e9a3d8d..b0531fa43 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "graphdb-workbench", - "version": "1.3.0-RC5", + "version": "1.3.0-RC6", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 226c6dc73..34c3c98b7 100644 --- 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/test-cypress/package-lock.json b/test-cypress/package-lock.json index b0254eba5..1ffda73f8 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-RC5", + "version": "1.3.0-RC6", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/test-cypress/package.json b/test-cypress/package.json index 8c3689406..9fb1d21e1 100644 --- 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",