Skip to content

Commit 90f5e52

Browse files
MB-47751: fix missed eslint errors
fix issues that were missed due to wrong .js files path Change-Id: I07c3c3d364843c884c8268f12009d744a1ea7e23 Reviewed-on: http://review.couchbase.org/c/ns_server/+/160611 Tested-by: Pavel Blagodov <[email protected]> Reviewed-by: Matthew <[email protected]> Well-Formed: Build Bot <[email protected]>
1 parent 992ce8c commit 90f5e52

15 files changed

+32
-35
lines changed

priv/public/ui/app/ajs.upgraded.providers.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ const MnAlertsServiceProvider = {
8989
deps: ['$injector']
9090
};
9191

92-
class MnServersService {};
92+
class MnServersService {}
9393
const MnServersServiceProvider = {
9494
provide: MnServersService,
9595
useFactory: function MnServersServiceFactory(i) {
@@ -98,7 +98,7 @@ const MnServersServiceProvider = {
9898
deps: ['$injector']
9999
};
100100

101-
class MnStatisticsNewService {};
101+
class MnStatisticsNewService {}
102102
const MnStatisticsNewServiceProvider = {
103103
provide: MnStatisticsNewService,
104104
useFactory: function MnStatisticsNewServiceFactory(i) {

priv/public/ui/app/app.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ angular.module('app', [
5959
.constant("IEC", IEC)
6060
.run(appRun);
6161

62-
function appRun($state, $urlRouter, $exceptionHandler, mnPools, $window, $rootScope, $location, $http, mnPrettyVersionFilter) {
62+
function appRun($state, $urlRouter, $exceptionHandler, mnPools, $window, $rootScope) {
6363

6464
angular.element($window).on("storage", function (storage) {
6565
if (storage.key === "mnLogIn") {
@@ -81,11 +81,8 @@ function appRun($state, $urlRouter, $exceptionHandler, mnPools, $window, $rootSc
8181
originalOnerror && originalOnerror.apply($window, Array.prototype.slice.call(arguments));
8282
}
8383

84-
$http({method: "GET", url: "/versions"}).then(function (resp) {
85-
var pools = resp.data;
86-
var version = mnPrettyVersionFilter(pools.implementationVersion);
87-
$rootScope.mnTitle = "Couchbase Server";
88-
});
84+
85+
$rootScope.mnTitle = "Couchbase Server";
8986

9087
$state.defaultErrorHandler(function (error) {
9188
error && $exceptionHandler(error);

priv/public/ui/app/app_config.js

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -77,18 +77,18 @@ function appConfig($httpProvider, $stateProvider, $urlRouterProvider, $transitio
7777

7878
if (!original.commonBucket) {
7979
let params = Object.assign({}, original);
80-
;(["bucket", "scenarioBucket", "collectionsBucket", "indexesBucket"])
81-
.forEach(bucket => {
82-
if (params[bucket]) {
83-
params.commonBucket = params[bucket];
84-
if (bucket != "bucket") {
85-
//do not remove 'bucket' parameter since this is
86-
//popular pluggable UI param, so we just pass it
87-
//along with commonBucket parameter
88-
delete params[bucket];
89-
}
80+
(["bucket", "scenarioBucket", "collectionsBucket", "indexesBucket"])
81+
.forEach(bucket => {
82+
if (params[bucket]) {
83+
params.commonBucket = params[bucket];
84+
if (bucket != "bucket") {
85+
//do not remove 'bucket' parameter since this is
86+
//popular pluggable UI param, so we just pass it
87+
//along with commonBucket parameter
88+
delete params[bucket];
9089
}
91-
});
90+
}
91+
});
9292

9393
if (params.commonBucket) {
9494
return trans.router.stateService.target(trans.to().name, params);
@@ -147,7 +147,6 @@ function appConfig($httpProvider, $stateProvider, $urlRouterProvider, $transitio
147147
from: "app.admin.**",
148148
to: "app.admin.**"
149149
}, function (trans) {
150-
var mnPools = trans.injector().get('mnPools');
151150
var $rootScope = trans.injector().get('$rootScope');
152151
var mnPendingQueryKeeper = trans.injector().get('mnPendingQueryKeeper');
153152
var $uibModalStack = trans.injector().get('$uibModalStack');
@@ -195,7 +194,7 @@ function appConfig($httpProvider, $stateProvider, $urlRouterProvider, $transitio
195194
var mnPermissions = trans.injector().get('mnPermissions');
196195
var $parse = trans.injector().get('$parse');
197196
return mnPermissions.check().then(function() {
198-
if (!!$parse(trans.to().data.permissions)(mnPermissions.export)) {
197+
if ($parse(trans.to().data.permissions)(mnPermissions.export)) {
199198
return true;
200199
} else {
201200
return trans.router.stateService.target('app.admin.overview.statistics');
@@ -210,7 +209,7 @@ function appConfig($httpProvider, $stateProvider, $urlRouterProvider, $transitio
210209
var mnPoolDefault = trans.injector().get('mnPoolDefault');
211210
var $parse = trans.injector().get('$parse');
212211
return mnPoolDefault.get().then(function() {
213-
if (!!$parse(trans.to().data.compat)(mnPoolDefault.export.compat)) {
212+
if ($parse(trans.to().data.compat)(mnPoolDefault.export.compat)) {
214213
return true;
215214
} else {
216215
return trans.router.stateService.target('app.admin.overview.statistics');

priv/public/ui/app/components/directives/mn_detail_stats_controller.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ be governed by the Apache License, Version 2.0, included in the file
88
licenses/APL2.txt.
99
*/
1010

11+
import angular from "/ui/web_modules/angular.js";
1112
import mnStatisticsNewService from "/ui/app/mn_admin/mn_statistics_service.js";
1213
import mnStatisticsDescriptionService from "/ui/app/mn_admin/mn_statistics_description_service.js";
1314
import mnStatisticsChart from "/ui/app/mn_admin/mn_statistics_chart_directive.js";

priv/public/ui/app/components/directives/mn_field_directive.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ function mnFieldDirective() {
3636

3737
return mnFieldDirective;
3838

39-
function controller($scope) {
39+
function controller() {
4040

4141
}
4242
}

priv/public/ui/app/components/directives/mn_filter/mn_filter.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ angular
1616
.module("mnFilter", [])
1717
.directive("mnFilter", mnFilterDirective);
1818

19-
function mnFilterDirective($window) {
19+
function mnFilterDirective() {
2020
var mnFilter = {
2121
restrict: "A",
2222
scope: {
@@ -34,7 +34,7 @@ function mnFilterDirective($window) {
3434

3535
return mnFilter;
3636

37-
function mnFilterController($scope) {
37+
function mnFilterController() {
3838
var vm = this;
3939

4040
vm.togglePopup = togglePopup;

priv/public/ui/app/components/directives/mn_launchpad.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ function mnLaunchpadDirective($timeout) {
2727

2828
return mnLaunchpad;
2929

30-
function link($scope, $element, $attrs) {
30+
function link($scope, $element) {
3131
$scope.$watch('launchpadSource', function (launchpadSource) {
3232
if (!launchpadSource) {
3333
return;

priv/public/ui/app/components/directives/mn_memory_quota/mn_memory_quota.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,15 @@ licenses/APL2.txt.
1010

1111
import angular from "/ui/web_modules/angular.js";
1212
import mnFocus from "/ui/app/components/directives/mn_focus.js";
13-
import mnMemoryQuotaService from "/ui/app/components/directives/mn_memory_quota/mn_memory_quota_service.js";
1413
import mnServices from "/ui/app/components/directives/mn_services/mn_services.js";
1514

1615
export default "mnMemoryQuota";
1716

1817
angular
19-
.module('mnMemoryQuota', [mnServices, mnFocus, mnMemoryQuotaService])
18+
.module('mnMemoryQuota', [mnServices, mnFocus])
2019
.directive('mnMemoryQuota', mnMemoryQuotaDirective);
2120

22-
function mnMemoryQuotaDirective($window, mnMemoryQuotaService) {
21+
function mnMemoryQuotaDirective() {
2322
var mnMemoryQuota = {
2423
restrict: 'A',
2524
scope: {

priv/public/ui/app/components/directives/mn_memory_quota/mn_memory_quota_service.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ function mnMemoryQuotaServiceFactory($http, $window, mnPoolDefault, mnHelper, IE
7272
}
7373
function isOnlyOneNodeWithService(nodes, services, service, isTakenIntoAccountPendingEject) {
7474
var nodesCount = 0;
75-
var indexExists = _.each(nodes, function (node) {
75+
_.each(nodes, function (node) {
7676
nodesCount += (_.indexOf(node.services, service) > -1 && !(isTakenIntoAccountPendingEject && node.pendingEject));
7777
});
7878
return nodesCount === 1 && services && (angular.isArray(services) ? (_.indexOf(services, service) > -1) : services[service]);

priv/public/ui/app/components/directives/mn_services/mn_services.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ angular
1717
.module('mnServices', [mnMemoryQuotaService])
1818
.directive('mnServices', mnServicesDirective);
1919

20-
function mnServicesDirective(mnMemoryQuotaService) {
20+
function mnServicesDirective() {
2121
var mnServices = {
2222
restrict: 'A',
2323
scope: {

0 commit comments

Comments
 (0)