Use arrow syntax instead of bind, infinity instead of number infinity

Fixes #5586
elastic · Dec 9, 2015 · 466c695 · 466c695
1 parent 9abbd28
commit 466c695
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 31 deletions.
diff --git a/src/plugins/kibana/public/dashboard/services/saved_dashboards.js b/src/plugins/kibana/public/dashboard/services/saved_dashboards.js
@@ -51,8 +51,8 @@ define(function (require) {
     this.scanAll = function (queryString, pageSize = 1000) {
       return scanner.scanAndMap(queryString, {
         pageSize,
-        docCount: Number.POSITIVE_INFINITY
-      }, this.mapHits.bind(this));
+        docCount: Infinity
+      }, (hit) => this.mapHits(hit));
     };
 
     this.mapHits = function (hit) {
@@ -63,7 +63,6 @@ define(function (require) {
     };
 
     this.find = function (searchString, size = 100) {
-      var self = this;
       var body;
       if (searchString) {
         body = {
@@ -85,10 +84,10 @@ define(function (require) {
         body: body,
         size: size
       })
-      .then(function (resp) {
+      .then((resp) => {
         return {
           total: resp.hits.total,
-          hits: resp.hits.hits.map(self.mapHits.bind(self))
+          hits: resp.hits.hits.map((hit) => this.mapHits(hit))
         };
       });
     };

diff --git a/src/plugins/kibana/public/discover/saved_searches/saved_searches.js b/src/plugins/kibana/public/discover/saved_searches/saved_searches.js
@@ -39,8 +39,8 @@ define(function (require) {
     this.scanAll = function (queryString, pageSize = 1000) {
       return scanner.scanAndMap(queryString, {
         pageSize,
-        docCount: Number.POSITIVE_INFINITY
-      }, this.mapHits.bind(this));
+        docCount: Infinity
+      }, (hit) => this.mapHits(hit));
     };
 
 
@@ -67,7 +67,6 @@ define(function (require) {
     };
 
     this.find = function (searchString, size = 100) {
-      var self = this;
       var body;
       if (searchString) {
         body = {
@@ -89,10 +88,10 @@ define(function (require) {
         body: body,
         size: size
       })
-      .then(function (resp) {
+      .then((resp) => {
         return {
           total: resp.hits.total,
-          hits: resp.hits.hits.map(self.mapHits.bind(self))
+          hits: resp.hits.hits.map((hit) => this.mapHits(hit))
         };
       });
     };

diff --git a/src/plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js b/src/plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js
@@ -51,8 +51,8 @@ define(function (require) {
     this.scanAll = function (queryString, pageSize = 1000) {
       return scanner.scanAndMap(queryString, {
         pageSize,
-        docCount: Number.POSITIVE_INFINITY
-      }, this.mapHits.bind(this));
+        docCount: Infinity
+      }, (hit) => this.mapHits(hit));
     };
 
     this.mapHits = function (hit) {
@@ -78,7 +78,6 @@ define(function (require) {
     };
 
     this.find = function (searchString, size = 100) {
-      var self = this;
       var body;
       if (searchString) {
         body = {
@@ -100,10 +99,10 @@ define(function (require) {
         body: body,
         size: size
       })
-      .then(function (resp) {
+      .then((resp) => {
         return {
           total: resp.hits.total,
-          hits: resp.hits.hits.map(self.mapHits.bind(self))
+          hits: resp.hits.hits.map((hit) => this.mapHits(hit))
         };
       });
     };

diff --git a/src/ui/public/utils/scanner.js b/src/ui/public/utils/scanner.js
@@ -1,6 +1,6 @@
-var _ = require('lodash');
+const _ = require('lodash');
 
-var Scanner = function (client, {index, type}) {
+let Scanner = function (client, {index, type}) {
   if (!index) throw new Error('Expected index');
   if (!type) throw new Error('Expected type');
   if (!client) throw new Error('Expected client');
@@ -16,12 +16,12 @@ Scanner.prototype.scanAndMap = function (searchString, options, mapFn) {
     docCount: 1000
   }, options);
 
-  var allResults = {
+  let allResults = {
     hits: [],
     total: 0
   };
 
-  var body;
+  let body;
   if (searchString) {
     body = {
       query: {
@@ -37,32 +37,34 @@ Scanner.prototype.scanAndMap = function (searchString, options, mapFn) {
   }
 
   return new Promise((resolve, reject) => {
-    this.client.search({
-      index: this.index,
-      type: this.type,
-      size: opts.pageSize,
-      body,
-      searchType: 'scan',
-      scroll: '1m'
-    }, function getMoreUntilDone(error, response) {
-      var scanAllResults = opts.docCount === Number.POSITIVE_INFINITY;
+    const getMoreUntilDone = (error, response) => {
+      const scanAllResults = opts.docCount === Infinity;
       allResults.total = scanAllResults ? response.hits.total : Math.min(response.hits.total, opts.docCount);
 
-      var hits = response.hits.hits
+      let hits = response.hits.hits
       .slice(0, allResults.total - allResults.hits.length);
       if (mapFn) hits = hits.map(mapFn);
 
       allResults.hits =  allResults.hits.concat(hits);
 
-      var collectedAllResults = allResults.total === allResults.hits.length;
+      const collectedAllResults = allResults.total === allResults.hits.length;
       if (collectedAllResults) {
         resolve(allResults);
       } else {
         this.client.scroll({
           scrollId: response._scroll_id,
         }, getMoreUntilDone);
       }
-    });
+    };
+
+    this.client.search({
+      index: this.index,
+      type: this.type,
+      size: opts.pageSize,
+      body,
+      searchType: 'scan',
+      scroll: '1m'
+    }, getMoreUntilDone);
   });
 };