remove explicit _ and $ dependecies (#1487)

5 files changed, 14 insertions, 15 deletions

diff --git a/server/sonar-web/src/main/js/components/navigator/controller.js b/server/sonar-web/src/main/js/components/navigator/controller.js
index eb40fb3e113..a55012959c7 100644
--- a/server/sonar-web/src/main/js/components/navigator/controller.js
+++ b/server/sonar-web/src/main/js/components/navigator/controller.js
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-import _ from 'underscore';
+import uniq from 'lodash/uniq';
 import Marionette from 'backbone.marionette';
 
 export default Marionette.Controller.extend({
@@ -43,7 +43,7 @@ export default Marionette.Controller.extend({
       return that.options.app.state.get('transform')[facet] != null ?
           that.options.app.state.get('transform')[facet] : facet;
     });
-    facets = _.uniq(facets);
+    facets = uniq(facets);
     return facets.filter(facet => that.options.app.state.get('allFacets').indexOf(facet) !== -1);
   },
 
@@ -113,8 +113,8 @@ export default Marionette.Controller.extend({
     separator = separator || '|';
     const filter = this.options.app.state.get('query');
     const route = [];
-    _.map(filter, (value, property) => {
-      route.push(`${property}=${encodeURIComponent(value)}`);
+    Object.keys(filter).forEach(property => {
+      route.push(`${property}=${encodeURIComponent(filter[property])}`);
     });
     return route.join(separator);
   },
diff --git a/server/sonar-web/src/main/js/components/navigator/facets/base-facet.js b/server/sonar-web/src/main/js/components/navigator/facets/base-facet.js
index 03808a96619..54af0988567 100644
--- a/server/sonar-web/src/main/js/components/navigator/facets/base-facet.js
+++ b/server/sonar-web/src/main/js/components/navigator/facets/base-facet.js
@@ -18,7 +18,6 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import $ from 'jquery';
-import _ from 'underscore';
 import Marionette from 'backbone.marionette';
 
 export default Marionette.ItemView.extend({
@@ -112,9 +111,10 @@ export default Marionette.ItemView.extend({
   },
 
   serializeData () {
-    return _.extend(Marionette.ItemView.prototype.serializeData.apply(this, arguments), {
+    return {
+      ...Marionette.ItemView.prototype.serializeData.apply(this, arguments),
       values: this.sortValues(this.model.getValues())
-    });
+    };
   }
 });
 
diff --git a/server/sonar-web/src/main/js/components/navigator/models/state.js b/server/sonar-web/src/main/js/components/navigator/models/state.js
index ae50145697d..71770750dc1 100644
--- a/server/sonar-web/src/main/js/components/navigator/models/state.js
+++ b/server/sonar-web/src/main/js/components/navigator/models/state.js
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-import _ from 'underscore';
 import Backbone from 'backbone';
 
 export default Backbone.Model.extend({
@@ -55,8 +54,8 @@ export default Backbone.Model.extend({
 
   updateFilter (obj, options) {
     const oldQuery = this.get('query');
-    let query = _.extend({}, oldQuery, obj);
-    const opts = _.defaults(options || {}, { force: false });
+    let query = { ...oldQuery, ...obj };
+    const opts = { force: false, ...options };
     query = this.clearQuery(query);
     if (opts.force || !this._areQueriesEqual(oldQuery, query)) {
       this.setQuery(query);
diff --git a/server/sonar-web/src/main/js/components/navigator/workspace-header-view.js b/server/sonar-web/src/main/js/components/navigator/workspace-header-view.js
index f1de179458a..c29c1d8b31b 100644
--- a/server/sonar-web/src/main/js/components/navigator/workspace-header-view.js
+++ b/server/sonar-web/src/main/js/components/navigator/workspace-header-view.js
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-import _ from 'underscore';
 import Marionette from 'backbone.marionette';
 
 export default Marionette.ItemView.extend({
@@ -90,9 +89,10 @@ export default Marionette.ItemView.extend({
   },
 
   serializeData () {
-    return _.extend(Marionette.ItemView.prototype.serializeData.apply(this, arguments), {
+    return {
+      ...Marionette.ItemView.prototype.serializeData.apply(this, arguments),
       state: this.options.app.state.toJSON()
-    });
+    };
   }
 });
 
diff --git a/server/sonar-web/src/main/js/components/navigator/workspace-list-view.js b/server/sonar-web/src/main/js/components/navigator/workspace-list-view.js
index 4b084890ada..b9acea73ec4 100644
--- a/server/sonar-web/src/main/js/components/navigator/workspace-list-view.js
+++ b/server/sonar-web/src/main/js/components/navigator/workspace-list-view.js
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import $ from 'jquery';
-import _ from 'underscore';
+import throttle from 'lodash/throttle';
 import Marionette from 'backbone.marionette';
 
 const BOTTOM_OFFSET = 60;
@@ -41,7 +41,7 @@ export default Marionette.CompositeView.extend({
   },
 
   initialize (options) {
-    this.loadMoreThrottled = _.throttle(this.loadMore, 1000, { trailing: false });
+    this.loadMoreThrottled = throttle(this.loadMore, 1000, { trailing: false });
     this.listenTo(options.app.state, 'change:maxResultsReached', this.toggleLoadMore);
     this.listenTo(options.app.state, 'change:selectedIndex', this.scrollTo);
     this.bindShortcuts();