Skip to content

Commit 0a2b40a

Browse files
mikewiedpavel-blagodov
authored andcommitted
Fix the cluster settings page in angular ui
The internalSettings/visual REST API was removed recently and that API was used by the cluster settings page. This change removes the old API and uses the recommended pools/default API to update the cluster settings. Change-Id: I519a03d12cd6b868505e891d49482c0107a9bb18 Reviewed-on: http://review.couchbase.org/49268 Reviewed-by: Pavel Blagodov <[email protected]> Tested-by: Pavel Blagodov <[email protected]>
1 parent adb4686 commit 0a2b40a

File tree

4 files changed

+12
-21
lines changed

4 files changed

+12
-21
lines changed

priv/public/angular/app/mn_admin/mn_admin_config.js

-3
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,6 @@ angular.module('mnAdmin').config(function ($stateProvider, $urlRouterProvider) {
103103
defaultCertificate: function (mnSettingsClusterService) {
104104
return mnSettingsClusterService.getDefaultCertificate();
105105
},
106-
getVisulaSettings: function (mnSettingsClusterService) {
107-
return mnSettingsClusterService.getVisulaSettings();
108-
},
109106
nodes: function (mnServersService) {
110107
return mnServersService.getNodes();
111108
},

priv/public/angular/app/mn_admin/mn_settings/cluster/mn_settings_cluster.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ <h2>
55
</h2>
66
<div class="sub_section">
77
<label>Cluster Name:</label>
8-
<input type="text" name="tabName" maxlength="256" ng-model="formData.tabName">
8+
<input type="text" name="clusterName" maxlength="256" ng-model="formData.clusterName">
99
<span>(0 — 256 chars)</span>
1010
</div>
1111
<div class="certificate_section">

priv/public/angular/app/mn_admin/mn_settings/cluster/mn_settings_cluster_controller.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
angular.module('mnSettingsCluster').controller('mnSettingsClusterController',
2-
function ($scope, mnSettingsClusterService, nodes, poolDefault, defaultCertificate, getVisulaSettings, mnHelper) {
2+
function ($scope, mnSettingsClusterService, nodes, poolDefault, defaultCertificate, mnHelper) {
33
$scope.focusMe = true;
44

55
$scope.formData = {};
6-
$scope.formData.tabName = getVisulaSettings.data.tabName;
6+
$scope.formData.clusterName = poolDefault.clusterName;
77
$scope.formData.memoryQuota = getInMegs(poolDefault.storageTotals.ram.quotaTotalPerNode);
88
$scope.totalRam = getInMegs(nodes.ramTotalPerActiveNode);
99
$scope.maxRamMegs = Math.max(getInMegs(nodes.ramTotalPerActiveNode) - 1024, Math.floor(nodes.ramTotalPerActiveNode * 4 / (5 * Math.Mi)));
1010
setCertificate(defaultCertificate.data);
1111

1212
var liveValidation = _.debounce(function () {
13-
mnSettingsClusterService.visualInternalSettingsValidation($scope.formData).error(setError).success(setError);
13+
var promise = mnSettingsClusterService.clusterSettingsValidation($scope.formData);
14+
mnHelper.promiseHelper($scope, promise).catchErrorsFromSuccess();
1415
}, 500);
1516

1617
$scope.$watch('formData.memoryQuota', liveValidation);
1718

1819
function setCertificate(certificate) {
1920
$scope.certificate = certificate;
2021
}
21-
function setError(response) {
22-
$scope.errors = response.errors;
23-
}
22+
2423
function getInMegs(value) {
2524
return Math.floor(value / Math.Mi);
2625
}
2726

2827
$scope.saveVisualInternalSettings = function () {
29-
var promise = mnSettingsClusterService.saveVisualInternalSettings($scope.formData).error(setError);
28+
var promise = mnSettingsClusterService.saveClusterSettings($scope.formData);
3029
mnHelper
3130
.promiseHelper($scope, promise)
31+
.catchErrorsFromSuccess()
3232
.showSpinner('settingsClusterLoaded')
3333
.reloadState();
3434
};

priv/public/angular/app/mn_admin/mn_settings/cluster/mn_settings_cluster_service.js

+4-10
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,21 @@ angular.module('mnSettingsClusterService').factory('mnSettingsClusterService',
1515
url: '/controller/regenerateCertificate'
1616
});
1717
};
18-
mnSettingsClusterService.getVisulaSettings = function () {
19-
return mnHttp({
20-
method: 'GET',
21-
url: '/internalSettings/visual'
22-
});
23-
};
24-
mnSettingsClusterService.saveVisualInternalSettings = function (data) {
18+
mnSettingsClusterService.saveClusterSettings = function (data) {
2519
return mnHttp({
2620
method: 'POST',
27-
url: '/internalSettings/visual',
21+
url: '/pools/default',
2822
data: data
2923
});
3024
};
31-
mnSettingsClusterService.visualInternalSettingsValidation = function (data) {
25+
mnSettingsClusterService.clusterSettingsValidation = function (data) {
3226
return mnHttp({
3327
method: 'POST',
3428
params: {
3529
just_validate: 1,
3630
},
3731
data: data,
38-
url: '/internalSettings/visual'
32+
url: '/pools/default'
3933
});
4034
};
4135

0 commit comments

Comments
 (0)