Merge #235

235: no underscore needed #23 r=rehandalal a=peterbe

friday hack. 

Co-authored-by: Peter Bengtsson <mail@peterbe.com>

Author: bors[bot]

package.json

@@ -21,8 +21,7 @@
     "react-scripts": "1.1.4",
     "redux": "4.0.0",
     "redux-logger": "3.0.6",
-    "redux-thunk": "2.3.0",
-    "underscore": "1.9.1"
+    "redux-thunk": "2.3.0"
   },
   "scripts": {
     "start": "react-app-rewired start",

src/components/data/QueryFilteredRecipes.js

@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import { connect } from 'react-redux';
-import { isEqual } from 'underscore';
+import { isEqual } from 'lodash';
 
 import { fetchFilteredRecipesPage } from 'console/state/recipes/actions';
 

src/components/data/QueryMultipleExtensions.js

@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import { connect } from 'react-redux';
-import { isEqual } from 'underscore';
+import { isEqual } from 'lodash';
 
 import { fetchExtensionsPage as fetchExtensionsPageAction } from 'console/state/extensions/actions';
 

src/components/tables/DataList.js

@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { connect } from 'react-redux';
 import { withRouter } from 'react-router';
-import { isEmpty, mapObject } from 'underscore';
+import { isEmpty } from 'lodash';
 
 import { getCurrentURL as getCurrentURLSelector } from 'console/state/router/selectors';
 
@@ -42,7 +42,10 @@ export default class DataList extends React.PureComponent {
 
   handleChangeSortFilters(pagination, filters, sorter) {
     const { getCurrentURL, history } = this.props;
-    const filterParams = mapObject(filters, values => values && values.join(','));
+    const filterParams = {};
+    Object.entries(filters).forEach(([key, values]) => {
+      filterParams[key] = values && values.join(',');
+    });
 
     let ordering;
     if (!isEmpty(sorter)) {

src/state/auth/actions.js

@@ -1,4 +1,4 @@
-import { omit } from 'underscore';
+import { omit } from 'lodash';
 
 import {
   USER_LOGIN,

yarn.lock

@@ -8445,10 +8445,6 @@ uglifyjs-webpack-plugin@^0.4.6:
     uglify-js "^2.8.29"
     webpack-sources "^1.0.1"
 
-underscore@1.9.1:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961"
-
 underscore@~1.4.4:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.4.4.tgz#61a6a32010622afa07963bf325203cf12239d604"