Merge pull request #1469 from dudleycarr/fix-eslint-errors

nsqadmin: fix eslint errors
nsqio · Oct 30, 2023 · 5cef35c · 5cef35c
2 parents 30998dd + 6d4bd5c
commit 5cef35c
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 16 deletions.
diff --git a/nsqadmin/.eslintrc b/nsqadmin/.eslintrc
@@ -64,6 +64,17 @@
     "wrap-iife": [1]
   },
   "globals": {
+    "BASE_PATH": true,
+    "GRAPHITE_URL": true,
+    "GRAPH_ENABLED": true,
+    "IS_ADMIN": true,
+    "NSQLOOKUPD": true,
+    "STATSD_COUNTER_FORMAT": true,
+    "STATSD_GAUGE_FORMAT": true,
+    "STATSD_INTERVAL": true,
+    "STATSD_PREFIX": true,
+    "USER_AGENT": true,
+    "VERSION": true,
     "module": true,
     "require": true
   }

diff --git a/nsqadmin/package.json b/nsqadmin/package.json
@@ -6,6 +6,9 @@
     "type": "git",
     "url": ""
   },
+  "scripts": {
+    "lint": "eslint static/js"
+  },
   "devDependencies": {
     "browserify": "^17.0.0",
     "gulp": "^4.0.2",

diff --git a/nsqadmin/static/build/main.js.map b/nsqadmin/static/build/main.js.map
diff --git a/nsqadmin/static/js/collections/nodes.js b/nsqadmin/static/js/collections/nodes.js
@@ -2,10 +2,10 @@ var Backbone = require('backbone');
 
 var AppState = require('../app_state');
 
-var Node = require('../models/node'); //eslint-disable-line no-undef
+var NodeModel = require('../models/node');
 
 var Nodes = Backbone.Collection.extend({
-    model: Node,
+    model: NodeModel,
 
     comparator: 'id',
 

diff --git a/nsqadmin/static/js/lib/handlebars_helpers.js b/nsqadmin/static/js/lib/handlebars_helpers.js
@@ -63,21 +63,24 @@ var genColorList = function(typ, key) {
 
 // sanitizeGraphiteKey removes special characters from a graphite key
 // this matches behavior of bitly/statsdaemon
+// eslint-disable-next-line max-len
 // https://github.com/bitly/statsdaemon/blob/fc46d9cfe29b674a0c8abc723afaa9370430cdcd/statsdaemon.go#L64-L88
 var sanitizeGraphiteKey = function(s) {
     return s.replaceAll(' ', '_').replaceAll('/', '-').replaceAll(/[^a-zA-Z0-9-_.]/g, '');
-}
+};
 
 var genTargets = function(typ, node, ns1, ns2, key) {
     var targets = [];
     var prefix = statsdPrefix(node ? node : '*');
     var fullKey;
     var target;
     if (typ === 'topic') {
-        fullKey = formatStatsdKey(metricType(key), prefix + 'topic.' + sanitizeGraphiteKey(ns1) + '.' + key);
+        fullKey = formatStatsdKey(metricType(key),
+            prefix + 'topic.' + sanitizeGraphiteKey(ns1) + '.' + key);
         targets.push('sumSeries(' + fullKey + ')');
     } else if (typ === 'channel') {
-        fullKey = formatStatsdKey(metricType(key), prefix + 'topic.' + sanitizeGraphiteKey(ns1) + '.channel.' +
+        fullKey = formatStatsdKey(metricType(key),
+            prefix + 'topic.' + sanitizeGraphiteKey(ns1) + '.channel.' +
             sanitizeGraphiteKey(ns2) + '.' + key);
         targets.push('sumSeries(' + fullKey + ')');
     } else if (typ === 'node') {

diff --git a/nsqadmin/static/js/models/node.js b/nsqadmin/static/js/models/node.js
@@ -1,7 +1,7 @@
 var AppState = require('../app_state');
 var Backbone = require('backbone');
 
-var Node = Backbone.Model.extend({ //eslint-disable-line no-undef
+var NodeModel = Backbone.Model.extend({
     idAttribute: 'name',
 
     constructor: function Node() {
@@ -20,4 +20,4 @@ var Node = Backbone.Model.extend({ //eslint-disable-line no-undef
     }
 });
 
-module.exports = Node;
+module.exports = NodeModel;
diff --git a/nsqadmin/static/js/views/app.js b/nsqadmin/static/js/views/app.js
@@ -18,9 +18,9 @@ var NodesView = require('./nodes');
 var NodeView = require('./node');
 var CounterView = require('./counter');
 
-var Node = require('../models/node'); //eslint-disable-line no-undef
-var Topic = require('../models/topic');
-var Channel = require('../models/channel');
+var NodeModel = require('../models/node');
+var TopicModel = require('../models/topic');
+var ChannelModel = require('../models/channel');
 
 var AppView = BaseView.extend({
     // not a fan of setting a view's el to an existing element on the page
@@ -96,14 +96,14 @@ var AppView = BaseView.extend({
 
     showTopic: function(topic) {
         this.showView(function() {
-            var model = new Topic({'name': topic, 'isAdmin': AppState.get('IS_ADMIN')});
+            var model = new TopicModel({'name': topic, 'isAdmin': AppState.get('IS_ADMIN')});
             return new TopicView({'model': model});
         });
     },
 
     showChannel: function(topic, channel) {
         this.showView(function() {
-            var model = new Channel({
+            var model = new ChannelModel({
                 'topic': topic,
                 'name': channel,
                 'isAdmin': AppState.get('IS_ADMIN')
@@ -126,7 +126,7 @@ var AppView = BaseView.extend({
 
     showNode: function(node) {
         this.showView(function() {
-            var model = new Node({'name': node});
+            var model = new NodeModel({'name': node});
             return new NodeView({'model': model});
         });
     },
@@ -157,7 +157,7 @@ var AppView = BaseView.extend({
             if (result !== true) {
                 return;
             }
-            var node = new Node({
+            var node = new NodeModel({
                 'name': nodeName
             });
             node.tombstoneTopic(topicName)

diff --git a/nsqadmin/static/js/views/counter.js b/nsqadmin/static/js/views/counter.js
@@ -104,7 +104,7 @@ var CounterView = BaseView.extend({
     },
 
     displayFrame: function() {
-        this.currentNum = Math.min(this.currentNum + this.delta, this.lastNum)
+        this.currentNum = Math.min(this.currentNum + this.delta, this.lastNum);
         this.writeCounts(this.currentNum);
         if (this.currentNum < this.lastNum) {
             this.animator = setTimeout(this.displayFrame.bind(this), 1000 / 60);