From 4c61892894255c59844b88fd249e111894b7dae9 Mon Sep 17 00:00:00 2001 From: Court Ewing Date: Tue, 26 Jan 2016 10:04:07 -0500 Subject: [PATCH 01/10] Lint for attempts to override const variables --- .eslintrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.eslintrc b/.eslintrc index 6a291608cdf50..080d8cff32fc5 100644 --- a/.eslintrc +++ b/.eslintrc @@ -30,6 +30,7 @@ rules: no-bitwise: 0 no-caller: 2 no-cond-assign: 0 + no-const-assign: 2 no-debugger: 2 no-empty: 2 no-eval: 2 From 30e7d5a3ed9548ec044c22131ef8c2a01af54246 Mon Sep 17 00:00:00 2001 From: Court Ewing Date: Mon, 1 Feb 2016 19:44:34 -0500 Subject: [PATCH 02/10] Use const/let in devMode plugin --- src/plugins/devMode/public/ngMock.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/devMode/public/ngMock.js b/src/plugins/devMode/public/ngMock.js index 1b884163e85a9..edfa8f8345287 100644 --- a/src/plugins/devMode/public/ngMock.js +++ b/src/plugins/devMode/public/ngMock.js @@ -1,4 +1,4 @@ -var angular = require('angular'); +const angular = require('angular'); if (angular.mocks) { throw new Error( 'Don\'t require angular-mocks directly or the tests ' + From 5e812485c6654e196e8c5876b6e4353c99bab446 Mon Sep 17 00:00:00 2001 From: Court Ewing Date: Mon, 1 Feb 2016 19:44:48 -0500 Subject: [PATCH 03/10] Use const/let in elasticsearch plugin --- .../lib/__tests__/check_es_version.js | 30 ++++++------ .../lib/__tests__/create_kibana_index.js | 46 +++++++++---------- .../elasticsearch/lib/__tests__/findPort.js | 4 +- .../lib/__tests__/health_check.js | 20 ++++---- .../elasticsearch/lib/__tests__/routes.js | 14 +++--- .../lib/__tests__/setup_error.js | 18 ++++---- .../lib/__tests__/upgrade_config.js | 46 +++++++++---------- .../lib/__tests__/version_satisfies.js | 14 +++--- .../elasticsearch/lib/check_es_version.js | 20 ++++---- src/plugins/elasticsearch/lib/create_agent.js | 16 +++---- .../elasticsearch/lib/create_kibana_index.js | 8 ++-- src/plugins/elasticsearch/lib/create_proxy.js | 8 ++-- src/plugins/elasticsearch/lib/es_bool.js | 4 +- .../elasticsearch/lib/expose_client.js | 24 +++++----- src/plugins/elasticsearch/lib/health_check.js | 40 ++++++++-------- .../elasticsearch/lib/is_upgradeable.js | 20 ++++---- src/plugins/elasticsearch/lib/map_uri.js | 12 ++--- .../elasticsearch/lib/migrate_config.js | 8 ++-- src/plugins/elasticsearch/lib/setup_error.js | 6 +-- .../elasticsearch/lib/upgrade_config.js | 22 ++++----- .../elasticsearch/lib/version_satisfies.js | 6 +-- 21 files changed, 193 insertions(+), 193 deletions(-) diff --git a/src/plugins/elasticsearch/lib/__tests__/check_es_version.js b/src/plugins/elasticsearch/lib/__tests__/check_es_version.js index 6518d8ff193c5..4af5dc0b4422d 100644 --- a/src/plugins/elasticsearch/lib/__tests__/check_es_version.js +++ b/src/plugins/elasticsearch/lib/__tests__/check_es_version.js @@ -1,17 +1,17 @@ -var _ = require('lodash'); -var Promise = require('bluebird'); -var sinon = require('sinon'); +const _ = require('lodash'); +const Promise = require('bluebird'); +const sinon = require('sinon'); -var checkEsVersion = require('../check_es_version'); +const checkEsVersion = require('../check_es_version'); describe('plugins/elasticsearch', function () { describe('lib/check_es_version', function () { - var server; - var plugin; + let server; + let plugin; beforeEach(function () { - var get = sinon.stub().withArgs('elasticsearch.engineVersion').returns('^1.4.3'); - var config = function () { return { get: get }; }; + const get = sinon.stub().withArgs('elasticsearch.engineVersion').returns('^1.4.3'); + const config = function () { return { get: get }; }; server = { log: _.noop, config: config, @@ -30,15 +30,15 @@ describe('plugins/elasticsearch', function () { }); function setNodes(/* ...versions */) { - var versions = _.shuffle(arguments); - var nodes = {}; - var i = 0; + const versions = _.shuffle(arguments); + const nodes = {}; + let i = 0; while (versions.length) { - var name = 'node-' + (++i); - var version = versions.shift(); + const name = 'node-' + (++i); + const version = versions.shift(); - var node = { + const node = { version: version, http_address: 'http_address', ip: 'ip' @@ -48,7 +48,7 @@ describe('plugins/elasticsearch', function () { nodes[name] = node; } - var client = server.plugins.elasticsearch.client; + const client = server.plugins.elasticsearch.client; client.nodes.info = sinon.stub().returns(Promise.resolve({ nodes: nodes })); } diff --git a/src/plugins/elasticsearch/lib/__tests__/create_kibana_index.js b/src/plugins/elasticsearch/lib/__tests__/create_kibana_index.js index 8e2648b7dc0a7..18d0061282312 100644 --- a/src/plugins/elasticsearch/lib/__tests__/create_kibana_index.js +++ b/src/plugins/elasticsearch/lib/__tests__/create_kibana_index.js @@ -1,21 +1,21 @@ -var _ = require('lodash'); -var sinon = require('sinon'); -var expect = require('expect.js'); -var Promise = require('bluebird'); +const _ = require('lodash'); +const sinon = require('sinon'); +const expect = require('expect.js'); +const Promise = require('bluebird'); -var createKibanaIndex = require('../create_kibana_index'); -var SetupError = require('../setup_error'); +const createKibanaIndex = require('../create_kibana_index'); +const SetupError = require('../setup_error'); describe('plugins/elasticsearch', function () { describe('lib/create_kibana_index', function () { - var server; - var client; + let server; + let client; beforeEach(function () { server = {}; client = {}; - var config = { kibana: { index: '.my-kibana' } }; - var get = sinon.stub(); + let config = { kibana: { index: '.my-kibana' } }; + const get = sinon.stub(); get.returns(config); get.withArgs('kibana.index').returns(config.kibana.index); config = function () { return { get: get }; }; @@ -33,16 +33,16 @@ describe('plugins/elasticsearch', function () { }); it('should check cluster.health upon successful index creation', function () { - var fn = createKibanaIndex(server); + const fn = createKibanaIndex(server); return fn.then(function () { sinon.assert.calledOnce(client.cluster.health); }); }); it('should be created with mappings for config.buildNum', function () { - var fn = createKibanaIndex(server); + const fn = createKibanaIndex(server); return fn.then(function () { - var params = client.indices.create.args[0][0]; + const params = client.indices.create.args[0][0]; expect(params) .to.have.property('body'); expect(params.body) @@ -61,9 +61,9 @@ describe('plugins/elasticsearch', function () { }); it('should be created with 1 shard and default replica', function () { - var fn = createKibanaIndex(server); + const fn = createKibanaIndex(server); return fn.then(function () { - var params = client.indices.create.args[0][0]; + const params = client.indices.create.args[0][0]; expect(params) .to.have.property('body'); expect(params.body) @@ -76,9 +76,9 @@ describe('plugins/elasticsearch', function () { }); it('should be created with index name set in the config', function () { - var fn = createKibanaIndex(server); + const fn = createKibanaIndex(server); return fn.then(function () { - var params = client.indices.create.args[0][0]; + const params = client.indices.create.args[0][0]; expect(params) .to.have.property('index', '.my-kibana'); }); @@ -89,18 +89,18 @@ describe('plugins/elasticsearch', function () { describe('failure requests', function () { it('should reject with a SetupError', function () { - var error = new Error('Oops!'); + const error = new Error('Oops!'); client.indices.create.returns(Promise.reject(error)); - var fn = createKibanaIndex(server); + const fn = createKibanaIndex(server); return fn.catch(function (err) { expect(err).to.be.a(SetupError); }); }); it('should reject with an error if index creation fails', function () { - var error = new Error('Oops!'); + const error = new Error('Oops!'); client.indices.create.returns(Promise.reject(error)); - var fn = createKibanaIndex(server); + const fn = createKibanaIndex(server); return fn.catch(function (err) { expect(err.message).to.be('Unable to create Kibana index ".my-kibana"'); expect(err).to.have.property('origError', error); @@ -109,10 +109,10 @@ describe('plugins/elasticsearch', function () { it('should reject with an error if health check fails', function () { - var error = new Error('Oops!'); + const error = new Error('Oops!'); client.indices.create.returns(Promise.resolve()); client.cluster.health.returns(Promise.reject(error)); - var fn = createKibanaIndex(server); + const fn = createKibanaIndex(server); return fn.catch(function (err) { expect(err.message).to.be('Waiting for Kibana index ".my-kibana" to come online failed.'); expect(err).to.have.property('origError', error); diff --git a/src/plugins/elasticsearch/lib/__tests__/findPort.js b/src/plugins/elasticsearch/lib/__tests__/findPort.js index 1448058586e68..b346ac805aeac 100644 --- a/src/plugins/elasticsearch/lib/__tests__/findPort.js +++ b/src/plugins/elasticsearch/lib/__tests__/findPort.js @@ -1,5 +1,5 @@ -var Promise = require('bluebird'); -var portscanner = require('portscanner'); +const Promise = require('bluebird'); +const portscanner = require('portscanner'); module.exports = function findPort(start, end, host) { host = host || 'localhost'; diff --git a/src/plugins/elasticsearch/lib/__tests__/health_check.js b/src/plugins/elasticsearch/lib/__tests__/health_check.js index 87b9cf6e916a6..da66b836832df 100644 --- a/src/plugins/elasticsearch/lib/__tests__/health_check.js +++ b/src/plugins/elasticsearch/lib/__tests__/health_check.js @@ -1,18 +1,18 @@ -var Promise = require('bluebird'); -var sinon = require('sinon'); -var expect = require('expect.js'); -var NoConnections = require('elasticsearch').errors.NoConnections; +const Promise = require('bluebird'); +const sinon = require('sinon'); +const expect = require('expect.js'); +const NoConnections = require('elasticsearch').errors.NoConnections; -var healthCheck = require('../health_check'); +const healthCheck = require('../health_check'); describe('plugins/elasticsearch', function () { describe('lib/health_check', function () { - var health; - var plugin; - var server; - var get; - var client; + let health; + let plugin; + let server; + let get; + let client; beforeEach(function () { // setup the plugin stub diff --git a/src/plugins/elasticsearch/lib/__tests__/routes.js b/src/plugins/elasticsearch/lib/__tests__/routes.js index aa07af2dc3848..e5534c478d6b1 100644 --- a/src/plugins/elasticsearch/lib/__tests__/routes.js +++ b/src/plugins/elasticsearch/lib/__tests__/routes.js @@ -1,15 +1,15 @@ -var expect = require('expect.js'); -var util = require('util'); -var requireFromTest = require('requirefrom')('test'); -var kbnTestServer = requireFromTest('utils/kbn_server'); +const expect = require('expect.js'); +const util = require('util'); +const requireFromTest = require('requirefrom')('test'); +const kbnTestServer = requireFromTest('utils/kbn_server'); -var format = util.format; +const format = util.format; describe('plugins/elasticsearch', function () { describe('routes', function () { - var kbnServer; + let kbnServer; before(function () { kbnServer = kbnTestServer.createServer(); @@ -28,7 +28,7 @@ describe('plugins/elasticsearch', function () { options.payload = JSON.stringify(options.payload); } - var statusCode = options.statusCode || 200; + const statusCode = options.statusCode || 200; describe(format('%s %s', options.method, options.url), function () { it('should should return ' + statusCode, function (done) { kbnTestServer.makeRequest(kbnServer, options, function (res) { diff --git a/src/plugins/elasticsearch/lib/__tests__/setup_error.js b/src/plugins/elasticsearch/lib/__tests__/setup_error.js index 15f8f73129dc7..2047d93893108 100644 --- a/src/plugins/elasticsearch/lib/__tests__/setup_error.js +++ b/src/plugins/elasticsearch/lib/__tests__/setup_error.js @@ -1,10 +1,10 @@ -var SetupError = require('../setup_error'); -var expect = require('expect.js'); +const SetupError = require('../setup_error'); +const expect = require('expect.js'); describe('plugins/elasticsearch', function () { describe('lib/setup_error', function () { - var server = { + const server = { config: function () { return { get: function () { @@ -14,7 +14,7 @@ describe('plugins/elasticsearch', function () { } }; - var err = new SetupError(server, 'Oops! <%= kibana.index %>'); + const err = new SetupError(server, 'Oops! <%= kibana.index %>'); it('should allow config values in the message template', function () { expect(err).to.have.property('message', 'Oops! .my-kibana'); @@ -30,19 +30,19 @@ describe('plugins/elasticsearch', function () { }); it('should return the passed error if it is a SetupError', function () { - var error = new SetupError(server, 'Oh Boy!', err); + const error = new SetupError(server, 'Oh Boy!', err); expect(error).to.have.property('message', 'Oops! .my-kibana'); }); it('should store the original error', function () { - var origError = new Error('Boom!'); - var error = new SetupError(server, 'Oh Boy!', origError); + const origError = new Error('Boom!'); + const error = new SetupError(server, 'Oh Boy!', origError); expect(error).to.have.property('origError', origError); }); it('should copy the stack from the origError', function () { - var origError = new Error('Boom!'); - var error = new SetupError(server, 'Oh Boy!', origError); + const origError = new Error('Boom!'); + const error = new SetupError(server, 'Oh Boy!', origError); expect(error).to.have.property('stack', origError.stack); }); diff --git a/src/plugins/elasticsearch/lib/__tests__/upgrade_config.js b/src/plugins/elasticsearch/lib/__tests__/upgrade_config.js index fcd5903c0c631..debe242ee8919 100644 --- a/src/plugins/elasticsearch/lib/__tests__/upgrade_config.js +++ b/src/plugins/elasticsearch/lib/__tests__/upgrade_config.js @@ -1,17 +1,17 @@ -var _ = require('lodash'); -var Promise = require('bluebird'); -var sinon = require('sinon'); -var expect = require('expect.js'); +const _ = require('lodash'); +const Promise = require('bluebird'); +const sinon = require('sinon'); +const expect = require('expect.js'); -var upgradeConfig = require('../upgrade_config'); +const upgradeConfig = require('../upgrade_config'); describe('plugins/elasticsearch', function () { describe('lib/upgrade_config', function () { - var get; - var server; - var client; - var config; - var upgrade; + let get; + let server; + let client; + let config; + let upgrade; beforeEach(function () { get = sinon.stub(); @@ -32,7 +32,7 @@ describe('plugins/elasticsearch', function () { }); describe('nothing is found', function () { - var response = { hits: { hits:[] } }; + const response = { hits: { hits:[] } }; beforeEach(function () { client.create.returns(Promise.resolve()); @@ -48,14 +48,14 @@ describe('plugins/elasticsearch', function () { it('should resolve buildNum to pkg.buildNum config', function () { return upgrade(response).then(function (resp) { sinon.assert.calledOnce(client.create); - var params = client.create.args[0][0]; + const params = client.create.args[0][0]; expect(params.body).to.have.property('buildNum', get('pkg.buildNum')); }); }); it('should resolve version to pkg.version config', function () { return upgrade(response).then(function (resp) { - var params = client.create.args[0][0]; + const params = client.create.args[0][0]; expect(params).to.have.property('id', get('pkg.version')); }); }); @@ -70,14 +70,14 @@ describe('plugins/elasticsearch', function () { it('should resolve buildNum to pkg.buildNum config', function () { return upgrade(response).then(function (resp) { - var params = client.create.args[0][0]; + const params = client.create.args[0][0]; expect(params.body).to.have.property('buildNum', get('pkg.buildNum')); }); }); it('should resolve version to pkg.version config', function () { return upgrade(response).then(function (resp) { - var params = client.create.args[0][0]; + const params = client.create.args[0][0]; expect(params).to.have.property('id', get('pkg.version')); }); }); @@ -85,14 +85,14 @@ describe('plugins/elasticsearch', function () { }); it('should resolve with undefined if the current version is found', function () { - var response = { hits: { hits: [ { _id: '4.0.1' } ] } }; + const response = { hits: { hits: [ { _id: '4.0.1' } ] } }; return upgrade(response).then(function (resp) { expect(resp).to.be(undefined); }); }); it('should resolve with undefined if the nothing is upgradeable', function () { - var response = { hits: { hits: [ { _id: '4.0.1-beta1' }, { _id: '4.0.0-snapshot1' } ] } }; + const response = { hits: { hits: [ { _id: '4.0.1-beta1' }, { _id: '4.0.0-snapshot1' } ] } }; return upgrade(response).then(function (resp) { expect(resp).to.be(undefined); }); @@ -101,10 +101,10 @@ describe('plugins/elasticsearch', function () { it('should update the build number on the new config', function () { get.withArgs('pkg.buildNum').returns(5801); client.create.returns(Promise.resolve()); - var response = { hits: { hits: [ { _id: '4.0.0', _source: { buildNum: 1 } } ] } }; + const response = { hits: { hits: [ { _id: '4.0.0', _source: { buildNum: 1 } } ] } }; return upgrade(response).then(function (resp) { sinon.assert.calledOnce(client.create); - var params = client.create.args[0][0]; + const params = client.create.args[0][0]; expect(params).to.have.property('body'); expect(params.body).to.have.property('buildNum', 5801); expect(params).to.have.property('index', '.my-kibana'); @@ -116,11 +116,11 @@ describe('plugins/elasticsearch', function () { it('should log a message for upgrades', function () { get.withArgs('pkg.buildNum').returns(5801); client.create.returns(Promise.resolve()); - var response = { hits: { hits: [ { _id: '4.0.0', _source: { buildNum: 1 } } ] } }; + const response = { hits: { hits: [ { _id: '4.0.0', _source: { buildNum: 1 } } ] } }; return upgrade(response).then(function (resp) { sinon.assert.calledOnce(server.log); expect(server.log.args[0][0]).to.eql(['plugin', 'elasticsearch']); - var msg = server.log.args[0][1]; + const msg = server.log.args[0][1]; expect(msg).to.have.property('prevVersion', '4.0.0'); expect(msg).to.have.property('newVersion', '4.0.1'); expect(msg.tmpl).to.contain('Upgrade'); @@ -130,10 +130,10 @@ describe('plugins/elasticsearch', function () { it('should copy attributes from old config', function () { get.withArgs('pkg.buildNum').returns(5801); client.create.returns(Promise.resolve()); - var response = { hits: { hits: [ { _id: '4.0.0', _source: { buildNum: 1, defaultIndex: 'logstash-*' } } ] } }; + const response = { hits: { hits: [ { _id: '4.0.0', _source: { buildNum: 1, defaultIndex: 'logstash-*' } } ] } }; return upgrade(response).then(function (resp) { sinon.assert.calledOnce(client.create); - var params = client.create.args[0][0]; + const params = client.create.args[0][0]; expect(params).to.have.property('body'); expect(params.body).to.have.property('defaultIndex', 'logstash-*'); }); diff --git a/src/plugins/elasticsearch/lib/__tests__/version_satisfies.js b/src/plugins/elasticsearch/lib/__tests__/version_satisfies.js index 9b1b72d298817..20438a445d887 100644 --- a/src/plugins/elasticsearch/lib/__tests__/version_satisfies.js +++ b/src/plugins/elasticsearch/lib/__tests__/version_satisfies.js @@ -1,7 +1,7 @@ -var versionSatisfies = require('../version_satisfies'); -var expect = require('expect.js'); +const versionSatisfies = require('../version_satisfies'); +const expect = require('expect.js'); -var versionChecks = [ +const versionChecks = [ // order is: ['actual version', 'match expression', satisfied (true/false)] ['0.90.0', '>=0.90.0', true], ['1.2.0', '>=1.2.1 <2.0.0', false], @@ -30,10 +30,10 @@ var versionChecks = [ describe('plugins/elasticsearch', function () { describe('lib/version_satisfies', function () { versionChecks.forEach(function (spec) { - var actual = spec[0]; - var match = spec[1]; - var satisfied = spec[2]; - var desc = actual + ' satisfies ' + match; + const actual = spec[0]; + const match = spec[1]; + const satisfied = spec[2]; + const desc = actual + ' satisfies ' + match; describe(desc, function () { it('should be ' + satisfied, function () { diff --git a/src/plugins/elasticsearch/lib/check_es_version.js b/src/plugins/elasticsearch/lib/check_es_version.js index a3372a8c83cb9..c06c5e4c34cba 100644 --- a/src/plugins/elasticsearch/lib/check_es_version.js +++ b/src/plugins/elasticsearch/lib/check_es_version.js @@ -1,19 +1,19 @@ -var _ = require('lodash'); -var esBool = require('./es_bool'); -var versionSatisfies = require('./version_satisfies'); -var SetupError = require('./setup_error'); +const _ = require('lodash'); +const esBool = require('./es_bool'); +const versionSatisfies = require('./version_satisfies'); +const SetupError = require('./setup_error'); module.exports = function (server) { server.log(['plugin', 'debug'], 'Checking Elasticsearch version'); - var client = server.plugins.elasticsearch.client; - var engineVersion = server.config().get('elasticsearch.engineVersion'); + const client = server.plugins.elasticsearch.client; + const engineVersion = server.config().get('elasticsearch.engineVersion'); return client.nodes.info() .then(function (info) { - var badNodes = _.filter(info.nodes, function (node) { + const badNodes = _.filter(info.nodes, function (node) { // remove client nodes (Logstash) - var isClient = _.get(node, 'attributes.client'); + const isClient = _.get(node, 'attributes.client'); if (isClient != null && esBool(isClient) === true) { return false; } @@ -24,11 +24,11 @@ module.exports = function (server) { if (!badNodes.length) return true; - var badNodeNames = badNodes.map(function (node) { + const badNodeNames = badNodes.map(function (node) { return 'Elasticsearch v' + node.version + ' @ ' + node.http_address + ' (' + node.ip + ')'; }); - var message = `This version of Kibana requires Elasticsearch ` + + const message = `This version of Kibana requires Elasticsearch ` + `${engineVersion} on all nodes. I found ` + `the following incompatible nodes in your cluster: ${badNodeNames.join(',')}`; diff --git a/src/plugins/elasticsearch/lib/create_agent.js b/src/plugins/elasticsearch/lib/create_agent.js index 5fd7afc56be24..a7fc8c2b6b448 100644 --- a/src/plugins/elasticsearch/lib/create_agent.js +++ b/src/plugins/elasticsearch/lib/create_agent.js @@ -1,16 +1,16 @@ -var url = require('url'); -var _ = require('lodash'); -var readFile = (file) => require('fs').readFileSync(file, 'utf8'); -var http = require('http'); -var https = require('https'); +const url = require('url'); +const _ = require('lodash'); +const readFile = (file) => require('fs').readFileSync(file, 'utf8'); +const http = require('http'); +const https = require('https'); module.exports = _.memoize(function (server) { - var config = server.config(); - var target = url.parse(config.get('elasticsearch.url')); + const config = server.config(); + const target = url.parse(config.get('elasticsearch.url')); if (!/^https/.test(target.protocol)) return new http.Agent(); - var agentOptions = { + const agentOptions = { rejectUnauthorized: config.get('elasticsearch.ssl.verify') }; diff --git a/src/plugins/elasticsearch/lib/create_kibana_index.js b/src/plugins/elasticsearch/lib/create_kibana_index.js index d224afd3fb546..3d18eecf38490 100644 --- a/src/plugins/elasticsearch/lib/create_kibana_index.js +++ b/src/plugins/elasticsearch/lib/create_kibana_index.js @@ -1,8 +1,8 @@ -var SetupError = require('./setup_error'); -var format = require('util').format; +const SetupError = require('./setup_error'); +const format = require('util').format; module.exports = function (server) { - var client = server.plugins.elasticsearch.client; - var index = server.config().get('kibana.index'); + const client = server.plugins.elasticsearch.client; + const index = server.config().get('kibana.index'); function handleError(message) { return function (err) { diff --git a/src/plugins/elasticsearch/lib/create_proxy.js b/src/plugins/elasticsearch/lib/create_proxy.js index 90f8bde10f70b..29f613aa80475 100644 --- a/src/plugins/elasticsearch/lib/create_proxy.js +++ b/src/plugins/elasticsearch/lib/create_proxy.js @@ -1,10 +1,10 @@ -var createAgent = require('./create_agent'); -var mapUri = require('./map_uri'); -var { resolve } = require('url'); +const createAgent = require('./create_agent'); +const mapUri = require('./map_uri'); +const { resolve } = require('url'); function createProxy(server, method, route, config) { - var options = { + const options = { method: method, path: createProxy.createPath(route), handler: { diff --git a/src/plugins/elasticsearch/lib/es_bool.js b/src/plugins/elasticsearch/lib/es_bool.js index 4d9b679a69a6a..353520f3fea32 100644 --- a/src/plugins/elasticsearch/lib/es_bool.js +++ b/src/plugins/elasticsearch/lib/es_bool.js @@ -1,4 +1,4 @@ -var map = { +const map = { 'false': false, 'off': false, 'no': false, @@ -9,7 +9,7 @@ var map = { '1': true }; module.exports = function (str) { - var bool = map[String(str)]; + const bool = map[String(str)]; if (typeof bool !== 'boolean') { throw new TypeError('"' + str + '" does not map to an esBool'); } diff --git a/src/plugins/elasticsearch/lib/expose_client.js b/src/plugins/elasticsearch/lib/expose_client.js index 61c6c81d69d11..f12fb803c4855 100644 --- a/src/plugins/elasticsearch/lib/expose_client.js +++ b/src/plugins/elasticsearch/lib/expose_client.js @@ -1,12 +1,12 @@ -var elasticsearch = require('elasticsearch'); -var _ = require('lodash'); -var readFile = (file) => require('fs').readFileSync(file, 'utf8'); -var util = require('util'); -var url = require('url'); -var callWithRequest = require('./call_with_request'); +const elasticsearch = require('elasticsearch'); +const _ = require('lodash'); +const readFile = (file) => require('fs').readFileSync(file, 'utf8'); +const util = require('util'); +const url = require('url'); +const callWithRequest = require('./call_with_request'); module.exports = function (server) { - var config = server.config(); + const config = server.config(); function createClient(options) { options = _.defaults(options || {}, { @@ -22,14 +22,14 @@ module.exports = function (server) { auth: true }); - var uri = url.parse(options.url); + const uri = url.parse(options.url); - var authorization; + let authorization; if (options.auth && options.username && options.password) { uri.auth = util.format('%s:%s', options.username, options.password); } - var ssl = { rejectUnauthorized: options.verifySsl }; + const ssl = { rejectUnauthorized: options.verifySsl }; if (options.clientCrt && options.clientKey) { ssl.cert = readFile(options.clientCrt); ssl.key = readFile(options.clientKey); @@ -58,10 +58,10 @@ module.exports = function (server) { }); } - var client = createClient(); + const client = createClient(); server.on('close', _.bindKey(client, 'close')); - var noAuthClient = createClient({ auth: false }); + const noAuthClient = createClient({ auth: false }); server.on('close', _.bindKey(noAuthClient, 'close')); server.expose('client', client); diff --git a/src/plugins/elasticsearch/lib/health_check.js b/src/plugins/elasticsearch/lib/health_check.js index c15987d161c40..15fc7b686a656 100644 --- a/src/plugins/elasticsearch/lib/health_check.js +++ b/src/plugins/elasticsearch/lib/health_check.js @@ -1,23 +1,23 @@ -var _ = require('lodash'); -var Promise = require('bluebird'); -var elasticsearch = require('elasticsearch'); -var exposeClient = require('./expose_client'); -var migrateConfig = require('./migrate_config'); -var createKibanaIndex = require('./create_kibana_index'); -var checkEsVersion = require('./check_es_version'); -var NoConnections = elasticsearch.errors.NoConnections; -var util = require('util'); -var format = util.format; - -var NO_INDEX = 'no_index'; -var INITIALIZING = 'initializing'; -var READY = 'ready'; - -var REQUEST_DELAY = 2500; +const _ = require('lodash'); +const Promise = require('bluebird'); +const elasticsearch = require('elasticsearch'); +const exposeClient = require('./expose_client'); +const migrateConfig = require('./migrate_config'); +const createKibanaIndex = require('./create_kibana_index'); +const checkEsVersion = require('./check_es_version'); +const NoConnections = elasticsearch.errors.NoConnections; +const util = require('util'); +const format = util.format; + +const NO_INDEX = 'no_index'; +const INITIALIZING = 'initializing'; +const READY = 'ready'; + +const REQUEST_DELAY = 2500; module.exports = function (plugin, server) { - var config = server.config(); - var client = server.plugins.elasticsearch.client; + const config = server.config(); + const client = server.plugins.elasticsearch.client; plugin.status.yellow('Waiting for Elasticsearch'); @@ -90,12 +90,12 @@ module.exports = function (plugin, server) { .catch(err => plugin.status.red(err)); } - var timeoutId = null; + let timeoutId = null; function scheduleCheck(ms) { if (timeoutId) return; - var myId = setTimeout(function () { + const myId = setTimeout(function () { check().finally(function () { if (timeoutId === myId) startorRestartChecking(); }); diff --git a/src/plugins/elasticsearch/lib/is_upgradeable.js b/src/plugins/elasticsearch/lib/is_upgradeable.js index 3629faaa0b4ca..bb43aac87169d 100644 --- a/src/plugins/elasticsearch/lib/is_upgradeable.js +++ b/src/plugins/elasticsearch/lib/is_upgradeable.js @@ -1,19 +1,19 @@ -var semver = require('semver'); -var utils = require('requirefrom')('src/utils'); -var rcVersionRegex = /(\d+\.\d+\.\d+)\-rc(\d+)/i; +const semver = require('semver'); +const utils = require('requirefrom')('src/utils'); +const rcVersionRegex = /(\d+\.\d+\.\d+)\-rc(\d+)/i; module.exports = function (server, doc) { - var config = server.config(); + const config = server.config(); if (/beta|snapshot/i.test(doc._id)) return false; if (!doc._id) return false; if (doc._id === config.get('pkg.version')) return false; - var packageRcRelease = Infinity; - var rcRelease = Infinity; - var packageVersion = config.get('pkg.version'); - var version = doc._id; - var matches = doc._id.match(rcVersionRegex); - var packageMatches = config.get('pkg.version').match(rcVersionRegex); + let packageRcRelease = Infinity; + let rcRelease = Infinity; + let packageVersion = config.get('pkg.version'); + let version = doc._id; + const matches = doc._id.match(rcVersionRegex); + const packageMatches = config.get('pkg.version').match(rcVersionRegex); if (matches) { version = matches[1]; diff --git a/src/plugins/elasticsearch/lib/map_uri.js b/src/plugins/elasticsearch/lib/map_uri.js index de78529c05638..f7b1b327ee59e 100644 --- a/src/plugins/elasticsearch/lib/map_uri.js +++ b/src/plugins/elasticsearch/lib/map_uri.js @@ -1,15 +1,15 @@ -var querystring = require('querystring'); -var resolve = require('url').resolve; +const querystring = require('querystring'); +const resolve = require('url').resolve; module.exports = function mapUri(server, prefix) { - var config = server.config(); + const config = server.config(); return function (request, done) { - var path = request.path.replace('/elasticsearch', ''); - var url = config.get('elasticsearch.url'); + const path = request.path.replace('/elasticsearch', ''); + let url = config.get('elasticsearch.url'); if (path) { if (/\/$/.test(url)) url = url.substring(0, url.length - 1); url += path; } - var query = querystring.stringify(request.query); + const query = querystring.stringify(request.query); if (query) url += '?' + query; done(null, url); }; diff --git a/src/plugins/elasticsearch/lib/migrate_config.js b/src/plugins/elasticsearch/lib/migrate_config.js index 3d32bb2137908..632c7e69166c6 100644 --- a/src/plugins/elasticsearch/lib/migrate_config.js +++ b/src/plugins/elasticsearch/lib/migrate_config.js @@ -1,9 +1,9 @@ -var upgrade = require('./upgrade_config'); +const upgrade = require('./upgrade_config'); module.exports = function (server) { - var config = server.config(); - var client = server.plugins.elasticsearch.client; - var options = { + const config = server.config(); + const client = server.plugins.elasticsearch.client; + const options = { index: config.get('kibana.index'), type: 'config', body: { diff --git a/src/plugins/elasticsearch/lib/setup_error.js b/src/plugins/elasticsearch/lib/setup_error.js index 25c93badd3964..483b592c7a592 100644 --- a/src/plugins/elasticsearch/lib/setup_error.js +++ b/src/plugins/elasticsearch/lib/setup_error.js @@ -1,8 +1,8 @@ -var _ = require('lodash'); -var util = require('util'); +const _ = require('lodash'); +const util = require('util'); function SetupError(server, template, err) { - var config = server.config().get(); + const config = server.config().get(); // don't override other setup errors if (err && err instanceof SetupError) return err; Error.captureStackTrace(this, this.constructor); diff --git a/src/plugins/elasticsearch/lib/upgrade_config.js b/src/plugins/elasticsearch/lib/upgrade_config.js index 4defb84589da5..f8ff58334de3a 100644 --- a/src/plugins/elasticsearch/lib/upgrade_config.js +++ b/src/plugins/elasticsearch/lib/upgrade_config.js @@ -1,18 +1,18 @@ -var Promise = require('bluebird'); -var isUpgradeable = require('./is_upgradeable'); -var _ = require('lodash'); -var format = require('util').format; +const Promise = require('bluebird'); +const isUpgradeable = require('./is_upgradeable'); +const _ = require('lodash'); +const format = require('util').format; -var utils = require('requirefrom')('src/utils'); +const utils = require('requirefrom')('src/utils'); module.exports = function (server) { - var MAX_INTEGER = Math.pow(2, 53) - 1; + const MAX_INTEGER = Math.pow(2, 53) - 1; - var client = server.plugins.elasticsearch.client; - var config = server.config(); + const client = server.plugins.elasticsearch.client; + const config = server.config(); return function (response) { - var newConfig = {}; + const newConfig = {}; // Check to see if there are any doc. If not then we set the build number and id if (response.hits.hits.length === 0) { @@ -25,7 +25,7 @@ module.exports = function (server) { } // if we already have a the current version in the index then we need to stop - var devConfig = _.find(response.hits.hits, function currentVersion(hit) { + const devConfig = _.find(response.hits.hits, function currentVersion(hit) { return hit._id !== '@@version' && hit._id === config.get('pkg.version'); }); @@ -33,7 +33,7 @@ module.exports = function (server) { // Look for upgradeable configs. If none of them are upgradeable // then resolve with null. - var body = _.find(response.hits.hits, isUpgradeable.bind(null, server)); + const body = _.find(response.hits.hits, isUpgradeable.bind(null, server)); if (!body) return Promise.resolve(); // if the build number is still the template string (which it wil be in development) diff --git a/src/plugins/elasticsearch/lib/version_satisfies.js b/src/plugins/elasticsearch/lib/version_satisfies.js index b95956d5d3c06..eac84e2942c1c 100644 --- a/src/plugins/elasticsearch/lib/version_satisfies.js +++ b/src/plugins/elasticsearch/lib/version_satisfies.js @@ -1,15 +1,15 @@ -var semver = require('semver'); +const semver = require('semver'); module.exports = function (actual, expected) { try { - var ver = cleanVersion(actual); + const ver = cleanVersion(actual); return semver.satisfies(ver, expected); } catch (err) { return false; } function cleanVersion(version) { - var match = version.match(/\d+\.\d+\.\d+/); + const match = version.match(/\d+\.\d+\.\d+/); if (!match) return version; return match[0]; } From 43d34167fd02d61287efbf60882a1a35865c1f98 Mon Sep 17 00:00:00 2001 From: Court Ewing Date: Mon, 1 Feb 2016 19:45:22 -0500 Subject: [PATCH 04/10] Use const/let in kbn_vislib_vis_types plugin --- .../kbn_vislib_vis_types/public/area.js | 4 +-- .../controls/line_interpolation_option.js | 6 ++-- .../public/controls/point_series_options.js | 6 ++-- .../public/controls/vislib_basic_options.js | 6 ++-- .../kbn_vislib_vis_types/public/histogram.js | 4 +-- .../public/kbn_vislib_vis_types.js | 2 +- .../kbn_vislib_vis_types/public/line.js | 4 +-- .../kbn_vislib_vis_types/public/pie.js | 4 +-- .../kbn_vislib_vis_types/public/tileMap.js | 32 +++++++++---------- 9 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/plugins/kbn_vislib_vis_types/public/area.js b/src/plugins/kbn_vislib_vis_types/public/area.js index 9f94093e45627..e12b1b72ccafd 100644 --- a/src/plugins/kbn_vislib_vis_types/public/area.js +++ b/src/plugins/kbn_vislib_vis_types/public/area.js @@ -1,7 +1,7 @@ define(function (require) { return function HistogramVisType(Private) { - var VislibVisType = Private(require('ui/vislib_vis_type/VislibVisType')); - var Schemas = Private(require('ui/Vis/Schemas')); + const VislibVisType = Private(require('ui/vislib_vis_type/VislibVisType')); + const Schemas = Private(require('ui/Vis/Schemas')); return new VislibVisType({ name: 'area', diff --git a/src/plugins/kbn_vislib_vis_types/public/controls/line_interpolation_option.js b/src/plugins/kbn_vislib_vis_types/public/controls/line_interpolation_option.js index 23aac4bdaaf63..b9ee57748263e 100644 --- a/src/plugins/kbn_vislib_vis_types/public/controls/line_interpolation_option.js +++ b/src/plugins/kbn_vislib_vis_types/public/controls/line_interpolation_option.js @@ -1,7 +1,7 @@ define(function (require) { - var _ = require('lodash'); - var $ = require('jquery'); - var module = require('ui/modules').get('kibana'); + const _ = require('lodash'); + const $ = require('jquery'); + const module = require('ui/modules').get('kibana'); module.directive('lineInterpolationOption', function ($parse, $compile) { return { diff --git a/src/plugins/kbn_vislib_vis_types/public/controls/point_series_options.js b/src/plugins/kbn_vislib_vis_types/public/controls/point_series_options.js index 8fac50be538ca..b0d6e337fbc7b 100644 --- a/src/plugins/kbn_vislib_vis_types/public/controls/point_series_options.js +++ b/src/plugins/kbn_vislib_vis_types/public/controls/point_series_options.js @@ -1,7 +1,7 @@ define(function (require) { - var _ = require('lodash'); - var $ = require('jquery'); - var module = require('ui/modules').get('kibana'); + const _ = require('lodash'); + const $ = require('jquery'); + const module = require('ui/modules').get('kibana'); require('ui/directives/inequality'); module.directive('pointSeriesOptions', function ($parse, $compile) { diff --git a/src/plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.js b/src/plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.js index 1d7b9d6d06d97..92c0cca39413d 100644 --- a/src/plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.js +++ b/src/plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.js @@ -1,7 +1,7 @@ define(function (require) { - var _ = require('lodash'); - var $ = require('jquery'); - var module = require('ui/modules').get('kibana'); + const _ = require('lodash'); + const $ = require('jquery'); + const module = require('ui/modules').get('kibana'); module.directive('vislibBasicOptions', function ($parse, $compile) { return { diff --git a/src/plugins/kbn_vislib_vis_types/public/histogram.js b/src/plugins/kbn_vislib_vis_types/public/histogram.js index aeb01ef7d7990..3a87179b045e7 100644 --- a/src/plugins/kbn_vislib_vis_types/public/histogram.js +++ b/src/plugins/kbn_vislib_vis_types/public/histogram.js @@ -1,7 +1,7 @@ define(function (require) { return function HistogramVisType(Private) { - var VislibVisType = Private(require('ui/vislib_vis_type/VislibVisType')); - var Schemas = Private(require('ui/Vis/Schemas')); + const VislibVisType = Private(require('ui/vislib_vis_type/VislibVisType')); + const Schemas = Private(require('ui/Vis/Schemas')); return new VislibVisType({ name: 'histogram', diff --git a/src/plugins/kbn_vislib_vis_types/public/kbn_vislib_vis_types.js b/src/plugins/kbn_vislib_vis_types/public/kbn_vislib_vis_types.js index 6aa4e07a0230f..a1712742393ef 100644 --- a/src/plugins/kbn_vislib_vis_types/public/kbn_vislib_vis_types.js +++ b/src/plugins/kbn_vislib_vis_types/public/kbn_vislib_vis_types.js @@ -1,5 +1,5 @@ define(function (require) { - var visTypes = require('ui/registry/vis_types'); + const visTypes = require('ui/registry/vis_types'); visTypes.register(require('plugins/kbn_vislib_vis_types/histogram')); visTypes.register(require('plugins/kbn_vislib_vis_types/line')); visTypes.register(require('plugins/kbn_vislib_vis_types/pie')); diff --git a/src/plugins/kbn_vislib_vis_types/public/line.js b/src/plugins/kbn_vislib_vis_types/public/line.js index dbc9fdc8dc2da..bab825dfb0874 100644 --- a/src/plugins/kbn_vislib_vis_types/public/line.js +++ b/src/plugins/kbn_vislib_vis_types/public/line.js @@ -1,7 +1,7 @@ define(function (require) { return function HistogramVisType(Private) { - var VislibVisType = Private(require('ui/vislib_vis_type/VislibVisType')); - var Schemas = Private(require('ui/Vis/Schemas')); + const VislibVisType = Private(require('ui/vislib_vis_type/VislibVisType')); + const Schemas = Private(require('ui/Vis/Schemas')); return new VislibVisType({ name: 'line', diff --git a/src/plugins/kbn_vislib_vis_types/public/pie.js b/src/plugins/kbn_vislib_vis_types/public/pie.js index 04714ef260ee9..c69ed934af61a 100644 --- a/src/plugins/kbn_vislib_vis_types/public/pie.js +++ b/src/plugins/kbn_vislib_vis_types/public/pie.js @@ -1,7 +1,7 @@ define(function (require) { return function HistogramVisType(Private) { - var VislibVisType = Private(require('ui/vislib_vis_type/VislibVisType')); - var Schemas = Private(require('ui/Vis/Schemas')); + const VislibVisType = Private(require('ui/vislib_vis_type/VislibVisType')); + const Schemas = Private(require('ui/Vis/Schemas')); return new VislibVisType({ name: 'pie', diff --git a/src/plugins/kbn_vislib_vis_types/public/tileMap.js b/src/plugins/kbn_vislib_vis_types/public/tileMap.js index 0b7860a5147ca..668ee2320ce2a 100644 --- a/src/plugins/kbn_vislib_vis_types/public/tileMap.js +++ b/src/plugins/kbn_vislib_vis_types/public/tileMap.js @@ -1,10 +1,10 @@ define(function (require) { return function TileMapVisType(Private, getAppState, courier, config) { - var VislibVisType = Private(require('ui/vislib_vis_type/VislibVisType')); - var Schemas = Private(require('ui/Vis/Schemas')); - var geoJsonConverter = Private(require('ui/agg_response/geo_json/geo_json')); - var _ = require('lodash'); - var supports = require('ui/utils/supports'); + const VislibVisType = Private(require('ui/vislib_vis_type/VislibVisType')); + const Schemas = Private(require('ui/Vis/Schemas')); + const geoJsonConverter = Private(require('ui/agg_response/geo_json/geo_json')); + const _ = require('lodash'); + const supports = require('ui/utils/supports'); return new VislibVisType({ name: 'tile_map', @@ -30,41 +30,41 @@ define(function (require) { }, listeners: { rectangle: function (event) { - var agg = _.get(event, 'chart.geohashGridAgg'); + const agg = _.get(event, 'chart.geohashGridAgg'); if (!agg) return; - var pushFilter = Private(require('ui/filter_bar/push_filter'))(getAppState()); - var indexPatternName = agg.vis.indexPattern.id; - var field = agg.fieldName(); - var filter = {geo_bounding_box: {}}; + const pushFilter = Private(require('ui/filter_bar/push_filter'))(getAppState()); + const indexPatternName = agg.vis.indexPattern.id; + const field = agg.fieldName(); + const filter = {geo_bounding_box: {}}; filter.geo_bounding_box[field] = event.bounds; pushFilter(filter, false, indexPatternName); }, mapMoveEnd: function (event) { - var agg = _.get(event, 'chart.geohashGridAgg'); + const agg = _.get(event, 'chart.geohashGridAgg'); if (!agg) return; agg.params.mapZoom = event.zoom; agg.params.mapCenter = [event.center.lat, event.center.lng]; - var editableVis = agg.vis.getEditableVis(); + const editableVis = agg.vis.getEditableVis(); if (!editableVis) return; - var editableAgg = editableVis.aggs.byId[agg.id]; + const editableAgg = editableVis.aggs.byId[agg.id]; if (editableAgg) { editableAgg.params.mapZoom = event.zoom; editableAgg.params.mapCenter = [event.center.lat, event.center.lng]; } }, mapZoomEnd: function (event) { - var agg = _.get(event, 'chart.geohashGridAgg'); + const agg = _.get(event, 'chart.geohashGridAgg'); if (!agg || !agg.params.autoPrecision) return; // zoomPrecision maps event.zoom to a geohash precision value // event.limit is the configurable max geohash precision // default max precision is 7, configurable up to 12 - var zoomPrecision = { + const zoomPrecision = { 1: 2, 2: 2, 3: 2, @@ -85,7 +85,7 @@ define(function (require) { 18: 12 }; - var precision = config.get('visualization:tileMap:maxPrecision'); + const precision = config.get('visualization:tileMap:maxPrecision'); agg.params.precision = Math.min(zoomPrecision[event.zoom], precision); courier.fetch(); From 736b46050ccc791f8e3030509301c4e5bda6416a Mon Sep 17 00:00:00 2001 From: Court Ewing Date: Mon, 1 Feb 2016 19:48:47 -0500 Subject: [PATCH 05/10] Use const/let in kibana plugin --- .../components/panel/lib/load_panel.js | 4 +- .../components/panel/lib/visualization.js | 4 +- .../dashboard/components/panel/panel.js | 34 +++--- .../public/dashboard/directives/grid.js | 52 ++++----- src/plugins/kibana/public/dashboard/index.js | 42 ++++---- .../dashboard/services/_saved_dashboard.js | 8 +- .../dashboard/services/saved_dashboards.js | 12 +-- .../__tests__/directives/discover_field.js | 18 ++-- .../__tests__/directives/field_calculator.js | 28 ++--- .../__tests__/directives/field_chooser.js | 46 ++++---- .../public/discover/__tests__/hit_sort_fn.js | 20 ++-- .../kibana/public/discover/_hit_sort_fn.js | 14 +-- .../field_chooser/discover_field.js | 20 ++-- .../components/field_chooser/field_chooser.js | 56 +++++----- .../field_chooser/lib/field_calculator.js | 18 ++-- .../public/discover/controllers/discover.js | 100 +++++++++--------- .../public/discover/directives/timechart.js | 10 +- .../discover/saved_searches/_saved_search.js | 4 +- .../discover/saved_searches/saved_searches.js | 14 +-- .../kibana/public/doc/__tests__/doc.js | 14 +-- .../kibana/public/doc/controllers/doc.js | 12 +-- src/plugins/kibana/public/kibana.js | 10 +- src/plugins/kibana/public/settings/index.js | 4 +- .../public/settings/saved_object_registry.js | 4 +- .../public/settings/sections/about/index.js | 2 +- .../sections/advanced/advanced_row.js | 10 +- .../settings/sections/advanced/index.js | 14 +-- .../advanced/lib/__tests__/get_editor_type.js | 4 +- .../advanced/lib/__tests__/get_val_type.js | 4 +- .../lib/__tests__/to_editable_config.js | 6 +- .../sections/advanced/lib/get_editor_type.js | 6 +- .../sections/advanced/lib/get_val_type.js | 2 +- .../advanced/lib/to_editable_config.js | 12 +-- .../settings/sections/indices/_create.js | 46 ++++---- .../sections/indices/_date_scripts.js | 6 +- .../public/settings/sections/indices/_edit.js | 12 +-- .../sections/indices/_field_editor.js | 8 +- .../settings/sections/indices/_field_types.js | 4 +- .../sections/indices/_indexed_fields.js | 20 ++-- .../sections/indices/_scripted_fields.js | 30 +++--- .../public/settings/sections/indices/index.js | 4 +- .../settings/sections/objects/_objects.js | 34 +++--- .../public/settings/sections/objects/_view.js | 42 ++++---- .../public/settings/sections/status/index.js | 2 +- .../public/visualize/editor/__tests__/agg.js | 22 ++-- .../kibana/public/visualize/editor/agg.js | 20 ++-- .../kibana/public/visualize/editor/agg_add.js | 6 +- .../public/visualize/editor/agg_filter.js | 4 +- .../public/visualize/editor/agg_group.js | 6 +- .../public/visualize/editor/agg_param.js | 2 +- .../public/visualize/editor/agg_params.js | 44 ++++---- .../kibana/public/visualize/editor/editor.js | 44 ++++---- .../visualize/editor/nesting_indicator.js | 14 +-- .../kibana/public/visualize/editor/sidebar.js | 2 +- .../public/visualize/editor/vis_options.js | 8 +- .../saved_visualizations/_saved_vis.js | 22 ++-- .../saved_visualizations.js | 18 ++-- .../kibana/public/visualize/wizard/wizard.js | 10 +- 58 files changed, 519 insertions(+), 519 deletions(-) diff --git a/src/plugins/kibana/public/dashboard/components/panel/lib/load_panel.js b/src/plugins/kibana/public/dashboard/components/panel/lib/load_panel.js index b7d7b42554be2..b954c88fea005 100644 --- a/src/plugins/kibana/public/dashboard/components/panel/lib/load_panel.js +++ b/src/plugins/kibana/public/dashboard/components/panel/lib/load_panel.js @@ -1,8 +1,8 @@ define(function (require) { - var _ = require('lodash'); + const _ = require('lodash'); return function loadPanelFunction(Private) { // Inject services here return function (panel, $scope) { // Function parameters here - var panelTypes = { + const panelTypes = { visualization: Private(require('plugins/kibana/dashboard/components/panel/lib/visualization')), search: Private(require('plugins/kibana/dashboard/components/panel/lib/search')) }; diff --git a/src/plugins/kibana/public/dashboard/components/panel/lib/visualization.js b/src/plugins/kibana/public/dashboard/components/panel/lib/visualization.js index e811f18f2dfd9..2e4415f42b7cc 100644 --- a/src/plugins/kibana/public/dashboard/components/panel/lib/visualization.js +++ b/src/plugins/kibana/public/dashboard/components/panel/lib/visualization.js @@ -1,7 +1,7 @@ define(function (require) { return function visualizationLoader(savedVisualizations, Private) { // Inject services here - var brushEvent = Private(require('ui/utils/brush_event')); - var filterBarClickHandler = Private(require('ui/filter_bar/filter_bar_click_handler')); + const brushEvent = Private(require('ui/utils/brush_event')); + const filterBarClickHandler = Private(require('ui/filter_bar/filter_bar_click_handler')); return function (panel, $scope) { // Function parameters here return savedVisualizations.get(panel.id) diff --git a/src/plugins/kibana/public/dashboard/components/panel/panel.js b/src/plugins/kibana/public/dashboard/components/panel/panel.js index 9ec79dcc244c1..9dce83395c8ae 100644 --- a/src/plugins/kibana/public/dashboard/components/panel/panel.js +++ b/src/plugins/kibana/public/dashboard/components/panel/panel.js @@ -1,16 +1,16 @@ define(function (require) { - var moment = require('moment'); - var $ = require('jquery'); + const moment = require('moment'); + const $ = require('jquery'); require('ui/modules') .get('app/dashboard') .directive('dashboardPanel', function (savedVisualizations, savedSearches, Notifier, Private, $injector) { - var _ = require('lodash'); - var loadPanel = Private(require('plugins/kibana/dashboard/components/panel/lib/load_panel')); - var filterManager = Private(require('ui/filter_manager')); - var notify = new Notifier(); + const _ = require('lodash'); + const loadPanel = Private(require('plugins/kibana/dashboard/components/panel/lib/load_panel')); + const filterManager = Private(require('ui/filter_manager')); + const notify = new Notifier(); - var services = require('plugins/kibana/settings/saved_object_registry').all().map(function (serviceObj) { - var service = $injector.get(serviceObj.service); + const services = require('plugins/kibana/settings/saved_object_registry').all().map(function (serviceObj) { + const service = $injector.get(serviceObj.service); return { type: service.type, name: serviceObj.service @@ -20,9 +20,9 @@ define(function (require) { require('ui/visualize'); require('ui/doc_table'); - var brushEvent = Private(require('ui/utils/brush_event')); + const brushEvent = Private(require('ui/utils/brush_event')); - var getPanelId = function (panel) { + const getPanelId = function (panel) { return ['P', panel.panelIndex].join('-'); }; @@ -32,7 +32,7 @@ define(function (require) { requires: '^dashboardGrid', link: function ($scope, $el) { // using $scope inheritance, panels are available in AppState - var $state = $scope.state; + const $state = $scope.state; // receives $scope.panel from the dashboard grid directive, seems like should be isolate? $scope.$watch('id', function () { @@ -49,11 +49,11 @@ define(function (require) { }); // create child ui state from the savedObj - var uiState = panelConfig.uiState || {}; + const uiState = panelConfig.uiState || {}; $scope.uiState = $scope.parentUiState.createChild(getPanelId(panelConfig.panel), uiState, true); $scope.filter = function (field, value, operator) { - var index = $scope.savedObj.searchSource.get('index').id; + const index = $scope.savedObj.searchSource.get('index').id; filterManager.add(field, value, operator, index); }; }) @@ -63,12 +63,12 @@ define(function (require) { // If the savedObjectType matches the panel type, this means the object itself has been deleted, // so we shouldn't even have an edit link. If they don't match, it means something else is wrong // with the object (but the object still exists), so we link to the object editor instead. - var objectItselfDeleted = e.savedObjectType === $scope.panel.type; + const objectItselfDeleted = e.savedObjectType === $scope.panel.type; if (objectItselfDeleted) return; - var type = $scope.panel.type; - var id = $scope.panel.id; - var service = _.find(services, { type: type }); + const type = $scope.panel.type; + const id = $scope.panel.id; + const service = _.find(services, { type: type }); if (!service) return; $scope.editUrl = '#settings/objects/' + service.name + '/' + id + '?notFound=' + e.savedObjectType; diff --git a/src/plugins/kibana/public/dashboard/directives/grid.js b/src/plugins/kibana/public/dashboard/directives/grid.js index c66d7af5b9576..da93a5b5a271a 100644 --- a/src/plugins/kibana/public/dashboard/directives/grid.js +++ b/src/plugins/kibana/public/dashboard/directives/grid.js @@ -1,38 +1,38 @@ define(function (require) { - var _ = require('lodash'); - var $ = require('jquery'); - var Binder = require('ui/Binder'); + const _ = require('lodash'); + const $ = require('jquery'); + const Binder = require('ui/Binder'); require('gridster'); - var app = require('ui/modules').get('app/dashboard'); + const app = require('ui/modules').get('app/dashboard'); app.directive('dashboardGrid', function ($compile, Notifier) { return { restrict: 'E', require: '^dashboardApp', // must inherit from the dashboardApp link: function ($scope, $el) { - var notify = new Notifier(); - var $container = $el; + const notify = new Notifier(); + const $container = $el; $el = $('
    ').appendTo($container); - var $window = $(window); - var $body = $(document.body); - var binder = new Binder($scope); + const $window = $(window); + const $body = $(document.body); + const binder = new Binder($scope); // appState from controller - var $state = $scope.state; + const $state = $scope.state; - var gridster; // defined in init() + let gridster; // defined in init() // number of columns to render - var COLS = 12; + const COLS = 12; // number of pixed between each column/row - var SPACER = 10; + const SPACER = 10; // pixels used by all of the spacers (gridster puts have a spacer on the ends) - var spacerSize = SPACER * COLS; + const spacerSize = SPACER * COLS; // debounced layout function is safe to call as much as possible - var safeLayout = _.debounce(layout, 200); + const safeLayout = _.debounce(layout, 200); function init() { $el.addClass('gridster'); @@ -61,15 +61,15 @@ define(function (require) { }); $scope.$watchCollection('state.panels', function (panels) { - var currentPanels = gridster.$widgets.toArray().map(function (el) { + const currentPanels = gridster.$widgets.toArray().map(function (el) { return getPanelFor(el); }); // panels that are now missing from the panels array - var removed = _.difference(currentPanels, panels); + const removed = _.difference(currentPanels, panels); // panels that have been added - var added = _.difference(panels, currentPanels); + const added = _.difference(panels, currentPanels); if (removed.length) removed.forEach(removePanel); if (added.length) added.forEach(addPanel); @@ -87,7 +87,7 @@ define(function (require) { if (!gridster) return; gridster.$widgets.each(function (i, el) { - var panel = getPanelFor(el); + const panel = getPanelFor(el); removePanel(panel); // stop any animations panel.$el.stop(); @@ -107,8 +107,8 @@ define(function (require) { // ALWAYS CALL makePanelSerializeable AFTER YOU ARE DONE WITH IT // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! function getPanelFor(el) { - var $panel = el.jquery ? el : $(el); - var panel = $panel.data('panel'); + const $panel = el.jquery ? el : $(el); + const panel = $panel.data('panel'); panel.$el = $panel; panel.$scope = $panel.data('$scope'); @@ -174,7 +174,7 @@ define(function (require) { // ensure that the panel object has the latest size/pos info function refreshPanelStats(panel) { - var data = panel.$el.coords().grid; + const data = panel.$el.coords().grid; panel.size_x = data.size_x; panel.size_y = data.size_y; panel.col = data.col; @@ -185,7 +185,7 @@ define(function (require) { function readGridsterChangeHandler(e, ui, $widget) { // ensure that our panel objects keep their size in sync gridster.$widgets.each(function (i, el) { - var panel = getPanelFor(el); + const panel = getPanelFor(el); refreshPanelStats(panel); panel.$scope.$broadcast('resize'); makePanelSerializeable(panel); @@ -198,14 +198,14 @@ define(function (require) { // we may need to consider using a different library function reflowGridster() { // https://github.com/gcphost/gridster-responsive/blob/97fe43d4b312b409696b1d702e1afb6fbd3bba71/jquery.gridster.js#L1208-L1235 - var g = gridster; + const g = gridster; g.options.widget_margins = [SPACER / 2, SPACER / 2]; g.options.widget_base_dimensions = [($container.width() - spacerSize) / COLS, 100]; g.min_widget_width = (g.options.widget_margins[0] * 2) + g.options.widget_base_dimensions[0]; g.min_widget_height = (g.options.widget_margins[1] * 2) + g.options.widget_base_dimensions[1]; - // var serializedGrid = g.serialize(); + // const serializedGrid = g.serialize(); g.$widgets.each(function (i, widget) { g.resize_widget($(widget)); }); @@ -222,7 +222,7 @@ define(function (require) { } function layout() { - var complete = notify.event('reflow dashboard'); + const complete = notify.event('reflow dashboard'); reflowGridster(); readGridsterChangeHandler(); complete(); diff --git a/src/plugins/kibana/public/dashboard/index.js b/src/plugins/kibana/public/dashboard/index.js index d3464adca65be..b71c74c07567f 100644 --- a/src/plugins/kibana/public/dashboard/index.js +++ b/src/plugins/kibana/public/dashboard/index.js @@ -1,9 +1,9 @@ define(function (require) { - var _ = require('lodash'); - var $ = require('jquery'); - var angular = require('angular'); - var ConfigTemplate = require('ui/ConfigTemplate'); - var chrome = require('ui/chrome'); + const _ = require('lodash'); + const $ = require('jquery'); + const angular = require('angular'); + const ConfigTemplate = require('ui/ConfigTemplate'); + const chrome = require('ui/chrome'); require('ui/directives/config'); require('ui/courier'); @@ -20,7 +20,7 @@ define(function (require) { require('ui/saved_objects/saved_object_registry').register(require('plugins/kibana/dashboard/services/saved_dashboard_register')); - var app = require('ui/modules').get('app/dashboard', [ + const app = require('ui/modules').get('app/dashboard', [ 'elasticsearch', 'ngRoute', 'kibana/courier', @@ -54,13 +54,13 @@ define(function (require) { return { controller: function ($scope, $rootScope, $route, $routeParams, $location, Private, getAppState) { - var queryFilter = Private(require('ui/filter_bar/query_filter')); + const queryFilter = Private(require('ui/filter_bar/query_filter')); - var notify = new Notifier({ + const notify = new Notifier({ location: 'Dashboard' }); - var dash = $scope.dash = $route.current.locals.dash; + const dash = $scope.dash = $route.current.locals.dash; if (dash.timeRestore && dash.timeTo && dash.timeFrom && !getAppState.previouslyStored()) { timefilter.time.to = dash.timeTo; @@ -69,16 +69,16 @@ define(function (require) { $scope.$on('$destroy', dash.destroy); - var matchQueryFilter = function (filter) { + const matchQueryFilter = function (filter) { return filter.query && filter.query.query_string && !filter.meta; }; - var extractQueryFromFilters = function (filters) { - var filter = _.find(filters, matchQueryFilter); + const extractQueryFromFilters = function (filters) { + const filter = _.find(filters, matchQueryFilter); if (filter) return filter.query; }; - var stateDefaults = { + const stateDefaults = { title: dash.title, panels: dash.panelsJSON ? JSON.parse(dash.panelsJSON) : [], options: dash.optionsJSON ? JSON.parse(dash.optionsJSON) : {}, @@ -87,8 +87,8 @@ define(function (require) { filters: _.reject(dash.searchSource.getOwn('filter'), matchQueryFilter), }; - var $state = $scope.state = new AppState(stateDefaults); - var $uiState = $scope.uiState = $state.makeStateful('uiState'); + const $state = $scope.state = new AppState(stateDefaults); + const $uiState = $scope.uiState = $state.makeStateful('uiState'); $scope.$watchCollection('state.options', function (newVal, oldVal) { if (!angular.equals(newVal, oldVal)) $state.save(); @@ -114,7 +114,7 @@ define(function (require) { function init() { updateQueryOnRootSource(); - var docTitle = Private(require('ui/doc_title')); + const docTitle = Private(require('ui/doc_title')); if (dash.id) { docTitle.change(dash.title); } @@ -125,7 +125,7 @@ define(function (require) { function initPanelIndices() { // find the largest panelIndex in all the panels - var maxIndex = getMaxPanelIndex(); + let maxIndex = getMaxPanelIndex(); // ensure that all panels have a panelIndex $scope.state.panels.forEach(function (panel) { @@ -136,7 +136,7 @@ define(function (require) { } function getMaxPanelIndex() { - var index = $scope.state.panels.reduce(function (idx, panel) { + let index = $scope.state.panels.reduce(function (idx, panel) { // if panel is missing an index, add one and increment the index return Math.max(idx, panel.panelIndex || idx); }, 0); @@ -144,7 +144,7 @@ define(function (require) { } function updateQueryOnRootSource() { - var filters = queryFilter.getFilters(); + const filters = queryFilter.getFilters(); if ($state.query) { dash.searchSource.set('filter', _.union(filters, [{ query: $state.query @@ -155,7 +155,7 @@ define(function (require) { } function setDarkTheme(enabled) { - var theme = Boolean(enabled) ? 'theme-dark' : 'theme-light'; + const theme = Boolean(enabled) ? 'theme-dark' : 'theme-light'; chrome.removeApplicationClass(['theme-dark', 'theme-light']); chrome.addApplicationClass(theme); } @@ -202,7 +202,7 @@ define(function (require) { .catch(notify.fatal); }; - var pendingVis = _.size($state.panels); + let pendingVis = _.size($state.panels); $scope.$on('ready:vis', function () { if (pendingVis) pendingVis--; if (pendingVis === 0) { diff --git a/src/plugins/kibana/public/dashboard/services/_saved_dashboard.js b/src/plugins/kibana/public/dashboard/services/_saved_dashboard.js index d7115a9bcfca4..100b0e652ce9d 100644 --- a/src/plugins/kibana/public/dashboard/services/_saved_dashboard.js +++ b/src/plugins/kibana/public/dashboard/services/_saved_dashboard.js @@ -1,8 +1,8 @@ define(function (require) { - var module = require('ui/modules').get('app/dashboard'); - var angular = require('angular'); - var _ = require('lodash'); - var moment = require('moment'); + const module = require('ui/modules').get('app/dashboard'); + const angular = require('angular'); + const _ = require('lodash'); + const moment = require('moment'); // Used only by the savedDashboards service, usually no reason to change this module.factory('SavedDashboard', function (courier, config) { diff --git a/src/plugins/kibana/public/dashboard/services/saved_dashboards.js b/src/plugins/kibana/public/dashboard/services/saved_dashboards.js index b15643b3edc88..513a30b04e582 100644 --- a/src/plugins/kibana/public/dashboard/services/saved_dashboards.js +++ b/src/plugins/kibana/public/dashboard/services/saved_dashboards.js @@ -1,7 +1,7 @@ define(function (require) { - var module = require('ui/modules').get('app/dashboard'); - var _ = require('lodash'); - var Scanner = require('ui/utils/scanner'); + const module = require('ui/modules').get('app/dashboard'); + const _ = require('lodash'); + const Scanner = require('ui/utils/scanner'); // bring in the factory require('plugins/kibana/dashboard/services/_saved_dashboard'); @@ -16,7 +16,7 @@ define(function (require) { // This is the only thing that gets injected into controllers module.service('savedDashboards', function (Promise, SavedDashboard, kbnIndex, es, kbnUrl) { - var scanner = new Scanner(es, { + const scanner = new Scanner(es, { index: kbnIndex, type: 'dashboard' }); @@ -56,14 +56,14 @@ define(function (require) { }; this.mapHits = function (hit) { - var source = hit._source; + const source = hit._source; source.id = hit._id; source.url = this.urlFor(hit._id); return source; }; this.find = function (searchString, size = 100) { - var body; + let body; if (searchString) { body = { query: { diff --git a/src/plugins/kibana/public/discover/__tests__/directives/discover_field.js b/src/plugins/kibana/public/discover/__tests__/directives/discover_field.js index 48ce5a5e3f3de..aa690b4855482 100644 --- a/src/plugins/kibana/public/discover/__tests__/directives/discover_field.js +++ b/src/plugins/kibana/public/discover/__tests__/directives/discover_field.js @@ -1,19 +1,19 @@ -var angular = require('angular'); -var $ = require('jquery'); -var _ = require('lodash'); -var sinon = require('auto-release-sinon'); -var ngMock = require('ngMock'); -var expect = require('expect.js'); +const angular = require('angular'); +const $ = require('jquery'); +const _ = require('lodash'); +const sinon = require('auto-release-sinon'); +const ngMock = require('ngMock'); +const expect = require('expect.js'); // Load the kibana app dependencies. require('ui/private'); require('plugins/kibana/discover/components/field_chooser/discover_field'); describe('discoverField', function () { - var $scope; - var indexPattern; - var $elem; + let $scope; + let indexPattern; + let $elem; beforeEach(ngMock.module('kibana')); beforeEach(ngMock.inject(function (Private, $rootScope, $compile) { diff --git a/src/plugins/kibana/public/discover/__tests__/directives/field_calculator.js b/src/plugins/kibana/public/discover/__tests__/directives/field_calculator.js index e8b4a5c07aaae..6cd5c35579a4d 100644 --- a/src/plugins/kibana/public/discover/__tests__/directives/field_calculator.js +++ b/src/plugins/kibana/public/discover/__tests__/directives/field_calculator.js @@ -1,13 +1,13 @@ -var _ = require('lodash'); -var ngMock = require('ngMock'); -var fieldCalculator = require('plugins/kibana/discover/components/field_chooser/lib/field_calculator'); -var expect = require('expect.js'); +const _ = require('lodash'); +const ngMock = require('ngMock'); +const fieldCalculator = require('plugins/kibana/discover/components/field_chooser/lib/field_calculator'); +const expect = require('expect.js'); // Load the kibana app dependencies. require('ui/private'); -var indexPattern; +let indexPattern; describe('fieldCalculator', function () { beforeEach(ngMock.module('kibana')); @@ -17,14 +17,14 @@ describe('fieldCalculator', function () { it('should have a _countMissing that counts nulls & undefineds in an array', function () { - var values = [['foo', 'bar'], 'foo', 'foo', undefined, ['foo', 'bar'], 'bar', 'baz', null, null, null, 'foo', undefined]; + const values = [['foo', 'bar'], 'foo', 'foo', undefined, ['foo', 'bar'], 'bar', 'baz', null, null, null, 'foo', undefined]; expect(fieldCalculator._countMissing(values)).to.be(5); }); describe('_groupValues', function () { - var groups; - var params; - var values; + let groups; + let params; + let values; beforeEach(function () { values = [['foo', 'bar'], 'foo', 'foo', undefined, ['foo', 'bar'], 'bar', 'baz', null, null, null, 'foo', undefined]; params = {}; @@ -78,21 +78,21 @@ describe('fieldCalculator', function () { }); describe('getFieldValues', function () { - var hits; + let hits; beforeEach(function () { hits = _.each(require('fixtures/real_hits.js'), indexPattern.flattenHit); }); it('Should return an array of values for _source fields', function () { - var extensions = fieldCalculator.getFieldValues(hits, indexPattern.fields.byName.extension); + const extensions = fieldCalculator.getFieldValues(hits, indexPattern.fields.byName.extension); expect(extensions).to.be.an(Array); expect(_.filter(extensions, function (v) { return v === 'html'; }).length).to.be(8); expect(_.uniq(_.clone(extensions)).sort()).to.eql(['gif', 'html', 'php', 'png']); }); it('Should return an array of values for core meta fields', function () { - var types = fieldCalculator.getFieldValues(hits, indexPattern.fields.byName._type); + const types = fieldCalculator.getFieldValues(hits, indexPattern.fields.byName._type); expect(types).to.be.an(Array); expect(_.filter(types, function (v) { return v === 'apache'; }).length).to.be(18); expect(_.uniq(_.clone(types)).sort()).to.eql(['apache', 'nginx']); @@ -101,7 +101,7 @@ describe('fieldCalculator', function () { describe('getFieldValueCounts', function () { - var params; + let params; beforeEach(function () { params = { hits: require('fixtures/real_hits.js'), @@ -111,7 +111,7 @@ describe('fieldCalculator', function () { }); it('counts the top 3 values', function () { - var extensions = fieldCalculator.getFieldValueCounts(params); + const extensions = fieldCalculator.getFieldValueCounts(params); expect(extensions).to.be.an(Object); expect(extensions.buckets).to.be.an(Array); expect(extensions.buckets.length).to.be(3); diff --git a/src/plugins/kibana/public/discover/__tests__/directives/field_chooser.js b/src/plugins/kibana/public/discover/__tests__/directives/field_chooser.js index d1e4328c471a1..8d4143a27e77b 100644 --- a/src/plugins/kibana/public/discover/__tests__/directives/field_chooser.js +++ b/src/plugins/kibana/public/discover/__tests__/directives/field_chooser.js @@ -1,24 +1,24 @@ -var angular = require('angular'); -var ngMock = require('ngMock'); -var $ = require('jquery'); -var _ = require('lodash'); -var sinon = require('auto-release-sinon'); -var expect = require('expect.js'); +const angular = require('angular'); +const ngMock = require('ngMock'); +const $ = require('jquery'); +const _ = require('lodash'); +const sinon = require('auto-release-sinon'); +const expect = require('expect.js'); // Load the kibana app dependencies. require('ui/private'); require('plugins/kibana/discover/components/field_chooser/field_chooser'); -var $parentScope; -var $scope; -var config; -var hits; -var indexPattern; -var indexPatternList; +let $parentScope; +let $scope; +let config; +let hits; +let indexPattern; +let indexPatternList; // Sets up the directive, take an element, and a list of properties to attach to the parent scope. -var init = function ($elem, props) { +const init = function ($elem, props) { ngMock.inject(function ($rootScope, $compile, $timeout, _config_) { config = _config_; $parentScope = $rootScope; @@ -34,13 +34,13 @@ var init = function ($elem, props) { }); }; -var destroy = function () { +const destroy = function () { $scope.$destroy(); $parentScope.$destroy(); }; describe('discover field chooser directives', function () { - var $elem = angular.element( + const $elem = angular.element( ' a) { bBelowa = !descending; diff --git a/src/plugins/kibana/public/discover/components/field_chooser/discover_field.js b/src/plugins/kibana/public/discover/components/field_chooser/discover_field.js index 1974c7f9bfa08..a880a14ee110d 100644 --- a/src/plugins/kibana/public/discover/components/field_chooser/discover_field.js +++ b/src/plugins/kibana/public/discover/components/field_chooser/discover_field.js @@ -1,8 +1,8 @@ define(function (require) { - var $ = require('jquery'); - var app = require('ui/modules').get('apps/discover'); - var html = require('plugins/kibana/discover/components/field_chooser/discover_field.html'); - var _ = require('lodash'); + const $ = require('jquery'); + const app = require('ui/modules').get('apps/discover'); + const html = require('plugins/kibana/discover/components/field_chooser/discover_field.html'); + const _ = require('lodash'); require('ui/directives/css_truncate'); require('ui/directives/field_name'); @@ -14,19 +14,19 @@ define(function (require) { template: html, replace: true, link: function ($scope, $elem) { - var detailsElem; - var detailScope = $scope.$new(); + let detailsElem; + let detailScope = $scope.$new(); - var detailsHtml = require('plugins/kibana/discover/components/field_chooser/lib/detail_views/string.html'); + const detailsHtml = require('plugins/kibana/discover/components/field_chooser/lib/detail_views/string.html'); - var init = function () { + const init = function () { if ($scope.field.details) { $scope.toggleDetails($scope.field, true); } }; - var getWarnings = function (field) { - var warnings = []; + const getWarnings = function (field) { + let warnings = []; if (!field.scripted) { if (!field.doc_values && field.type !== 'boolean' && !(field.analyzed && field.type === 'string')) { diff --git a/src/plugins/kibana/public/discover/components/field_chooser/field_chooser.js b/src/plugins/kibana/public/discover/components/field_chooser/field_chooser.js index 1b5dba460f0cc..85a4c294d8887 100644 --- a/src/plugins/kibana/public/discover/components/field_chooser/field_chooser.js +++ b/src/plugins/kibana/public/discover/components/field_chooser/field_chooser.js @@ -1,5 +1,5 @@ define(function (require) { - var app = require('ui/modules').get('apps/discover'); + const app = require('ui/modules').get('apps/discover'); require('ui/directives/css_truncate'); @@ -8,11 +8,11 @@ define(function (require) { require('plugins/kibana/discover/components/field_chooser/discover_field'); app.directive('discFieldChooser', function ($location, globalState, config, $route, Private) { - var _ = require('lodash'); - var $ = require('jquery'); - var rison = require('ui/utils/rison'); - var fieldCalculator = require('plugins/kibana/discover/components/field_chooser/lib/field_calculator'); - var FieldList = Private(require('ui/index_patterns/_field_list')); + const _ = require('lodash'); + const $ = require('jquery'); + const rison = require('ui/utils/rison'); + const fieldCalculator = require('plugins/kibana/discover/components/field_chooser/lib/field_calculator'); + const FieldList = Private(require('ui/index_patterns/_field_list')); return { restrict: 'E', @@ -37,7 +37,7 @@ define(function (require) { $route.reload(); }); - var filter = $scope.filter = { + const filter = $scope.filter = { props: [ 'type', 'indexed', @@ -64,11 +64,11 @@ define(function (require) { return field.display; }, isFieldFiltered: function (field) { - var matchFilter = (filter.vals.type == null || field.type === filter.vals.type); - var isAnalyzed = (filter.vals.analyzed == null || field.analyzed === filter.vals.analyzed); - var isIndexed = (filter.vals.indexed == null || field.indexed === filter.vals.indexed); - var scriptedOrMissing = (!filter.vals.missing || field.scripted || field.rowCount > 0); - var matchName = (!filter.vals.name || field.name.indexOf(filter.vals.name) !== -1); + const matchFilter = (filter.vals.type == null || field.type === filter.vals.type); + const isAnalyzed = (filter.vals.analyzed == null || field.analyzed === filter.vals.analyzed); + const isIndexed = (filter.vals.indexed == null || field.indexed === filter.vals.indexed); + const scriptedOrMissing = (!filter.vals.missing || field.scripted || field.rowCount > 0); + const matchName = (!filter.vals.name || field.name.indexOf(filter.vals.name) !== -1); return !field.display && matchFilter @@ -105,10 +105,10 @@ define(function (require) { '[]columns', '[]hits' ], function (cur, prev) { - var newHits = cur[2] !== prev[2]; - var fields = $scope.fields; - var columns = $scope.columns || []; - var fieldCounts = $scope.fieldCounts; + const newHits = cur[2] !== prev[2]; + let fields = $scope.fields; + const columns = $scope.columns || []; + const fieldCounts = $scope.fieldCounts; if (!fields || newHits) { $scope.fields = fields = getFields(); @@ -137,7 +137,7 @@ define(function (require) { groups.unpopular = groups.unpopular || []; // move excess popular fields to un-popular list - var extras = groups.popular.splice(config.get('fields:popularLimit')); + const extras = groups.popular.splice(config.get('fields:popularLimit')); groups.unpopular = extras.concat(groups.unpopular); }) .each(function (group, name) { @@ -156,9 +156,9 @@ define(function (require) { $scope.vizLocation = function (field) { if (!$scope.state) {return '';} - var agg = {}; - var isGeoPoint = field.type === 'geo_point'; - var type = isGeoPoint ? 'tile_map' : 'histogram'; + let agg = {}; + const isGeoPoint = field.type === 'geo_point'; + const type = isGeoPoint ? 'tile_map' : 'histogram'; // If we're visualizing a date field, and our index is time based (and thus has a time filter), // then run a date histogram if (field.type === 'date' && $scope.indexPattern.timeFieldName === field.name) { @@ -227,16 +227,16 @@ define(function (require) { }; function getFields() { - var prevFields = $scope.fields; - var indexPattern = $scope.indexPattern; - var hits = $scope.hits; - var fieldCounts = $scope.fieldCounts; + const prevFields = $scope.fields; + const indexPattern = $scope.indexPattern; + const hits = $scope.hits; + const fieldCounts = $scope.fieldCounts; if (!indexPattern || !hits || !fieldCounts) return; - var fieldSpecs = indexPattern.fields.slice(0); - var fieldNamesInDocs = _.keys(fieldCounts); - var fieldNamesInIndexPattern = _.keys(indexPattern.fields.byName); + const fieldSpecs = indexPattern.fields.slice(0); + const fieldNamesInDocs = _.keys(fieldCounts); + const fieldNamesInIndexPattern = _.keys(indexPattern.fields.byName); _.difference(fieldNamesInDocs, fieldNamesInIndexPattern) .forEach(function (unknownFieldName) { @@ -246,7 +246,7 @@ define(function (require) { }); }); - var fields = new FieldList(indexPattern, fieldSpecs); + const fields = new FieldList(indexPattern, fieldSpecs); if (prevFields) { fields.forEach(function (field) { diff --git a/src/plugins/kibana/public/discover/components/field_chooser/lib/field_calculator.js b/src/plugins/kibana/public/discover/components/field_chooser/lib/field_calculator.js index 54592ccf2c5d7..add0c7bdb4cd6 100644 --- a/src/plugins/kibana/public/discover/components/field_chooser/lib/field_calculator.js +++ b/src/plugins/kibana/public/discover/components/field_chooser/lib/field_calculator.js @@ -1,9 +1,9 @@ define(function (require) { - var _ = require('lodash'); + const _ = require('lodash'); function getFieldValues(hits, field) { - var name = field.name; - var flattenHit = field.indexPattern.flattenHit; + const name = field.name; + const flattenHit = field.indexPattern.flattenHit; return _.map(hits, function (hit) { return flattenHit(hit)[name]; }); @@ -23,12 +23,12 @@ define(function (require) { return { error: 'Analysis is not available for geo fields.' }; } - var allValues = getFieldValues(params.hits, params.field); - var counts; - var missing = _countMissing(allValues); + const allValues = getFieldValues(params.hits, params.field); + let counts; + const missing = _countMissing(allValues); try { - var groups = _groupValues(allValues, params); + const groups = _groupValues(allValues, params); counts = _.map( _.sortBy(groups, 'count').reverse().slice(0, params.count), function (bucket) { @@ -66,8 +66,8 @@ define(function (require) { function _groupValues(allValues, params) { - var groups = {}; - var k; + const groups = {}; + let k; allValues.forEach(function (value) { if (_.isObject(value) && !_.isArray(value)) { diff --git a/src/plugins/kibana/public/discover/controllers/discover.js b/src/plugins/kibana/public/discover/controllers/discover.js index b0c2e94dd4313..80676474d4498 100644 --- a/src/plugins/kibana/public/discover/controllers/discover.js +++ b/src/plugins/kibana/public/discover/controllers/discover.js @@ -1,12 +1,12 @@ define(function (require) { - var _ = require('lodash'); - var angular = require('angular'); - var moment = require('moment'); - var ConfigTemplate = require('ui/ConfigTemplate'); - var getSort = require('ui/doc_table/lib/get_sort'); - var rison = require('ui/utils/rison'); + const _ = require('lodash'); + const angular = require('angular'); + const moment = require('moment'); + const ConfigTemplate = require('ui/ConfigTemplate'); + const getSort = require('ui/doc_table/lib/get_sort'); + const rison = require('ui/utils/rison'); - var dateMath = require('ui/utils/dateMath'); + const dateMath = require('ui/utils/dateMath'); require('ui/doc_table'); require('ui/visualize'); @@ -21,7 +21,7 @@ define(function (require) { require('ui/highlight/highlight_tags'); require('ui/share'); - var app = require('ui/modules').get('apps/discover', [ + const app = require('ui/modules').get('apps/discover', [ 'kibana/notify', 'kibana/courier', 'kibana/index_patterns' @@ -35,15 +35,15 @@ define(function (require) { ip: function (Promise, courier, config, $location) { return courier.indexPatterns.getIds() .then(function (list) { - var stateRison = $location.search()._a; + const stateRison = $location.search()._a; - var state; + let state; try { state = rison.decode(stateRison); } catch (e) { state = {}; } - var specified = !!state.index; - var exists = _.contains(list, state.index); - var id = exists ? state.index : config.get('defaultIndex'); + const specified = !!state.index; + const exists = _.contains(list, state.index); + const id = exists ? state.index : config.get('defaultIndex'); return Promise.props({ list: list, @@ -66,14 +66,14 @@ define(function (require) { app.controller('discover', function ($scope, config, courier, $route, $window, Notifier, AppState, timefilter, Promise, Private, kbnUrl, highlightTags) { - var Vis = Private(require('ui/Vis')); - var docTitle = Private(require('ui/doc_title')); - var brushEvent = Private(require('ui/utils/brush_event')); - var HitSortFn = Private(require('plugins/kibana/discover/_hit_sort_fn')); - var queryFilter = Private(require('ui/filter_bar/query_filter')); - var filterManager = Private(require('ui/filter_manager')); + const Vis = Private(require('ui/Vis')); + const docTitle = Private(require('ui/doc_title')); + const brushEvent = Private(require('ui/utils/brush_event')); + const HitSortFn = Private(require('plugins/kibana/discover/_hit_sort_fn')); + const queryFilter = Private(require('ui/filter_bar/query_filter')); + const filterManager = Private(require('ui/filter_manager')); - var notify = new Notifier({ + const notify = new Notifier({ location: 'Discover' }); @@ -98,7 +98,7 @@ define(function (require) { $scope.timefilter = timefilter; // the saved savedSearch - var savedSearch = $route.current.locals.savedSearch; + const savedSearch = $route.current.locals.savedSearch; $scope.$on('$destroy', savedSearch.destroy); // the actual courier.SearchSource @@ -110,7 +110,7 @@ define(function (require) { docTitle.change(savedSearch.title); } - var $state = $scope.state = new AppState(getStateDefaults()); + const $state = $scope.state = new AppState(getStateDefaults()); $scope.uiState = $state.makeStateful('uiState'); function getStateDefaults() { @@ -141,8 +141,8 @@ define(function (require) { indexPatternList: $route.current.locals.ip.list }; - var init = _.once(function () { - var showTotal = 5; + const init = _.once(function () { + const showTotal = 5; $scope.failuresShown = showTotal; $scope.showAllFailures = function () { $scope.failuresShown = $scope.failures.length; @@ -161,7 +161,7 @@ define(function (require) { if (!sort) return; // get the current sort from {key: val} to ["key", "val"]; - var currentSort = _.pairs($scope.searchSource.get('sort')).pop(); + const currentSort = _.pairs($scope.searchSource.get('sort')).pop(); // if the searchSource doesn't know, tell it so if (!angular.equals(sort, currentSort)) $scope.fetch(); @@ -197,7 +197,7 @@ define(function (require) { // no timefield, no vis, nothing to update if (!$scope.opts.timefield) return; - var buckets = $scope.vis.aggs.bySchemaGroup.buckets; + const buckets = $scope.vis.aggs.bySchemaGroup.buckets; if (buckets && buckets.length === 1) { $scope.intervalName = 'by ' + buckets[0].buckets.getInterval().description; @@ -210,8 +210,8 @@ define(function (require) { 'rows', 'fetchStatus' ], (function updateResultState() { - var prev = {}; - var status = { + let prev = {}; + const status = { LOADING: 'loading', // initial data load READY: 'ready', // results came back NO_RESULTS: 'none' // no results came back @@ -221,12 +221,12 @@ define(function (require) { // initial state, pretend we are loading if (rows == null && oldRows == null) return status.LOADING; - var rowsEmpty = _.isEmpty(rows); + const rowsEmpty = _.isEmpty(rows); // An undefined fetchStatus means the requests are still being // prepared to be sent. When all requests are completed, // fetchStatus is set to null, so it's important that we // specifically check for undefined to determine a loading status. - var preparingForFetch = _.isUndefined(fetchStatus); + const preparingForFetch = _.isUndefined(fetchStatus); if (preparingForFetch) return status.LOADING; else if (rowsEmpty && fetchStatus) return status.LOADING; else if (!rowsEmpty) return status.READY; @@ -234,7 +234,7 @@ define(function (require) { } return function () { - var current = { + const current = { rows: $scope.rows, fetchStatus: $scope.fetchStatus }; @@ -318,9 +318,9 @@ define(function (require) { if (!$scope.rows) flushResponseData(); - var sort = $state.sort; - var timeField = $scope.indexPattern.timeFieldName; - var totalSize = $scope.size || $scope.opts.sampleSize; + const sort = $state.sort; + const timeField = $scope.indexPattern.timeFieldName; + const totalSize = $scope.size || $scope.opts.sampleSize; /** * Basically an emum. @@ -332,14 +332,14 @@ define(function (require) { * * @type {String} */ - var sortBy = (function () { + const sortBy = (function () { if (!_.isArray(sort)) return 'implicit'; else if (sort[0] === '_score') return 'implicit'; else if (sort[0] === timeField) return 'time'; else return 'non-time'; }()); - var sortFn = null; + let sortFn = null; if (sortBy !== 'implicit') { sortFn = new HitSortFn(sort[1]); } @@ -372,13 +372,13 @@ define(function (require) { $scope.mergedEsResp = merged; $scope.hits = merged.hits.total; - var indexPattern = $scope.searchSource.get('index'); + const indexPattern = $scope.searchSource.get('index'); // the merge rows, use a new array to help watchers $scope.rows = merged.hits.hits.slice(); notify.event('flatten hit and count fields', function () { - var counts = $scope.fieldCounts; + let counts = $scope.fieldCounts; // if we haven't counted yet, or need a fresh count because we are sorting, reset the counts if (!counts || sortFn) counts = $scope.fieldCounts = {}; @@ -391,9 +391,9 @@ define(function (require) { // "top 500" may change with each response, so don't mark this as counted if (!sortFn) hit.$$_counted = true; - var fields = _.keys(indexPattern.flattenHit(hit)); - var n = fields.length; - var field; + const fields = _.keys(indexPattern.flattenHit(hit)); + let n = fields.length; + let field; while (field = fields[--n]) { if (counts[field]) counts[field] += 1; else counts[field] = 1; @@ -454,13 +454,13 @@ define(function (require) { $window.scrollTo(0, 0); }; - var loadingVis; + let loadingVis; function setupVisualization() { // If we're not setting anything up we need to return an empty promise if (!$scope.opts.timefield) return Promise.resolve(); if (loadingVis) return loadingVis; - var visStateAggs = [ + const visStateAggs = [ { type: 'count', schema: 'metric' @@ -478,7 +478,7 @@ define(function (require) { // we have a vis, just modify the aggs if ($scope.vis) { - var visState = $scope.vis.getState(); + const visState = $scope.vis.getState(); visState.aggs = visStateAggs; $scope.vis.setState(visState); @@ -524,16 +524,16 @@ define(function (require) { } function resolveIndexPatternLoading() { - var props = $route.current.locals.ip; - var loaded = props.loaded; - var stateVal = props.stateVal; - var stateValFound = props.stateValFound; + const props = $route.current.locals.ip; + const loaded = props.loaded; + const stateVal = props.stateVal; + const stateValFound = props.stateValFound; - var own = $scope.searchSource.getOwn('index'); + const own = $scope.searchSource.getOwn('index'); if (own && !stateVal) return own; if (stateVal && !stateValFound) { - var err = '"' + stateVal + '" is not a configured pattern. '; + const err = '"' + stateVal + '" is not a configured pattern. '; if (own) { notify.warning(err + ' Using the saved index pattern: "' + own.id + '"'); return own; diff --git a/src/plugins/kibana/public/discover/directives/timechart.js b/src/plugins/kibana/public/discover/directives/timechart.js index 7450ce2b3686a..b397d752054af 100644 --- a/src/plugins/kibana/public/discover/directives/timechart.js +++ b/src/plugins/kibana/public/discover/directives/timechart.js @@ -1,9 +1,9 @@ require('ui/modules') .get('apps/discover') .directive('discoverTimechart', function (Private, $compile) { - var _ = require('lodash'); - var $ = require('jquery'); - var vislib = Private(require('ui/vislib')); + const _ = require('lodash'); + const $ = require('jquery'); + const vislib = Private(require('ui/vislib')); return { restrict: 'E', @@ -12,9 +12,9 @@ require('ui/modules') }, link: function ($scope, elem) { - var init = function () { + const init = function () { // This elem should already have a height/width - var myChart = new vislib.Chart(elem[0], { + const myChart = new vislib.Chart(elem[0], { }); diff --git a/src/plugins/kibana/public/discover/saved_searches/_saved_search.js b/src/plugins/kibana/public/discover/saved_searches/_saved_search.js index 0f678b49770cb..14d9dcba9cb94 100644 --- a/src/plugins/kibana/public/discover/saved_searches/_saved_search.js +++ b/src/plugins/kibana/public/discover/saved_searches/_saved_search.js @@ -1,9 +1,9 @@ define(function (require) { - var _ = require('lodash'); + const _ = require('lodash'); require('ui/notify'); - var module = require('ui/modules').get('discover/saved_searches', [ + const module = require('ui/modules').get('discover/saved_searches', [ 'kibana/notify', 'kibana/courier' ]); diff --git a/src/plugins/kibana/public/discover/saved_searches/saved_searches.js b/src/plugins/kibana/public/discover/saved_searches/saved_searches.js index d84bb73dd3bbb..60cbe43b79ac7 100644 --- a/src/plugins/kibana/public/discover/saved_searches/saved_searches.js +++ b/src/plugins/kibana/public/discover/saved_searches/saved_searches.js @@ -1,11 +1,11 @@ define(function (require) { - var _ = require('lodash'); - var Scanner = require('ui/utils/scanner'); + const _ = require('lodash'); + const Scanner = require('ui/utils/scanner'); require('plugins/kibana/discover/saved_searches/_saved_search'); require('ui/notify'); - var module = require('ui/modules').get('discover/saved_searches', [ + const module = require('ui/modules').get('discover/saved_searches', [ 'kibana/notify' ]); @@ -17,12 +17,12 @@ define(function (require) { }); module.service('savedSearches', function (Promise, config, kbnIndex, es, createNotifier, SavedSearch, kbnUrl) { - var scanner = new Scanner(es, { + const scanner = new Scanner(es, { index: kbnIndex, type: 'search' }); - var notify = createNotifier({ + const notify = createNotifier({ location: 'Saved Searches' }); @@ -60,14 +60,14 @@ define(function (require) { }; this.mapHits = function (hit) { - var source = hit._source; + const source = hit._source; source.id = hit._id; source.url = this.urlFor(hit._id); return source; }; this.find = function (searchString, size = 100) { - var body; + let body; if (searchString) { body = { query: { diff --git a/src/plugins/kibana/public/doc/__tests__/doc.js b/src/plugins/kibana/public/doc/__tests__/doc.js index 88823cf0fc7dd..bd5980f0e6b3c 100644 --- a/src/plugins/kibana/public/doc/__tests__/doc.js +++ b/src/plugins/kibana/public/doc/__tests__/doc.js @@ -1,13 +1,13 @@ // Load the kibana app dependencies. -var ngMock = require('ngMock'); -var expect = require('expect.js'); +const ngMock = require('ngMock'); +const expect = require('expect.js'); require('plugins/kibana/doc/index'); -var $scope; -var createController; -var timefilter; +let $scope; +let createController; +let timefilter; -var init = function (index, type, id) { +const init = function (index, type, id) { ngMock.module('kibana'); @@ -28,7 +28,7 @@ var init = function (index, type, id) { $provide.service('es', function (Private, $q) { this.search = function (config) { - var deferred = $q.defer(); + const deferred = $q.defer(); switch (config.index) { case 'goodSearch': diff --git a/src/plugins/kibana/public/doc/controllers/doc.js b/src/plugins/kibana/public/doc/controllers/doc.js index fa109900833e5..975bd5c0a277b 100644 --- a/src/plugins/kibana/public/doc/controllers/doc.js +++ b/src/plugins/kibana/public/doc/controllers/doc.js @@ -1,21 +1,21 @@ define(function (require) { - var _ = require('lodash'); - var angular = require('angular'); + const _ = require('lodash'); + const angular = require('angular'); require('ui/notify'); require('ui/courier'); require('ui/doc_viewer'); require('ui/index_patterns'); - var app = require('ui/modules').get('apps/doc', [ + const app = require('ui/modules').get('apps/doc', [ 'kibana/notify', 'kibana/courier', 'kibana/index_patterns' ]); - var html = require('plugins/kibana/doc/index.html'); + const html = require('plugins/kibana/doc/index.html'); - var resolveIndexPattern = { + const resolveIndexPattern = { indexPattern: function (courier, savedSearches, $route) { return courier.indexPatterns.get($route.current.params.indexPattern); } @@ -38,7 +38,7 @@ define(function (require) { // Pretty much only need this for formatting, not actually using it for fetching anything. $scope.indexPattern = $route.current.locals.indexPattern; - var computedFields = $scope.indexPattern.getComputedFields(); + const computedFields = $scope.indexPattern.getComputedFields(); es.search({ index: $route.current.params.index, diff --git a/src/plugins/kibana/public/kibana.js b/src/plugins/kibana/public/kibana.js index 98572723bf654..6aa6281289319 100644 --- a/src/plugins/kibana/public/kibana.js +++ b/src/plugins/kibana/public/kibana.js @@ -5,13 +5,13 @@ require('plugins/kibana/settings/index'); require('plugins/kibana/doc/index'); require('ui/timepicker'); -var moment = require('moment-timezone'); +const moment = require('moment-timezone'); -var chrome = require('ui/chrome'); -var routes = require('ui/routes'); -var modules = require('ui/modules'); +const chrome = require('ui/chrome'); +const routes = require('ui/routes'); +const modules = require('ui/modules'); -var kibanaLogoUrl = require('ui/images/kibana.svg'); +const kibanaLogoUrl = require('ui/images/kibana.svg'); routes.enable(); diff --git a/src/plugins/kibana/public/settings/index.js b/src/plugins/kibana/public/settings/index.js index 3fe76bcde2d90..c99fb8d94237e 100644 --- a/src/plugins/kibana/public/settings/index.js +++ b/src/plugins/kibana/public/settings/index.js @@ -1,7 +1,7 @@ define(function (require, module, exports) { - var _ = require('lodash'); + const _ = require('lodash'); - var sections = require('plugins/kibana/settings/sections/index'); + const sections = require('plugins/kibana/settings/sections/index'); require('plugins/kibana/settings/styles/main.less'); require('ui/filters/start_from'); diff --git a/src/plugins/kibana/public/settings/saved_object_registry.js b/src/plugins/kibana/public/settings/saved_object_registry.js index be0f0484b8061..ae384c891eb9b 100644 --- a/src/plugins/kibana/public/settings/saved_object_registry.js +++ b/src/plugins/kibana/public/settings/saved_object_registry.js @@ -1,6 +1,6 @@ define(function (require) { - var _ = require('lodash'); - var registry = []; + const _ = require('lodash'); + const registry = []; return { register: function (service) { registry.push(service); diff --git a/src/plugins/kibana/public/settings/sections/about/index.js b/src/plugins/kibana/public/settings/sections/about/index.js index fec9ad2da3165..f5e7921e8d39f 100644 --- a/src/plugins/kibana/public/settings/sections/about/index.js +++ b/src/plugins/kibana/public/settings/sections/about/index.js @@ -1,5 +1,5 @@ define(function (require) { - var _ = require('lodash'); + const _ = require('lodash'); require('ui/routes') .when('/settings/about', { diff --git a/src/plugins/kibana/public/settings/sections/advanced/advanced_row.js b/src/plugins/kibana/public/settings/sections/advanced/advanced_row.js index be9db89e5d7ff..75d84a2815f76 100644 --- a/src/plugins/kibana/public/settings/sections/advanced/advanced_row.js +++ b/src/plugins/kibana/public/settings/sections/advanced/advanced_row.js @@ -1,5 +1,5 @@ define(function (require) { - var _ = require('lodash'); + const _ = require('lodash'); require('ui/elastic_textarea'); require('ui/modules').get('apps/settings') @@ -13,9 +13,9 @@ define(function (require) { configs: '=' }, link: function ($scope) { - var configDefaults = Private(require('ui/config/defaults')); - var notify = new Notifier(); - var keyCodes = { + const configDefaults = Private(require('ui/config/defaults')); + const notify = new Notifier(); + const keyCodes = { ESC: 27 }; @@ -23,7 +23,7 @@ define(function (require) { $scope.forms = {}; // setup loading flag, run async op, then clear loading and editing flag (just in case) - var loading = function (conf, fn) { + const loading = function (conf, fn) { conf.loading = true; fn() .finally(function () { diff --git a/src/plugins/kibana/public/settings/sections/advanced/index.js b/src/plugins/kibana/public/settings/sections/advanced/index.js index bcff939994f56..d7e04dbf95515 100644 --- a/src/plugins/kibana/public/settings/sections/advanced/index.js +++ b/src/plugins/kibana/public/settings/sections/advanced/index.js @@ -1,6 +1,6 @@ define(function (require) { - var _ = require('lodash'); - var toEditableConfig = require('plugins/kibana/settings/sections/advanced/lib/to_editable_config'); + const _ = require('lodash'); + const toEditableConfig = require('plugins/kibana/settings/sections/advanced/lib/to_editable_config'); require('plugins/kibana/settings/sections/advanced/advanced_row'); @@ -15,8 +15,8 @@ define(function (require) { return { restrict: 'E', link: function ($scope) { - var configDefaults = Private(require('ui/config/defaults')); - var keyCodes = { + const configDefaults = Private(require('ui/config/defaults')); + const keyCodes = { ESC: 27 }; @@ -29,9 +29,9 @@ define(function (require) { } function readConfigVals() { - var configVals = config._vals(); + const configVals = config._vals(); - var customConfig = Object.keys(configVals) + const customConfig = Object.keys(configVals) .filter(notDefaultConfig) .map(name => toEditableConfig(false, name, configVals[name])); @@ -43,7 +43,7 @@ define(function (require) { } // react to changes of the config values - var unhook = $rootScope.$on('change:config', readConfigVals); + const unhook = $rootScope.$on('change:config', readConfigVals); $scope.$on('$destroy', unhook); // initial config setup diff --git a/src/plugins/kibana/public/settings/sections/advanced/lib/__tests__/get_editor_type.js b/src/plugins/kibana/public/settings/sections/advanced/lib/__tests__/get_editor_type.js index 968a3cf3f44bf..2f8978ece786a 100644 --- a/src/plugins/kibana/public/settings/sections/advanced/lib/__tests__/get_editor_type.js +++ b/src/plugins/kibana/public/settings/sections/advanced/lib/__tests__/get_editor_type.js @@ -1,6 +1,6 @@ -var getEditorType = require('plugins/kibana/settings/sections/advanced/lib/get_editor_type'); -var expect = require('expect.js'); +const getEditorType = require('plugins/kibana/settings/sections/advanced/lib/get_editor_type'); +const expect = require('expect.js'); describe('Settings', function () { describe('Advanced', function () { diff --git a/src/plugins/kibana/public/settings/sections/advanced/lib/__tests__/get_val_type.js b/src/plugins/kibana/public/settings/sections/advanced/lib/__tests__/get_val_type.js index 64742a3766fd6..0de3de12b1a12 100644 --- a/src/plugins/kibana/public/settings/sections/advanced/lib/__tests__/get_val_type.js +++ b/src/plugins/kibana/public/settings/sections/advanced/lib/__tests__/get_val_type.js @@ -1,6 +1,6 @@ -var getValType = require('plugins/kibana/settings/sections/advanced/lib/get_val_type'); -var expect = require('expect.js'); +const getValType = require('plugins/kibana/settings/sections/advanced/lib/get_val_type'); +const expect = require('expect.js'); describe('Settings', function () { describe('Advanced', function () { diff --git a/src/plugins/kibana/public/settings/sections/advanced/lib/__tests__/to_editable_config.js b/src/plugins/kibana/public/settings/sections/advanced/lib/__tests__/to_editable_config.js index 7a9a78d34f0ad..fa255ea066e6e 100644 --- a/src/plugins/kibana/public/settings/sections/advanced/lib/__tests__/to_editable_config.js +++ b/src/plugins/kibana/public/settings/sections/advanced/lib/__tests__/to_editable_config.js @@ -1,6 +1,6 @@ -var toEditableConfig = require('plugins/kibana/settings/sections/advanced/lib/to_editable_config'); -var expect = require('expect.js'); +const toEditableConfig = require('plugins/kibana/settings/sections/advanced/lib/to_editable_config'); +const expect = require('expect.js'); describe('Settings', function () { describe('Advanced', function () { @@ -20,7 +20,7 @@ describe('Settings', function () { }); context('when given a setting definition object', function () { - var def; + let def; beforeEach(function () { def = { value: 'the original', diff --git a/src/plugins/kibana/public/settings/sections/advanced/lib/get_editor_type.js b/src/plugins/kibana/public/settings/sections/advanced/lib/get_editor_type.js index 54ec1e240bbf3..3b75cc23091b6 100644 --- a/src/plugins/kibana/public/settings/sections/advanced/lib/get_editor_type.js +++ b/src/plugins/kibana/public/settings/sections/advanced/lib/get_editor_type.js @@ -1,8 +1,8 @@ define(function (require) { - var _ = require('lodash'); + const _ = require('lodash'); - var NAMED_EDITORS = ['json', 'array', 'boolean', 'select']; - var NORMAL_EDITOR = ['number', 'string', 'null', 'undefined']; + const NAMED_EDITORS = ['json', 'array', 'boolean', 'select']; + const NORMAL_EDITOR = ['number', 'string', 'null', 'undefined']; /** * @param {object} advanced setting configuration object diff --git a/src/plugins/kibana/public/settings/sections/advanced/lib/get_val_type.js b/src/plugins/kibana/public/settings/sections/advanced/lib/get_val_type.js index 08ea1dd483deb..784f1f3844e6b 100644 --- a/src/plugins/kibana/public/settings/sections/advanced/lib/get_val_type.js +++ b/src/plugins/kibana/public/settings/sections/advanced/lib/get_val_type.js @@ -1,5 +1,5 @@ define(function (require) { - var _ = require('lodash'); + const _ = require('lodash'); /** * @param {object} advanced setting definition object diff --git a/src/plugins/kibana/public/settings/sections/advanced/lib/to_editable_config.js b/src/plugins/kibana/public/settings/sections/advanced/lib/to_editable_config.js index a147cb61c31e4..cf6b359eb8ba8 100644 --- a/src/plugins/kibana/public/settings/sections/advanced/lib/to_editable_config.js +++ b/src/plugins/kibana/public/settings/sections/advanced/lib/to_editable_config.js @@ -1,7 +1,7 @@ define(function (require) { - var _ = require('lodash'); - var getValType = require('./get_val_type'); - var getEditorType = require('./get_editor_type'); + const _ = require('lodash'); + const getValType = require('./get_val_type'); + const getEditorType = require('./get_editor_type'); /** * @param {object} advanced setting definition object @@ -10,10 +10,10 @@ define(function (require) { * @returns {object} the editable config object */ function toEditableConfig(def, name, value) { - var isCustom = !def; + const isCustom = !def; if (isCustom) def = {}; - var conf = { + const conf = { name, value, isCustom, @@ -24,7 +24,7 @@ define(function (require) { options: def.options }; - var editor = getEditorType(conf); + const editor = getEditorType(conf); conf.json = editor === 'json'; conf.select = editor === 'select'; conf.bool = editor === 'boolean'; diff --git a/src/plugins/kibana/public/settings/sections/indices/_create.js b/src/plugins/kibana/public/settings/sections/indices/_create.js index ec92360435ae3..720e5de639d09 100644 --- a/src/plugins/kibana/public/settings/sections/indices/_create.js +++ b/src/plugins/kibana/public/settings/sections/indices/_create.js @@ -1,7 +1,7 @@ define(function (require) { - var _ = require('lodash'); - var moment = require('moment'); - var { IndexPatternMissingIndices } = require('ui/errors'); + const _ = require('lodash'); + const moment = require('moment'); + const { IndexPatternMissingIndices } = require('ui/errors'); require('ui/directives/validate_index_name'); require('ui/directives/auto_select_if_only_one'); @@ -13,13 +13,13 @@ define(function (require) { require('ui/modules').get('apps/settings') .controller('settingsIndicesCreate', function ($scope, kbnUrl, Private, Notifier, indexPatterns, es, config, Promise) { - var notify = new Notifier(); - var refreshKibanaIndex = Private(require('plugins/kibana/settings/sections/indices/_refresh_kibana_index')); - var intervals = indexPatterns.intervals; - var samplePromise; + const notify = new Notifier(); + const refreshKibanaIndex = Private(require('plugins/kibana/settings/sections/indices/_refresh_kibana_index')); + const intervals = indexPatterns.intervals; + let samplePromise; // this and child scopes will write pattern vars here - var index = $scope.index = { + const index = $scope.index = { name: 'logstash-*', isTimeBased: true, @@ -92,10 +92,10 @@ define(function (require) { 'index.nameIsPattern', 'index.nameInterval.name' ], function (newVal, oldVal) { - var isTimeBased = newVal[0]; - var nameIsPattern = newVal[1]; - var newDefault = getPatternDefault(newVal[2]); - var oldDefault = getPatternDefault(oldVal[2]); + const isTimeBased = newVal[0]; + const nameIsPattern = newVal[1]; + const newDefault = getPatternDefault(newVal[2]); + const oldDefault = getPatternDefault(oldVal[2]); if (index.name === oldDefault) { index.name = newDefault; @@ -123,7 +123,7 @@ define(function (require) { 'index.name', 'index.nameInterval' ], function (newVal, oldVal) { - var lastPromise; + let lastPromise; resetIndex(); samplePromise = lastPromise = updateSamples() .then(function () { @@ -157,13 +157,13 @@ define(function (require) { ], $scope.refreshFieldList); function updateSamples() { - var patternErrors = []; + const patternErrors = []; if (!index.nameInterval || !index.name) { return Promise.resolve(); } - var pattern = mockIndexPattern(index); + const pattern = mockIndexPattern(index); return indexPatterns.mapper.getIndicesForIndexPattern(pattern) .catch(function (err) { @@ -171,8 +171,8 @@ define(function (require) { notify.error(err); }) .then(function (existing) { - var all = _.get(existing, 'all', []); - var matches = _.get(existing, 'matches', []); + const all = _.get(existing, 'all', []); + const matches = _.get(existing, 'matches', []); if (all.length) { index.existing = { class: 'success', @@ -185,8 +185,8 @@ define(function (require) { } patternErrors.push('Pattern does not match any existing indices'); - var radius = Math.round(index.sampleCount / 2); - var samples = intervals.toIndexList(index.name, index.nameInterval, -radius, radius); + const radius = Math.round(index.sampleCount / 2); + const samples = intervals.toIndexList(index.name, index.nameInterval, -radius, radius); if (_.uniq(samples).length !== samples.length) { patternErrors.push('Invalid pattern, interval does not create unique index names'); @@ -200,9 +200,9 @@ define(function (require) { function fetchFieldList() { index.dateFields = index.timeField = index.listUsed = null; - var useIndexList = index.isTimeBased && index.nameIsPattern; - var fetchFieldsError; - var dateFields; + const useIndexList = index.isTimeBased && index.nameIsPattern; + let fetchFieldsError; + let dateFields; // we don't have enough info to continue if (!index.name) { @@ -217,7 +217,7 @@ define(function (require) { return indexPatterns.mapper.clearCache(index.name) .then(function () { - var pattern = mockIndexPattern(index); + const pattern = mockIndexPattern(index); return indexPatterns.mapper.getFieldsForIndexPattern(pattern, true) .catch(function (err) { diff --git a/src/plugins/kibana/public/settings/sections/indices/_date_scripts.js b/src/plugins/kibana/public/settings/sections/indices/_date_scripts.js index 791f13ba47b50..735e7ae7bfa02 100644 --- a/src/plugins/kibana/public/settings/sections/indices/_date_scripts.js +++ b/src/plugins/kibana/public/settings/sections/indices/_date_scripts.js @@ -1,9 +1,9 @@ define(function (require) { - var _ = require('lodash'); + const _ = require('lodash'); return function (indexPattern) { - var dateScripts = {}; - var scripts = { + const dateScripts = {}; + const scripts = { __dayOfMonth: 'dayOfMonth', __dayOfWeek: 'dayOfWeek', __dayOfYear: 'dayOfYear', diff --git a/src/plugins/kibana/public/settings/sections/indices/_edit.js b/src/plugins/kibana/public/settings/sections/indices/_edit.js index abd5ee43ea8a9..e7dfee046db96 100644 --- a/src/plugins/kibana/public/settings/sections/indices/_edit.js +++ b/src/plugins/kibana/public/settings/sections/indices/_edit.js @@ -1,5 +1,5 @@ define(function (require) { - var _ = require('lodash'); + const _ = require('lodash'); require('plugins/kibana/settings/sections/indices/_indexed_fields'); require('plugins/kibana/settings/sections/indices/_scripted_fields'); require('plugins/kibana/settings/sections/indices/_index_header'); @@ -18,16 +18,16 @@ define(function (require) { require('ui/modules').get('apps/settings') .controller('settingsIndicesEdit', function ($scope, $location, $route, config, courier, Notifier, Private, AppState, docTitle) { - var notify = new Notifier(); - var $state = $scope.state = new AppState(); - var refreshKibanaIndex = Private(require('plugins/kibana/settings/sections/indices/_refresh_kibana_index')); + const notify = new Notifier(); + const $state = $scope.state = new AppState(); + const refreshKibanaIndex = Private(require('plugins/kibana/settings/sections/indices/_refresh_kibana_index')); $scope.kbnUrl = Private(require('ui/url')); $scope.indexPattern = $route.current.locals.indexPattern; docTitle.change($scope.indexPattern.id); - var otherIds = _.without($route.current.locals.indexPatternIds, $scope.indexPattern.id); + const otherIds = _.without($route.current.locals.indexPatternIds, $scope.indexPattern.id); - var fieldTypes = Private(require('plugins/kibana/settings/sections/indices/_field_types')); + const fieldTypes = Private(require('plugins/kibana/settings/sections/indices/_field_types')); $scope.$watch('indexPattern.fields', function () { $scope.fieldTypes = fieldTypes($scope.indexPattern); }); diff --git a/src/plugins/kibana/public/settings/sections/indices/_field_editor.js b/src/plugins/kibana/public/settings/sections/indices/_field_editor.js index a93db7f716542..db93662f9454b 100644 --- a/src/plugins/kibana/public/settings/sections/indices/_field_editor.js +++ b/src/plugins/kibana/public/settings/sections/indices/_field_editor.js @@ -15,9 +15,9 @@ define(function (require) { }, controllerAs: 'fieldSettings', controller: function FieldEditorPageController($route, Private, Notifier, docTitle) { - var Field = Private(require('ui/index_patterns/_field')); - var notify = new Notifier({ location: 'Field Editor' }); - var kbnUrl = Private(require('ui/url')); + const Field = Private(require('ui/index_patterns/_field')); + const notify = new Notifier({ location: 'Field Editor' }); + const kbnUrl = Private(require('ui/url')); this.mode = $route.current.mode; @@ -25,7 +25,7 @@ define(function (require) { if (this.mode === 'edit') { - var fieldName = $route.current.params.fieldName; + const fieldName = $route.current.params.fieldName; this.field = this.indexPattern.fields.byName[fieldName]; if (!this.field) { diff --git a/src/plugins/kibana/public/settings/sections/indices/_field_types.js b/src/plugins/kibana/public/settings/sections/indices/_field_types.js index 6e4e1f284315c..e4c3725ca27c5 100644 --- a/src/plugins/kibana/public/settings/sections/indices/_field_types.js +++ b/src/plugins/kibana/public/settings/sections/indices/_field_types.js @@ -1,9 +1,9 @@ define(function (require) { return function GetFieldTypes() { - var _ = require('lodash'); + const _ = require('lodash'); return function (indexPattern) { - var fieldCount = _.countBy(indexPattern.fields, function (field) { + const fieldCount = _.countBy(indexPattern.fields, function (field) { return (field.scripted) ? 'scripted' : 'indexed'; }); diff --git a/src/plugins/kibana/public/settings/sections/indices/_indexed_fields.js b/src/plugins/kibana/public/settings/sections/indices/_indexed_fields.js index cebb4f10e6009..6b72662e308da 100644 --- a/src/plugins/kibana/public/settings/sections/indices/_indexed_fields.js +++ b/src/plugins/kibana/public/settings/sections/indices/_indexed_fields.js @@ -1,22 +1,22 @@ define(function (require) { - var _ = require('lodash'); + const _ = require('lodash'); require('ui/paginated_table'); require('ui/modules').get('apps/settings') .directive('indexedFields', function ($filter) { - var yesTemplate = ''; - var noTemplate = ''; - var nameHtml = require('plugins/kibana/settings/sections/indices/_field_name.html'); - var typeHtml = require('plugins/kibana/settings/sections/indices/_field_type.html'); - var controlsHtml = require('plugins/kibana/settings/sections/indices/_field_controls.html'); - var filter = $filter('filter'); + const yesTemplate = ''; + const noTemplate = ''; + const nameHtml = require('plugins/kibana/settings/sections/indices/_field_name.html'); + const typeHtml = require('plugins/kibana/settings/sections/indices/_field_type.html'); + const controlsHtml = require('plugins/kibana/settings/sections/indices/_field_controls.html'); + const filter = $filter('filter'); return { restrict: 'E', template: require('plugins/kibana/settings/sections/indices/_indexed_fields.html'), scope: true, link: function ($scope) { - var rowScopes = []; // track row scopes, so they can be destroyed as needed + const rowScopes = []; // track row scopes, so they can be destroyed as needed $scope.perPage = 25; $scope.columns = [ { title: 'name' }, @@ -33,11 +33,11 @@ define(function (require) { // clear and destroy row scopes _.invoke(rowScopes.splice(0), '$destroy'); - var fields = filter($scope.indexPattern.getNonScriptedFields(), $scope.fieldFilter); + const fields = filter($scope.indexPattern.getNonScriptedFields(), $scope.fieldFilter); _.find($scope.fieldTypes, {index: 'indexedFields'}).count = fields.length; // Update the tab count $scope.rows = fields.map(function (field) { - var childScope = _.assign($scope.$new(), { field: field }); + const childScope = _.assign($scope.$new(), { field: field }); rowScopes.push(childScope); return [ diff --git a/src/plugins/kibana/public/settings/sections/indices/_scripted_fields.js b/src/plugins/kibana/public/settings/sections/indices/_scripted_fields.js index 5c75e66c12d57..a3d8c97e8fbd7 100644 --- a/src/plugins/kibana/public/settings/sections/indices/_scripted_fields.js +++ b/src/plugins/kibana/public/settings/sections/indices/_scripted_fields.js @@ -1,25 +1,25 @@ define(function (require) { - var _ = require('lodash'); + const _ = require('lodash'); require('ui/paginated_table'); require('ui/modules').get('apps/settings') .directive('scriptedFields', function (kbnUrl, Notifier, $filter) { - var rowScopes = []; // track row scopes, so they can be destroyed as needed - var popularityHtml = require('plugins/kibana/settings/sections/indices/_field_popularity.html'); - var controlsHtml = require('plugins/kibana/settings/sections/indices/_field_controls.html'); - var filter = $filter('filter'); + const rowScopes = []; // track row scopes, so they can be destroyed as needed + const popularityHtml = require('plugins/kibana/settings/sections/indices/_field_popularity.html'); + const controlsHtml = require('plugins/kibana/settings/sections/indices/_field_controls.html'); + const filter = $filter('filter'); - var notify = new Notifier(); + const notify = new Notifier(); return { restrict: 'E', template: require('plugins/kibana/settings/sections/indices/_scripted_fields.html'), scope: true, link: function ($scope) { - var dateScripts = require('plugins/kibana/settings/sections/indices/_date_scripts'); + const dateScripts = require('plugins/kibana/settings/sections/indices/_date_scripts'); - var fieldCreatorPath = '/settings/indices/{{ indexPattern }}/scriptedField'; - var fieldEditorPath = fieldCreatorPath + '/{{ fieldName }}'; + const fieldCreatorPath = '/settings/indices/{{ indexPattern }}/scriptedField'; + const fieldEditorPath = fieldCreatorPath + '/{{ fieldName }}'; $scope.perPage = 25; $scope.columns = [ @@ -35,11 +35,11 @@ define(function (require) { _.invoke(rowScopes, '$destroy'); rowScopes.length = 0; - var fields = filter($scope.indexPattern.getScriptedFields(), $scope.fieldFilter); + const fields = filter($scope.indexPattern.getScriptedFields(), $scope.fieldFilter); _.find($scope.fieldTypes, {index: 'scriptedFields'}).count = fields.length; // Update the tab count $scope.rows = fields.map(function (field) { - var rowScope = $scope.$new(); + const rowScope = $scope.$new(); rowScope.field = field; rowScopes.push(rowScope); @@ -56,8 +56,8 @@ define(function (require) { } $scope.addDateScripts = function () { - var conflictFields = []; - var fieldsAdded = 0; + const conflictFields = []; + let fieldsAdded = 0; _.each(dateScripts($scope.indexPattern), function (script, field) { try { $scope.indexPattern.addScriptedField(field, script, 'number'); @@ -77,7 +77,7 @@ define(function (require) { }; $scope.create = function () { - var params = { + const params = { indexPattern: $scope.indexPattern.id }; @@ -85,7 +85,7 @@ define(function (require) { }; $scope.edit = function (field) { - var params = { + const params = { indexPattern: $scope.indexPattern.id, fieldName: field.name }; diff --git a/src/plugins/kibana/public/settings/sections/indices/index.js b/src/plugins/kibana/public/settings/sections/indices/index.js index b01ee6ed8981f..c292fa61815ce 100644 --- a/src/plugins/kibana/public/settings/sections/indices/index.js +++ b/src/plugins/kibana/public/settings/sections/indices/index.js @@ -1,5 +1,5 @@ define(function (require) { - var _ = require('lodash'); + const _ = require('lodash'); require('plugins/kibana/settings/sections/indices/_create'); require('plugins/kibana/settings/sections/indices/_edit'); @@ -27,7 +27,7 @@ define(function (require) { config.$bind($scope, 'defaultIndex'); $scope.$watch('defaultIndex', function () { - var ids = $route.current.locals.indexPatternIds; + const ids = $route.current.locals.indexPatternIds; $scope.indexPatternList = ids.map(function (id) { return { id: id, diff --git a/src/plugins/kibana/public/settings/sections/objects/_objects.js b/src/plugins/kibana/public/settings/sections/objects/_objects.js index d90bb9f52f46a..702cc14130072 100644 --- a/src/plugins/kibana/public/settings/sections/objects/_objects.js +++ b/src/plugins/kibana/public/settings/sections/objects/_objects.js @@ -1,9 +1,9 @@ define(function (require) { - var _ = require('lodash'); - var angular = require('angular'); - var saveAs = require('@spalger/filesaver').saveAs; - var registry = require('plugins/kibana/settings/saved_object_registry'); - var objectIndexHTML = require('plugins/kibana/settings/sections/objects/_objects.html'); + const _ = require('lodash'); + const angular = require('angular'); + const saveAs = require('@spalger/filesaver').saveAs; + const registry = require('plugins/kibana/settings/saved_object_registry'); + const objectIndexHTML = require('plugins/kibana/settings/sections/objects/_objects.html'); const MAX_SIZE = Math.pow(2, 31) - 1; require('ui/directives/file_upload'); @@ -18,15 +18,15 @@ define(function (require) { return { restrict: 'E', controller: function ($scope, $injector, $q, AppState, es) { - var notify = new Notifier({ location: 'Saved Objects' }); + const notify = new Notifier({ location: 'Saved Objects' }); - var $state = $scope.state = new AppState(); + const $state = $scope.state = new AppState(); $scope.currentTab = null; $scope.selectedItems = []; - var getData = function (filter) { - var services = registry.all().map(function (obj) { - var service = $injector.get(obj.service); + const getData = function (filter) { + const services = registry.all().map(function (obj) { + const service = $injector.get(obj.service); return service.find(filter).then(function (data) { return { service: service, @@ -41,7 +41,7 @@ define(function (require) { $q.all(services).then(function (data) { $scope.services = _.sortBy(data, 'title'); - var tab = $scope.services[0]; + let tab = $scope.services[0]; if ($state.tab) $scope.currentTab = tab = _.find($scope.services, {title: $state.tab}); $scope.$watch('state.tab', function (tab) { @@ -60,7 +60,7 @@ define(function (require) { }; $scope.toggleItem = function (item) { - var i = $scope.selectedItems.indexOf(item); + const i = $scope.selectedItems.indexOf(item); if (i >= 0) { $scope.selectedItems.splice(i, 1); } else { @@ -73,7 +73,7 @@ define(function (require) { }; $scope.edit = function (service, item) { - var params = { + const params = { service: service.serviceName, id: item.id }; @@ -88,7 +88,7 @@ define(function (require) { }; $scope.bulkExport = function () { - var objs = $scope.selectedItems.map(_.partialRight(_.extend, {type: $scope.currentTab.type})); + const objs = $scope.selectedItems.map(_.partialRight(_.extend, {type: $scope.currentTab.type})); retrieveAndExportDocs(objs); }; @@ -117,12 +117,12 @@ define(function (require) { } function saveToFile(results) { - var blob = new Blob([angular.toJson(results, true)], {type: 'application/json'}); + const blob = new Blob([angular.toJson(results, true)], {type: 'application/json'}); saveAs(blob, 'export.json'); } $scope.importAll = function (fileContents) { - var docs; + let docs; try { docs = JSON.parse(fileContents); } catch (e) { @@ -130,7 +130,7 @@ define(function (require) { } return Promise.map(docs, function (doc) { - var service = _.find($scope.services, {type: doc._type}).service; + const service = _.find($scope.services, {type: doc._type}).service; return service.get().then(function (obj) { obj.id = doc._id; return obj.applyESResp(doc).then(function () { diff --git a/src/plugins/kibana/public/settings/sections/objects/_view.js b/src/plugins/kibana/public/settings/sections/objects/_view.js index a78fe2bd77b4b..3fef727f455df 100644 --- a/src/plugins/kibana/public/settings/sections/objects/_view.js +++ b/src/plugins/kibana/public/settings/sections/objects/_view.js @@ -1,9 +1,9 @@ define(function (require) { - var _ = require('lodash'); - var angular = require('angular'); - var rison = require('ui/utils/rison'); - var registry = require('plugins/kibana/settings/saved_object_registry'); - var objectViewHTML = require('plugins/kibana/settings/sections/objects/_view.html'); + const _ = require('lodash'); + const angular = require('angular'); + const rison = require('ui/utils/rison'); + const registry = require('plugins/kibana/settings/saved_object_registry'); + const objectViewHTML = require('plugins/kibana/settings/sections/objects/_view.html'); require('ui/routes') .when('/settings/objects/:service/:id', { @@ -15,10 +15,10 @@ define(function (require) { return { restrict: 'E', controller: function ($scope, $injector, $routeParams, $location, $window, $rootScope, es, Private) { - var notify = new Notifier({ location: 'SavedObject view' }); - var castMappingType = Private(require('ui/index_patterns/_cast_mapping_type')); - var serviceObj = registry.get($routeParams.service); - var service = $injector.get(serviceObj.service); + const notify = new Notifier({ location: 'SavedObject view' }); + const castMappingType = Private(require('ui/index_patterns/_cast_mapping_type')); + const serviceObj = registry.get($routeParams.service); + const service = $injector.get(serviceObj.service); /** * Creates a field definition and pushes it to the memo stack. This function @@ -33,14 +33,14 @@ define(function (require) { * @param {array} parents The parent keys to the field * @returns {array} */ - var createField = function (memo, val, key, collection, parents) { + const createField = function (memo, val, key, collection, parents) { if (_.isArray(parents)) { parents.push(key); } else { parents = [key]; } - var field = { type: 'text', name: parents.join('.'), value: val }; + const field = { type: 'text', name: parents.join('.'), value: val }; if (_.isString(field.value)) { try { @@ -70,8 +70,8 @@ define(function (require) { return memo; }; - var readObjectClass = function (fields, Class) { - var fieldMap = _.indexBy(fields, 'name'); + const readObjectClass = function (fields, Class) { + const fieldMap = _.indexBy(fields, 'name'); _.forOwn(Class.mapping, function (esType, name) { if (fieldMap[name]) return; @@ -111,7 +111,7 @@ define(function (require) { $scope.obj = obj; $scope.link = service.urlFor(obj._id); - var fields = _.reduce(obj._source, createField, []); + const fields = _.reduce(obj._source, createField, []); if (service.Class) readObjectClass(fields, service.Class); $scope.fields = _.sortBy(fields, 'name'); }) @@ -122,7 +122,7 @@ define(function (require) { // we need to use the annotations to see if they have any errors. If they // do then we push the field.name to aceInvalidEditor variable. // Otherwise we remove it. - var loadedEditors = []; + const loadedEditors = []; $scope.aceInvalidEditors = []; $scope.aceLoaded = function (editor) { @@ -131,13 +131,13 @@ define(function (require) { editor.$blockScrolling = Infinity; - var session = editor.getSession(); - var fieldName = editor.container.id; + const session = editor.getSession(); + const fieldName = editor.container.id; session.setTabSize(2); session.setUseSoftTabs(true); session.on('changeAnnotation', function () { - var annotations = session.getAnnotations(); + const annotations = session.getAnnotations(); if (_.some(annotations, { type: 'error'})) { if (!_.contains($scope.aceInvalidEditors, fieldName)) { $scope.aceInvalidEditors.push(fieldName); @@ -173,10 +173,10 @@ define(function (require) { }; $scope.submit = function () { - var source = _.cloneDeep($scope.obj._source); + const source = _.cloneDeep($scope.obj._source); _.each($scope.fields, function (field) { - var value = field.value; + let value = field.value; if (field.type === 'number') { value = Number(field.value); @@ -206,7 +206,7 @@ define(function (require) { index: kbnIndex }) .then(function (resp) { - var msg = 'You successfully ' + action + ' the "' + $scope.obj._source.title + '" ' + $scope.title.toLowerCase() + ' object'; + const msg = 'You successfully ' + action + ' the "' + $scope.obj._source.title + '" ' + $scope.title.toLowerCase() + ' object'; $location.path('/settings/objects').search({ _a: rison.encode({ diff --git a/src/plugins/kibana/public/settings/sections/status/index.js b/src/plugins/kibana/public/settings/sections/status/index.js index 4887afcacf4cb..aba30e10f6155 100644 --- a/src/plugins/kibana/public/settings/sections/status/index.js +++ b/src/plugins/kibana/public/settings/sections/status/index.js @@ -1,5 +1,5 @@ define(function (require) { - var _ = require('lodash'); + const _ = require('lodash'); return { order: 3, diff --git a/src/plugins/kibana/public/visualize/editor/__tests__/agg.js b/src/plugins/kibana/public/visualize/editor/__tests__/agg.js index e2acbc9f78c22..99afaac6d36d7 100644 --- a/src/plugins/kibana/public/visualize/editor/__tests__/agg.js +++ b/src/plugins/kibana/public/visualize/editor/__tests__/agg.js @@ -1,19 +1,19 @@ -var angular = require('angular'); -var $ = require('jquery'); -var _ = require('lodash'); -var expect = require('expect.js'); -var ngMock = require('ngMock'); +const angular = require('angular'); +const $ = require('jquery'); +const _ = require('lodash'); +const expect = require('expect.js'); +const ngMock = require('ngMock'); require('plugins/kibana/visualize/editor/agg'); describe('Vis-Editor-Agg plugin directive', function () { - var $parentScope = {}; - var $scope; - var $elem; + const $parentScope = {}; + let $scope; + let $elem; function makeConfig(which) { - var schemaMap = { + const schemaMap = { radius: { title: 'Dot Size', min: 0, @@ -25,10 +25,10 @@ describe('Vis-Editor-Agg plugin directive', function () { max: Infinity } }; - var typeOptions = ['count', 'avg', 'sum', 'min', 'max', 'cardinality']; + const typeOptions = ['count', 'avg', 'sum', 'min', 'max', 'cardinality']; which = which || 'metric'; - var schema = schemaMap[which]; + const schema = schemaMap[which]; return { min: schema.min, diff --git a/src/plugins/kibana/public/visualize/editor/agg.js b/src/plugins/kibana/public/visualize/editor/agg.js index 3f551f81647c9..df8012c6fc85a 100644 --- a/src/plugins/kibana/public/visualize/editor/agg.js +++ b/src/plugins/kibana/public/visualize/editor/agg.js @@ -5,12 +5,12 @@ define(function (require) { require('plugins/kibana/visualize/editor/agg_params'); require('plugins/kibana/visualize/editor/agg_add'); - var _ = require('lodash'); - var $ = require('jquery'); - var aggTypes = Private(require('ui/agg_types/index')); - var advancedToggleHtml = require('plugins/kibana/visualize/editor/advanced_toggle.html'); + const _ = require('lodash'); + const $ = require('jquery'); + const aggTypes = Private(require('ui/agg_types/index')); + const advancedToggleHtml = require('plugins/kibana/visualize/editor/advanced_toggle.html'); - var notify = new Notifier({ + const notify = new Notifier({ location: 'visAggGroup' }); @@ -41,7 +41,7 @@ define(function (require) { */ $scope.describe = function () { if (!$scope.agg.type.makeLabel) return ''; - var label = $scope.agg.type.makeLabel($scope.agg); + const label = $scope.agg.type.makeLabel($scope.agg); return label ? label : ''; }; @@ -54,16 +54,16 @@ define(function (require) { $scope.moveDown = _.partial(move, true); $scope.remove = function (agg) { - var aggs = $scope.vis.aggs; + const aggs = $scope.vis.aggs; - var index = aggs.indexOf(agg); + const index = aggs.indexOf(agg); if (index === -1) return notify.log('already removed'); aggs.splice(index, 1); }; $scope.canRemove = function (aggregation) { - var metricCount = _.reduce($scope.group, function (count, agg) { + const metricCount = _.reduce($scope.group, function (count, agg) { return (agg.schema.name === aggregation.schema.name) ? ++count : count; }, 0); @@ -76,7 +76,7 @@ define(function (require) { return false; } - var firstDifferentSchema = _.findIndex($scope.group, function (agg) { + const firstDifferentSchema = _.findIndex($scope.group, function (agg) { return agg.schema !== $scope.agg.schema; }); diff --git a/src/plugins/kibana/public/visualize/editor/agg_add.js b/src/plugins/kibana/public/visualize/editor/agg_add.js index 932e4cb55a1e0..dffb16127f2c6 100644 --- a/src/plugins/kibana/public/visualize/editor/agg_add.js +++ b/src/plugins/kibana/public/visualize/editor/agg_add.js @@ -2,20 +2,20 @@ define(function (require) { require('ui/modules') .get('kibana') .directive('visEditorAggAdd', function (Private) { - var AggConfig = Private(require('ui/Vis/AggConfig')); + const AggConfig = Private(require('ui/Vis/AggConfig')); return { restrict: 'E', template: require('plugins/kibana/visualize/editor/agg_add.html'), controllerAs: 'add', controller: function ($scope) { - var self = this; + const self = this; self.form = false; self.submit = function (schema) { self.form = false; - var aggConfig = new AggConfig($scope.vis, { + const aggConfig = new AggConfig($scope.vis, { schema: schema }); aggConfig.brandNew = true; diff --git a/src/plugins/kibana/public/visualize/editor/agg_filter.js b/src/plugins/kibana/public/visualize/editor/agg_filter.js index 8f1cabb7e1983..97ba638fd0815 100644 --- a/src/plugins/kibana/public/visualize/editor/agg_filter.js +++ b/src/plugins/kibana/public/visualize/editor/agg_filter.js @@ -1,6 +1,6 @@ define(function (require) { - var _ = require('lodash'); - var propFilter = require('ui/filters/_prop_filter'); + const _ = require('lodash'); + const propFilter = require('ui/filters/_prop_filter'); require('ui/modules') .get('kibana') diff --git a/src/plugins/kibana/public/visualize/editor/agg_group.js b/src/plugins/kibana/public/visualize/editor/agg_group.js index 2aa7383be7c2b..f0d48f4d7d484 100644 --- a/src/plugins/kibana/public/visualize/editor/agg_group.js +++ b/src/plugins/kibana/public/visualize/editor/agg_group.js @@ -1,4 +1,4 @@ -var _ = require('lodash'); +const _ = require('lodash'); define(function (require) { require('ui/modules') @@ -21,7 +21,7 @@ define(function (require) { 'schemas', '[]group' ], function () { - var stats = $scope.stats = { + const stats = $scope.stats = { min: 0, max: 0, count: $scope.group ? $scope.group.length : 0 @@ -35,7 +35,7 @@ define(function (require) { }); $scope.availableSchema = $scope.schemas.filter(function (schema) { - var count = _.where($scope.group, { schema }).length; + const count = _.where($scope.group, { schema }).length; if (count < schema.max) return true; }); }); diff --git a/src/plugins/kibana/public/visualize/editor/agg_param.js b/src/plugins/kibana/public/visualize/editor/agg_param.js index dd2986ed8a071..82730722889ec 100644 --- a/src/plugins/kibana/public/visualize/editor/agg_param.js +++ b/src/plugins/kibana/public/visualize/editor/agg_param.js @@ -1,5 +1,5 @@ define(function (require) { - var _ = require('lodash'); + const _ = require('lodash'); require('ui/modules') .get('app/visualize') diff --git a/src/plugins/kibana/public/visualize/editor/agg_params.js b/src/plugins/kibana/public/visualize/editor/agg_params.js index b64599f5d1716..0a4768c44de48 100644 --- a/src/plugins/kibana/public/visualize/editor/agg_params.js +++ b/src/plugins/kibana/public/visualize/editor/agg_params.js @@ -1,18 +1,18 @@ define(function (require) { - var IndexedArray = require('ui/IndexedArray'); + const IndexedArray = require('ui/IndexedArray'); require('ui/modules') .get('app/visualize') .directive('visEditorAggParams', function ($compile, $parse, Private, Notifier, $filter) { - var _ = require('lodash'); - var $ = require('jquery'); - var aggTypes = Private(require('ui/agg_types/index')); - var aggSelectHtml = require('plugins/kibana/visualize/editor/agg_select.html'); - var advancedToggleHtml = require('plugins/kibana/visualize/editor/advanced_toggle.html'); + const _ = require('lodash'); + const $ = require('jquery'); + const aggTypes = Private(require('ui/agg_types/index')); + const aggSelectHtml = require('plugins/kibana/visualize/editor/agg_select.html'); + const advancedToggleHtml = require('plugins/kibana/visualize/editor/advanced_toggle.html'); require('ui/filters/match_any'); require('plugins/kibana/visualize/editor/agg_param'); - var notify = new Notifier({ + const notify = new Notifier({ location: 'visAggGroup' }); @@ -29,7 +29,7 @@ define(function (require) { // this will contain the controls for the schema (rows or columns?), which are unrelated to // controls for the agg, which is why they are first - var $schemaEditor = $('
    ').addClass('schemaEditors').appendTo($el); + const $schemaEditor = $('
    ').addClass('schemaEditors').appendTo($el); if ($scope.agg.schema.editor) { $schemaEditor.append($scope.agg.schema.editor); @@ -37,12 +37,12 @@ define(function (require) { } // allow selection of an aggregation - var $aggSelect = $(aggSelectHtml).appendTo($el); + const $aggSelect = $(aggSelectHtml).appendTo($el); $compile($aggSelect)($scope); // params for the selected agg, these are rebuilt every time the agg in $aggSelect changes - var $aggParamEditors; // container for agg type param editors - var $aggParamEditorsScope; + let $aggParamEditors; // container for agg type param editors + let $aggParamEditorsScope; $scope.$watch('agg.type', function updateAggParamEditor(newType, oldType) { if ($aggParamEditors) { $aggParamEditors.remove(); @@ -58,10 +58,10 @@ define(function (require) { // create child scope, used in the editors $aggParamEditorsScope = $scope.$new(); - var agg = $scope.agg; + const agg = $scope.agg; if (!agg) return; - var type = $scope.agg.type; + const type = $scope.agg.type; if (newType !== oldType) { // don't reset on initial load, the @@ -71,29 +71,29 @@ define(function (require) { if (!type) return; - var aggParamHTML = { + const aggParamHTML = { basic: [], advanced: [] }; // build collection of agg params html type.params.forEach(function (param, i) { - var aggParam; + let aggParam; // if field param exists, compute allowed fields if (param.name === 'field') { $aggParamEditorsScope.indexedFields = getIndexedFields(param); } if ($aggParamEditorsScope.indexedFields) { - var hasIndexedFields = $aggParamEditorsScope.indexedFields.length > 0; - var isExtraParam = i > 0; + const hasIndexedFields = $aggParamEditorsScope.indexedFields.length > 0; + const isExtraParam = i > 0; if (!hasIndexedFields && isExtraParam) { // don't draw the rest of the options if their are no indexed fields. return; } } - var type = 'basic'; + let type = 'basic'; if (param.advanced) type = 'advanced'; if (aggParam = getAggParamHTML(param, i)) { @@ -103,7 +103,7 @@ define(function (require) { }); // compile the paramEditors html elements - var paramEditors = aggParamHTML.basic; + let paramEditors = aggParamHTML.basic; if (aggParamHTML.advanced.length) { paramEditors.push($(advancedToggleHtml).get(0)); @@ -121,7 +121,7 @@ define(function (require) { return; } - var attrs = { + const attrs = { 'agg-param': 'agg.type.params[' + idx + ']' }; @@ -136,8 +136,8 @@ define(function (require) { } function getIndexedFields(param) { - var fields = $scope.agg.vis.indexPattern.fields.raw; - var fieldTypes = param.filterFieldTypes; + let fields = $scope.agg.vis.indexPattern.fields.raw; + const fieldTypes = param.filterFieldTypes; if (fieldTypes) { fields = $filter('fieldType')(fields, fieldTypes); diff --git a/src/plugins/kibana/public/visualize/editor/editor.js b/src/plugins/kibana/public/visualize/editor/editor.js index cec9316e2b4e9..005e44550067f 100644 --- a/src/plugins/kibana/public/visualize/editor/editor.js +++ b/src/plugins/kibana/public/visualize/editor/editor.js @@ -1,5 +1,5 @@ define(function (require) { - var _ = require('lodash'); + const _ = require('lodash'); require('plugins/kibana/visualize/saved_visualizations/saved_visualizations'); require('plugins/kibana/visualize/editor/sidebar'); require('plugins/kibana/visualize/editor/agg_filter'); @@ -13,8 +13,8 @@ define(function (require) { template: require('plugins/kibana/visualize/editor/editor.html'), resolve: { savedVis: function (savedVisualizations, courier, $route, Private) { - var visTypes = Private(require('ui/registry/vis_types')); - var visType = _.find(visTypes, {name: $route.current.params.type}); + const visTypes = Private(require('ui/registry/vis_types')); + const visType = _.find(visTypes, {name: $route.current.params.type}); if (visType.requiresSearch && !$route.current.params.indexPattern && !$route.current.params.savedSearchId) { throw new Error('You must provide either an indexPattern or a savedSearchId'); } @@ -48,32 +48,32 @@ define(function (require) { ]) .controller('VisEditor', function ($scope, $route, timefilter, AppState, $location, kbnUrl, $timeout, courier, Private, Promise) { - var angular = require('angular'); - var ConfigTemplate = require('ui/ConfigTemplate'); - var Notifier = require('ui/notify/notifier'); - var docTitle = Private(require('ui/doc_title')); - var brushEvent = Private(require('ui/utils/brush_event')); - var queryFilter = Private(require('ui/filter_bar/query_filter')); - var filterBarClickHandler = Private(require('ui/filter_bar/filter_bar_click_handler')); + const angular = require('angular'); + const ConfigTemplate = require('ui/ConfigTemplate'); + const Notifier = require('ui/notify/notifier'); + const docTitle = Private(require('ui/doc_title')); + const brushEvent = Private(require('ui/utils/brush_event')); + const queryFilter = Private(require('ui/filter_bar/query_filter')); + const filterBarClickHandler = Private(require('ui/filter_bar/filter_bar_click_handler')); - var notify = new Notifier({ + const notify = new Notifier({ location: 'Visualization Editor' }); - var savedVis = $route.current.locals.savedVis; + const savedVis = $route.current.locals.savedVis; - var vis = savedVis.vis; - var editableVis = vis.createEditableVis(); + const vis = savedVis.vis; + const editableVis = vis.createEditableVis(); vis.requesting = function () { - var requesting = editableVis.requesting; + const requesting = editableVis.requesting; requesting.call(vis); requesting.call(editableVis); }; - var searchSource = savedVis.searchSource; + const searchSource = savedVis.searchSource; // config panel templates - var configTemplate = new ConfigTemplate({ + const configTemplate = new ConfigTemplate({ save: require('plugins/kibana/visualize/editor/panels/save.html'), load: require('plugins/kibana/visualize/editor/panels/load.html'), share: require('plugins/kibana/visualize/editor/panels/share.html'), @@ -83,9 +83,9 @@ define(function (require) { docTitle.change(savedVis.title); } - var $state = $scope.$state = (function initState() { - var savedVisState = vis.getState(); - var stateDefaults = { + let $state = $scope.$state = (function initState() { + const savedVisState = vis.getState(); + const stateDefaults = { uiState: savedVis.uiStateJSON ? JSON.parse(savedVis.uiStateJSON) : {}, linked: !!savedVis.savedSearchId, query: searchSource.getOwn('query') || {query_string: {query: '*'}}, @@ -239,8 +239,8 @@ define(function (require) { if (!$state.linked) return; $state.linked = false; - var parent = searchSource.getParent(true); - var parentsParent = parent.getParent(true); + const parent = searchSource.getParent(true); + const parentsParent = parent.getParent(true); // display unlinking for 2 seconds, unless it is double clicked $scope.unlinking = $timeout($scope.clearUnlinking, 2000); diff --git a/src/plugins/kibana/public/visualize/editor/nesting_indicator.js b/src/plugins/kibana/public/visualize/editor/nesting_indicator.js index 00cc86204898a..7288eb51f3a7f 100644 --- a/src/plugins/kibana/public/visualize/editor/nesting_indicator.js +++ b/src/plugins/kibana/public/visualize/editor/nesting_indicator.js @@ -2,9 +2,9 @@ define(function (require) { require('ui/modules') .get('kibana') .directive('nestingIndicator', function ($rootScope, $parse, Private) { - var _ = require('lodash'); - var $ = require('jquery'); - var getColors = Private(require('ui/vislib/components/color/color_palette')); + const _ = require('lodash'); + const $ = require('jquery'); + const getColors = Private(require('ui/vislib/components/color/color_palette')); return { restrict: 'E', @@ -16,10 +16,10 @@ define(function (require) { $scope.$watchCollection('list', function () { if (!$scope.list || !$scope.item) return; - var item = $scope.item; - var index = $scope.list.indexOf($scope.item); - var bars = $scope.list.slice(0, index + 1); - var colors = getColors(bars.length); + const item = $scope.item; + const index = $scope.list.indexOf($scope.item); + const bars = $scope.list.slice(0, index + 1); + const colors = getColors(bars.length); $el.html(bars.map(function (bar, i) { return $(document.createElement('span')) diff --git a/src/plugins/kibana/public/visualize/editor/sidebar.js b/src/plugins/kibana/public/visualize/editor/sidebar.js index 56671c8e0bfaa..8394bdd04dd19 100644 --- a/src/plugins/kibana/public/visualize/editor/sidebar.js +++ b/src/plugins/kibana/public/visualize/editor/sidebar.js @@ -2,7 +2,7 @@ define(function (require) { require('ui/modules') .get('app/visualize') .directive('visEditorSidebar', function () { - var _ = require('lodash'); + const _ = require('lodash'); require('plugins/kibana/visualize/editor/agg_group'); require('plugins/kibana/visualize/editor/vis_options'); diff --git a/src/plugins/kibana/public/visualize/editor/vis_options.js b/src/plugins/kibana/public/visualize/editor/vis_options.js index 6d30d36e1698b..ed6d4e76807f7 100644 --- a/src/plugins/kibana/public/visualize/editor/vis_options.js +++ b/src/plugins/kibana/public/visualize/editor/vis_options.js @@ -1,6 +1,6 @@ define(function (require) { - var _ = require('lodash'); - var $ = require('jquery'); + const _ = require('lodash'); + const $ = require('jquery'); require('ui/modules') .get('app/visualize') @@ -12,8 +12,8 @@ define(function (require) { vis: '=', }, link: function ($scope, $el) { - var $optionContainer = $el.find('.visualization-options'); - var $editor = $compile($scope.vis.type.params.editor)($scope); + const $optionContainer = $el.find('.visualization-options'); + const $editor = $compile($scope.vis.type.params.editor)($scope); $optionContainer.append($editor); $scope.$watch('vis.type.schemas.all.length', function (len) { diff --git a/src/plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js b/src/plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js index f7ce3e56bb22c..c1da50201bba5 100644 --- a/src/plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js +++ b/src/plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js @@ -2,16 +2,16 @@ define(function (require) { require('ui/modules') .get('app/visualize') .factory('SavedVis', function (config, $injector, courier, Promise, savedSearches, Private, Notifier) { - var _ = require('lodash'); - var Vis = Private(require('ui/Vis')); + const _ = require('lodash'); + const Vis = Private(require('ui/Vis')); - var notify = new Notifier({ + const notify = new Notifier({ location: 'SavedVis' }); _.class(SavedVis).inherits(courier.SavedObject); function SavedVis(opts) { - var self = this; + const self = this; opts = opts || {}; if (typeof opts !== 'object') opts = { id: opts }; @@ -26,7 +26,7 @@ define(function (require) { title: 'New Visualization', visState: (function () { if (!opts.type) return null; - var def = {}; + const def = {}; def.type = opts.type; return def; }()), @@ -54,7 +54,7 @@ define(function (require) { SavedVis.searchSource = true; SavedVis.prototype._afterEsResp = function () { - var self = this; + const self = this; return self._getLinkedSavedSearch() .then(function () { @@ -73,9 +73,9 @@ define(function (require) { }; SavedVis.prototype._getLinkedSavedSearch = Promise.method(function () { - var self = this; - var linkedSearch = !!self.savedSearchId; - var current = self.savedSearch; + const self = this; + const linkedSearch = !!self.savedSearchId; + const current = self.savedSearch; if (linkedSearch && current && current.id === self.savedSearchId) { return; @@ -97,7 +97,7 @@ define(function (require) { }); SavedVis.prototype._createVis = function () { - var self = this; + const self = this; if (self.stateJSON) { self.visState = Vis.convertOldState(self.typeName, JSON.parse(self.stateJSON)); @@ -118,7 +118,7 @@ define(function (require) { }; SavedVis.prototype._updateVis = function () { - var self = this; + const self = this; self.vis.indexPattern = self.searchSource.get('index'); self.visState.title = self.title; diff --git a/src/plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js b/src/plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js index 3f4f98295ff0d..4c3ca00b19988 100644 --- a/src/plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js +++ b/src/plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js @@ -1,7 +1,7 @@ define(function (require) { - var app = require('ui/modules').get('app/visualize'); - var _ = require('lodash'); - var Scanner = require('ui/utils/scanner'); + const app = require('ui/modules').get('app/visualize'); + const _ = require('lodash'); + const Scanner = require('ui/utils/scanner'); require('plugins/kibana/visualize/saved_visualizations/_saved_vis'); @@ -13,14 +13,14 @@ define(function (require) { }); app.service('savedVisualizations', function (Promise, es, kbnIndex, SavedVis, Private, Notifier, kbnUrl) { - var visTypes = Private(require('ui/registry/vis_types')); + const visTypes = Private(require('ui/registry/vis_types')); - var scanner = new Scanner(es, { + const scanner = new Scanner(es, { index: kbnIndex, type: 'visualization' }); - var notify = new Notifier({ + const notify = new Notifier({ location: 'Saved Visualization Service' }); @@ -56,11 +56,11 @@ define(function (require) { }; this.mapHits = function (hit) { - var source = hit._source; + const source = hit._source; source.id = hit._id; source.url = this.urlFor(hit._id); - var typeName = source.typeName; + let typeName = source.typeName; if (source.visState) { try { typeName = JSON.parse(source.visState).type; } catch (e) { /* missing typename handled below */ } // eslint-disable-line no-empty @@ -78,7 +78,7 @@ define(function (require) { }; this.find = function (searchString, size = 100) { - var body; + let body; if (searchString) { body = { query: { diff --git a/src/plugins/kibana/public/visualize/wizard/wizard.js b/src/plugins/kibana/public/visualize/wizard/wizard.js index 3644127b4ffbf..3097e3adf9c70 100644 --- a/src/plugins/kibana/public/visualize/wizard/wizard.js +++ b/src/plugins/kibana/public/visualize/wizard/wizard.js @@ -1,16 +1,16 @@ define(function (require) { - var _ = require('lodash'); + const _ = require('lodash'); require('plugins/kibana/visualize/saved_visualizations/saved_visualizations'); require('ui/directives/saved_object_finder'); require('plugins/kibana/discover/saved_searches/saved_searches'); - var templateStep = function (num, txt) { + const templateStep = function (num, txt) { return '
    ' + txt + '
    '; }; - var module = require('ui/modules').get('app/visualize', ['kibana/courier']); - var routes = require('ui/routes'); + const module = require('ui/modules').get('app/visualize', ['kibana/courier']); + const routes = require('ui/routes'); /******** /** Wizard Step 1 @@ -42,7 +42,7 @@ define(function (require) { }); module.controller('VisualizeWizardStep2', function ($route, $scope, $location, timefilter, kbnUrl) { - var type = $route.current.params.type; + const type = $route.current.params.type; $scope.step2WithSearchUrl = function (hit) { return kbnUrl.eval('#/visualize/create?&type={{type}}&savedSearchId={{id}}', {type: type, id: hit.id}); From f89de6bc047e161401aeb2ac75ff6ac47523ded7 Mon Sep 17 00:00:00 2001 From: Court Ewing Date: Mon, 1 Feb 2016 19:49:01 -0500 Subject: [PATCH 06/10] Use const/let in markdown_vis plugin --- .../public/__tests__/markdown_vis_controller.js | 8 ++++---- src/plugins/markdown_vis/public/markdown_vis.js | 2 +- .../markdown_vis/public/markdown_vis_controller.js | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/plugins/markdown_vis/public/__tests__/markdown_vis_controller.js b/src/plugins/markdown_vis/public/__tests__/markdown_vis_controller.js index 97f9e5a019d79..465eeb6f0ce69 100644 --- a/src/plugins/markdown_vis/public/__tests__/markdown_vis_controller.js +++ b/src/plugins/markdown_vis/public/__tests__/markdown_vis_controller.js @@ -1,9 +1,9 @@ describe('markdown vis controller', function () { - var $scope; - var $el; - var ngMock = require('ngMock'); - var expect = require('expect.js'); + let $scope; + let $el; + const ngMock = require('ngMock'); + const expect = require('expect.js'); beforeEach(ngMock.module('kibana/markdown_vis')); beforeEach(ngMock.inject(function ($rootScope, $controller) { diff --git a/src/plugins/markdown_vis/public/markdown_vis.js b/src/plugins/markdown_vis/public/markdown_vis.js index 3066cd8c108af..d455097e3b497 100644 --- a/src/plugins/markdown_vis/public/markdown_vis.js +++ b/src/plugins/markdown_vis/public/markdown_vis.js @@ -9,7 +9,7 @@ define(function (require) { require('ui/registry/vis_types').register(MarkdownVisProvider); function MarkdownVisProvider(Private) { - var TemplateVisType = Private(require('ui/template_vis_type/TemplateVisType')); + const TemplateVisType = Private(require('ui/template_vis_type/TemplateVisType')); // return the visType object, which kibana will use to display and configure new // Vis object of this type. diff --git a/src/plugins/markdown_vis/public/markdown_vis_controller.js b/src/plugins/markdown_vis/public/markdown_vis_controller.js index d46d278520beb..00b859702edd5 100644 --- a/src/plugins/markdown_vis/public/markdown_vis_controller.js +++ b/src/plugins/markdown_vis/public/markdown_vis_controller.js @@ -1,11 +1,11 @@ define(function (require) { - var marked = require('marked'); + const marked = require('marked'); marked.setOptions({ gfm: true, // Github-flavored markdown sanitize: true // Sanitize HTML tags }); - var module = require('ui/modules').get('kibana/markdown_vis', ['kibana']); + const module = require('ui/modules').get('kibana/markdown_vis', ['kibana']); module.controller('KbnMarkdownVisController', function ($scope, $sce) { $scope.$watch('vis.params.markdown', function (html) { if (!html) return; From bd1e23b0fba8d57ddd6b16b552b82caa35888f41 Mon Sep 17 00:00:00 2001 From: Court Ewing Date: Mon, 1 Feb 2016 19:49:13 -0500 Subject: [PATCH 07/10] Use const/let in metric_vis plugin --- .../metric_vis/public/__tests__/metric_vis_controller.js | 8 ++++---- src/plugins/metric_vis/public/metric_vis.js | 4 ++-- src/plugins/metric_vis/public/metric_vis_controller.js | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/plugins/metric_vis/public/__tests__/metric_vis_controller.js b/src/plugins/metric_vis/public/__tests__/metric_vis_controller.js index b1309ff569ebc..133d8d6f979ac 100644 --- a/src/plugins/metric_vis/public/__tests__/metric_vis_controller.js +++ b/src/plugins/metric_vis/public/__tests__/metric_vis_controller.js @@ -1,10 +1,10 @@ describe('metric vis', function () { - var $scope; - var ngMock = require('ngMock'); - var expect = require('expect.js'); + let $scope; + const ngMock = require('ngMock'); + const expect = require('expect.js'); - var formatter = function (value) { + const formatter = function (value) { return value.toFixed(3); }; diff --git a/src/plugins/metric_vis/public/metric_vis.js b/src/plugins/metric_vis/public/metric_vis.js index 0e5b99c4e225f..0b9aaf03c2fd6 100644 --- a/src/plugins/metric_vis/public/metric_vis.js +++ b/src/plugins/metric_vis/public/metric_vis.js @@ -9,8 +9,8 @@ define(function (require) { require('ui/registry/vis_types').register(MetricVisProvider); function MetricVisProvider(Private) { - var TemplateVisType = Private(require('ui/template_vis_type/TemplateVisType')); - var Schemas = Private(require('ui/Vis/Schemas')); + const TemplateVisType = Private(require('ui/template_vis_type/TemplateVisType')); + const Schemas = Private(require('ui/Vis/Schemas')); // return the visType object, which kibana will use to display and configure new // Vis object of this type. diff --git a/src/plugins/metric_vis/public/metric_vis_controller.js b/src/plugins/metric_vis/public/metric_vis_controller.js index 3ac2ef17c7d22..30cc9f94577e5 100644 --- a/src/plugins/metric_vis/public/metric_vis_controller.js +++ b/src/plugins/metric_vis/public/metric_vis_controller.js @@ -1,17 +1,17 @@ define(function (require) { // get the kibana/metric_vis module, and make sure that it requires the "kibana" module if it // didn't already - var module = require('ui/modules').get('kibana/metric_vis', ['kibana']); + const module = require('ui/modules').get('kibana/metric_vis', ['kibana']); module.controller('KbnMetricVisController', function ($scope, Private) { - var tabifyAggResponse = Private(require('ui/agg_response/tabify/tabify')); + const tabifyAggResponse = Private(require('ui/agg_response/tabify/tabify')); - var metrics = $scope.metrics = []; + const metrics = $scope.metrics = []; $scope.processTableGroups = function (tableGroups) { tableGroups.tables.forEach(function (table) { table.columns.forEach(function (column, i) { - var fieldFormatter = table.aggConfig(column).fieldFormatter(); + const fieldFormatter = table.aggConfig(column).fieldFormatter(); metrics.push({ label: column.title, value: fieldFormatter(table.rows[0][i]) From 4a0396ca8f4affcd31e576e84364dde77539e9aa Mon Sep 17 00:00:00 2001 From: Court Ewing Date: Mon, 1 Feb 2016 19:49:23 -0500 Subject: [PATCH 08/10] Use const/let in spyModes plugin --- src/plugins/spyModes/public/reqRespStatsSpyMode.js | 12 ++++++------ src/plugins/spyModes/public/tableSpyMode.js | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/plugins/spyModes/public/reqRespStatsSpyMode.js b/src/plugins/spyModes/public/reqRespStatsSpyMode.js index 471026beca368..59b42509f5f8d 100644 --- a/src/plugins/spyModes/public/reqRespStatsSpyMode.js +++ b/src/plugins/spyModes/public/reqRespStatsSpyMode.js @@ -1,8 +1,8 @@ define(function (require) { - var _ = require('lodash'); - var reqRespStatsHTML = require('plugins/spyModes/reqRespStatsSpyMode.html'); + const _ = require('lodash'); + const reqRespStatsHTML = require('plugins/spyModes/reqRespStatsSpyMode.html'); - var linkReqRespStats = function ($scope, config) { + const linkReqRespStats = function ($scope, config) { $scope.$bind('req', 'searchSource.history[searchSource.history.length - 1]'); $scope.$watchMulti([ 'req', @@ -12,9 +12,9 @@ define(function (require) { ], function () { if (!$scope.searchSource || !$scope.req) return; - var req = $scope.req; - var resp = $scope.req.resp; - var stats = $scope.stats = []; + const req = $scope.req; + const resp = $scope.req.resp; + const stats = $scope.stats = []; if (resp && resp.took != null) stats.push(['Query Duration', resp.took + 'ms']); if (req && req.ms != null) stats.push(['Request Duration', req.ms + 'ms']); diff --git a/src/plugins/spyModes/public/tableSpyMode.js b/src/plugins/spyModes/public/tableSpyMode.js index b18c4ae437f83..d7a2981623d45 100644 --- a/src/plugins/spyModes/public/tableSpyMode.js +++ b/src/plugins/spyModes/public/tableSpyMode.js @@ -1,10 +1,10 @@ define(function (require) { function VisSpyTableProvider(Notifier, $filter, $rootScope, config, Private) { - var _ = require('lodash'); - var saveAs = require('@spalger/filesaver').saveAs; - var tabifyAggResponse = Private(require('ui/agg_response/tabify/tabify')); + const _ = require('lodash'); + const saveAs = require('@spalger/filesaver').saveAs; + const tabifyAggResponse = Private(require('ui/agg_response/tabify/tabify')); - var PER_PAGE_DEFAULT = 10; + const PER_PAGE_DEFAULT = 10; require('ui/agg_table'); From 78cb6aa7a183ed0c4239fa6fb9ae58fa00003318 Mon Sep 17 00:00:00 2001 From: Court Ewing Date: Mon, 1 Feb 2016 19:49:35 -0500 Subject: [PATCH 09/10] Use const/let in statusPage plugin --- .../statusPage/public/lib/formatNumber.js | 8 +++---- .../statusPage/public/lib/makeChartOptions.js | 2 +- .../statusPage/public/lib/readStatData.js | 8 +++---- .../statusPage/public/lib/toTitleCase.js | 2 +- src/plugins/statusPage/public/statusPage.js | 14 ++++++------ .../statusPage/public/statusPageMetric.js | 22 +++++++++---------- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/plugins/statusPage/public/lib/formatNumber.js b/src/plugins/statusPage/public/lib/formatNumber.js index 291ea77ae7d4b..291e4c5a3406f 100644 --- a/src/plugins/statusPage/public/lib/formatNumber.js +++ b/src/plugins/statusPage/public/lib/formatNumber.js @@ -1,10 +1,10 @@ -var moment = require('moment'); -var numeral = require('numeral'); +const moment = require('moment'); +const numeral = require('numeral'); module.exports = function formatNumber(num, which) { - var format = '0.00'; - var postfix = ''; + let format = '0.00'; + let postfix = ''; switch (which) { case 'time': return moment(num).format('HH:mm:ss'); diff --git a/src/plugins/statusPage/public/lib/makeChartOptions.js b/src/plugins/statusPage/public/lib/makeChartOptions.js index b7a8783c84396..fdcad49d96799 100644 --- a/src/plugins/statusPage/public/lib/makeChartOptions.js +++ b/src/plugins/statusPage/public/lib/makeChartOptions.js @@ -1,5 +1,5 @@ -var formatNumber = require('./formatNumber'); +const formatNumber = require('./formatNumber'); module.exports = function makeChartOptions(type) { return { diff --git a/src/plugins/statusPage/public/lib/readStatData.js b/src/plugins/statusPage/public/lib/readStatData.js index 1bfe56392fe29..7a21a045cd6b4 100644 --- a/src/plugins/statusPage/public/lib/readStatData.js +++ b/src/plugins/statusPage/public/lib/readStatData.js @@ -1,4 +1,4 @@ -var _ = require('lodash'); +const _ = require('lodash'); module.exports = function readStatData(data, seriesNames) { // Metric Values format @@ -13,13 +13,13 @@ module.exports = function readStatData(data, seriesNames) { // Go through all of the metric values and split the values out. // returns an array of all of the averages - var metricList = []; + const metricList = []; seriesNames = seriesNames || []; data.forEach(function (vector) { vector = _.flatten(vector); - var x = vector.shift(); + const x = vector.shift(); vector.forEach(function (yValue, i) { - var series = seriesNames[i] || ''; + const series = seriesNames[i] || ''; if (!metricList[i]) { metricList[i] = { diff --git a/src/plugins/statusPage/public/lib/toTitleCase.js b/src/plugins/statusPage/public/lib/toTitleCase.js index e7f4a1d33a4fa..798039898817a 100644 --- a/src/plugins/statusPage/public/lib/toTitleCase.js +++ b/src/plugins/statusPage/public/lib/toTitleCase.js @@ -1,4 +1,4 @@ -var _ = require('lodash'); +const _ = require('lodash'); // Turns thisIsASentence to // This Is A Sentence diff --git a/src/plugins/statusPage/public/statusPage.js b/src/plugins/statusPage/public/statusPage.js index 6189ec0832581..ecadba6467607 100644 --- a/src/plugins/statusPage/public/statusPage.js +++ b/src/plugins/statusPage/public/statusPage.js @@ -1,11 +1,11 @@ -var $ = require('jquery'); -var _ = require('lodash'); -var notify = require('ui/notify'); +const $ = require('jquery'); +const _ = require('lodash'); +const notify = require('ui/notify'); require('plugins/statusPage/statusPageMetric'); require('plugins/statusPage/statusPage.less'); -var chrome = require('ui/chrome') +const chrome = require('ui/chrome') .setTabs([ { id: '', @@ -15,7 +15,7 @@ var chrome = require('ui/chrome') ]) .setRootTemplate(require('plugins/statusPage/statusPage.html')) .setRootController('ui', function ($http, $scope) { - var ui = this; + const ui = this; ui.loading = false; ui.refresh = function () { @@ -31,11 +31,11 @@ var chrome = require('ui/chrome') ui.fetchError = null; } - var data = resp.data; + const data = resp.data; ui.metrics = data.metrics; ui.statuses = data.status.statuses; - var overall = data.status.overall; + const overall = data.status.overall; if (!ui.serverState || (ui.serverState !== overall.state)) { ui.serverState = overall.state; ui.serverStateMessage = overall.title; diff --git a/src/plugins/statusPage/public/statusPageMetric.js b/src/plugins/statusPage/public/statusPageMetric.js index 99de1c3670240..180fb2826a492 100644 --- a/src/plugins/statusPage/public/statusPageMetric.js +++ b/src/plugins/statusPage/public/statusPageMetric.js @@ -1,14 +1,14 @@ -var _ = require('lodash'); -var moment = require('moment'); -var numeral = require('numeral'); +const _ = require('lodash'); +const moment = require('moment'); +const numeral = require('numeral'); -var toTitleCase = require('./lib/toTitleCase'); -var formatNumber = require('./lib/formatNumber'); -var readStatData = require('./lib/readStatData'); +const toTitleCase = require('./lib/toTitleCase'); +const formatNumber = require('./lib/formatNumber'); +const readStatData = require('./lib/readStatData'); function calcAvg(metricList, metricNumberType) { return metricList.map(function (data) { - var uglySum = data.values.reduce(function (sumSoFar, vector) { + const uglySum = data.values.reduce(function (sumSoFar, vector) { return sumSoFar + vector.y; }, 0); return formatNumber(uglySum / data.values.length, metricNumberType); @@ -27,7 +27,7 @@ require('ui/modules') }, controllerAs: 'metric', controller: function ($scope) { - var self = this; + const self = this; self.name = $scope.name; self.title = toTitleCase(self.name); @@ -56,10 +56,10 @@ require('ui/modules') self.chartData = readStatData(self.rawData, self.seriesNames); self.averages = calcAvg(self.chartData, self.numberType); - var unit = ''; + let unit = ''; self.averages = self.averages.map(function (average) { - var parts = average.split(' '); - var value = parts.shift(); + const parts = average.split(' '); + const value = parts.shift(); unit = parts.join(' '); return value; }); From 44700a683c906105ceb16a3b8c23445af8e50411 Mon Sep 17 00:00:00 2001 From: Court Ewing Date: Mon, 1 Feb 2016 19:49:47 -0500 Subject: [PATCH 10/10] Use const/let in table_vis plugin --- .../table_vis/public/__tests__/_table_vis.js | 38 ++++++------- .../public/__tests__/_table_vis_controller.js | 54 +++++++++---------- src/plugins/table_vis/public/table_vis.js | 4 +- .../table_vis/public/table_vis_controller.js | 12 ++--- .../table_vis/public/table_vis_params.js | 4 +- 5 files changed, 56 insertions(+), 56 deletions(-) diff --git a/src/plugins/table_vis/public/__tests__/_table_vis.js b/src/plugins/table_vis/public/__tests__/_table_vis.js index 14790fbe83fd1..8df38cb5c669d 100644 --- a/src/plugins/table_vis/public/__tests__/_table_vis.js +++ b/src/plugins/table_vis/public/__tests__/_table_vis.js @@ -1,18 +1,18 @@ describe('Integration', function () { - var $ = require('jquery'); - var _ = require('lodash'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); - var sinon = require('auto-release-sinon'); - - var $rootScope; - var TableGroup; - var $compile; - var $scope; - var $el; - var Vis; - var indexPattern; - var fixtures; + const $ = require('jquery'); + const _ = require('lodash'); + const expect = require('expect.js'); + const ngMock = require('ngMock'); + const sinon = require('auto-release-sinon'); + + let $rootScope; + let TableGroup; + let $compile; + let $scope; + let $el; + let Vis; + let indexPattern; + let fixtures; beforeEach(ngMock.module('kibana', 'kibana/table_vis')); beforeEach(ngMock.inject(function (Private, $injector) { @@ -93,7 +93,7 @@ describe('Integration', function () { it('passes the table groups to the kbnAggTableGroup directive', function () { init(new OneRangeVis(), fixtures.oneRangeBucket); - var $atg = $el.find('kbn-agg-table-group').first(); + const $atg = $el.find('kbn-agg-table-group').first(); expect($atg.size()).to.be(1); expect($atg.attr('group')).to.be('tableGroups'); expect($atg.isolateScope().group).to.be($atg.scope().tableGroups); @@ -104,18 +104,18 @@ describe('Integration', function () { expect($el.find('kbn-agg-table-group').size()).to.be(0); - var $err = $el.find('.table-vis-error'); + const $err = $el.find('.table-vis-error'); expect($err.size()).to.be(1); expect($err.text().trim()).to.be('No results found'); }); it('displays an error if the search hits, but didn\'t create any rows', function () { - var visParams = { + const visParams = { showPartialRows: false, metricsAtAllLevels: true }; - var resp = _.cloneDeep(fixtures.threeTermBuckets); + const resp = _.cloneDeep(fixtures.threeTermBuckets); resp.aggregations.agg_2.buckets.forEach(function (extensionBucket) { extensionBucket.agg_3.buckets.forEach(function (countryBucket) { // clear all the machine os buckets @@ -127,7 +127,7 @@ describe('Integration', function () { expect($el.find('kbn-agg-table-group').size()).to.be(0); - var $err = $el.find('.table-vis-error'); + const $err = $el.find('.table-vis-error'); expect($err.size()).to.be(1); expect($err.text().trim()).to.be('No results found'); }); diff --git a/src/plugins/table_vis/public/__tests__/_table_vis_controller.js b/src/plugins/table_vis/public/__tests__/_table_vis_controller.js index c7f0575b1c9ee..4ea3df8f66a2d 100644 --- a/src/plugins/table_vis/public/__tests__/_table_vis_controller.js +++ b/src/plugins/table_vis/public/__tests__/_table_vis_controller.js @@ -1,18 +1,18 @@ describe('Controller', function () { - var $ = require('jquery'); - var _ = require('lodash'); - var expect = require('expect.js'); - var ngMock = require('ngMock'); - var sinon = require('auto-release-sinon'); - - var $rootScope; - var TableGroup; - var $compile; - var Private; - var $scope; - var $el; - var Vis; - var fixtures; + const $ = require('jquery'); + const _ = require('lodash'); + const expect = require('expect.js'); + const ngMock = require('ngMock'); + const sinon = require('auto-release-sinon'); + + let $rootScope; + let TableGroup; + let $compile; + let Private; + let $scope; + let $el; + let Vis; + let fixtures; beforeEach(ngMock.module('kibana', 'kibana/table_vis')); beforeEach(ngMock.inject(function ($injector) { @@ -103,7 +103,7 @@ describe('Controller', function () { initController(new OneRangeVis()); // modify the data to not have any buckets - var resp = _.cloneDeep(fixtures.oneRangeBucket); + const resp = _.cloneDeep(fixtures.oneRangeBucket); resp.aggregations.agg_2.buckets = {}; attachEsResponseToScope(resp); @@ -114,11 +114,11 @@ describe('Controller', function () { it('passes partialRows:true to tabify based on the vis params', function () { // spy on the tabify private module - var tabifyPm = require('ui/agg_response/tabify/tabify'); - var spiedTabify = sinon.spy(Private(tabifyPm)); + const tabifyPm = require('ui/agg_response/tabify/tabify'); + const spiedTabify = sinon.spy(Private(tabifyPm)); Private.stub(tabifyPm, spiedTabify); - var vis = new OneRangeVis({ showPartialRows: true }); + const vis = new OneRangeVis({ showPartialRows: true }); initController(vis); attachEsResponseToScope(fixtures.oneRangeBucket); @@ -128,11 +128,11 @@ describe('Controller', function () { it('passes partialRows:false to tabify based on the vis params', function () { // spy on the tabify private module - var tabifyPm = require('ui/agg_response/tabify/tabify'); - var spiedTabify = sinon.spy(Private(tabifyPm)); + const tabifyPm = require('ui/agg_response/tabify/tabify'); + const spiedTabify = sinon.spy(Private(tabifyPm)); Private.stub(tabifyPm, spiedTabify); - var vis = new OneRangeVis({ showPartialRows: false }); + const vis = new OneRangeVis({ showPartialRows: false }); initController(vis); attachEsResponseToScope(fixtures.oneRangeBucket); @@ -142,11 +142,11 @@ describe('Controller', function () { it('passes partialRows:true to tabify based on the vis params', function () { // spy on the tabify private module - var tabifyPm = require('ui/agg_response/tabify/tabify'); - var spiedTabify = sinon.spy(Private(tabifyPm)); + const tabifyPm = require('ui/agg_response/tabify/tabify'); + const spiedTabify = sinon.spy(Private(tabifyPm)); Private.stub(tabifyPm, spiedTabify); - var vis = new OneRangeVis({ showPartialRows: true }); + const vis = new OneRangeVis({ showPartialRows: true }); initController(vis); attachEsResponseToScope(fixtures.oneRangeBucket); @@ -156,11 +156,11 @@ describe('Controller', function () { it('passes partialRows:false to tabify based on the vis params', function () { // spy on the tabify private module - var tabifyPm = require('ui/agg_response/tabify/tabify'); - var spiedTabify = sinon.spy(Private(tabifyPm)); + const tabifyPm = require('ui/agg_response/tabify/tabify'); + const spiedTabify = sinon.spy(Private(tabifyPm)); Private.stub(tabifyPm, spiedTabify); - var vis = new OneRangeVis({ showPartialRows: false }); + const vis = new OneRangeVis({ showPartialRows: false }); initController(vis); attachEsResponseToScope(fixtures.oneRangeBucket); diff --git a/src/plugins/table_vis/public/table_vis.js b/src/plugins/table_vis/public/table_vis.js index a912925950f6c..15650ca33ee1a 100644 --- a/src/plugins/table_vis/public/table_vis.js +++ b/src/plugins/table_vis/public/table_vis.js @@ -17,8 +17,8 @@ define(function (require) { // define the TableVisType function TableVisTypeProvider(Private) { - var TemplateVisType = Private(require('ui/template_vis_type/TemplateVisType')); - var Schemas = Private(require('ui/Vis/Schemas')); + const TemplateVisType = Private(require('ui/template_vis_type/TemplateVisType')); + const Schemas = Private(require('ui/Vis/Schemas')); // define the TableVisController which is used in the template // by angular's ng-controller directive diff --git a/src/plugins/table_vis/public/table_vis_controller.js b/src/plugins/table_vis/public/table_vis_controller.js index 89630eb1da5f2..7f398cad107eb 100644 --- a/src/plugins/table_vis/public/table_vis_controller.js +++ b/src/plugins/table_vis/public/table_vis_controller.js @@ -1,20 +1,20 @@ define(function (require) { // get the kibana/table_vis module, and make sure that it requires the "kibana" module if it // didn't already - var module = require('ui/modules').get('kibana/table_vis', ['kibana']); + const module = require('ui/modules').get('kibana/table_vis', ['kibana']); // add a controller to tha module, which will transform the esResponse into a // tabular format that we can pass to the table directive module.controller('KbnTableVisController', function ($scope, Private) { - var tabifyAggResponse = Private(require('ui/agg_response/tabify/tabify')); + const tabifyAggResponse = Private(require('ui/agg_response/tabify/tabify')); $scope.$watch('esResponse', function (resp, oldResp) { - var tableGroups = $scope.tableGroups = null; - var hasSomeRows = $scope.hasSomeRows = null; + let tableGroups = $scope.tableGroups = null; + let hasSomeRows = $scope.hasSomeRows = null; if (resp) { - var vis = $scope.vis; - var params = vis.params; + const vis = $scope.vis; + const params = vis.params; tableGroups = tabifyAggResponse(vis, resp, { partialRows: params.showPartialRows, diff --git a/src/plugins/table_vis/public/table_vis_params.js b/src/plugins/table_vis/public/table_vis_params.js index 0d8f5f7ae43d9..a984b428b0aa6 100644 --- a/src/plugins/table_vis/public/table_vis_params.js +++ b/src/plugins/table_vis/public/table_vis_params.js @@ -1,5 +1,5 @@ define(function (require) { - var _ = require('lodash'); + const _ = require('lodash'); require('ui/modules').get('kibana/table_vis') .directive('tableVisParams', function () { @@ -13,7 +13,7 @@ define(function (require) { ], function () { if (!$scope.vis) return; - var params = $scope.vis.params; + const params = $scope.vis.params; if (params.showPartialRows || params.showMeticsAtAllLevels) { $scope.metricsAtAllLevels = true; } else {