Revert "Convert some instances (filter, find, pick) to native from lodash"

This reverts commit d8a0aac9c3.

frontend/src/Activity/History/Details/HistoryDetailsConnector.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
@@ -7,10 +8,10 @@ function createMapStateToProps() {
   return createSelector(
     createUISettingsSelector(),
     (uiSettings) => {
-      return {
+      return _.pick(uiSettings, [
-        shortDateFormat: uiSettings.shortDateFormat,
+        'shortDateFormat',
-        timeFormat: uiSettings.timeFormat
+        'timeFormat'
-      };
+      ]);
     }
   );
 }

frontend/src/AddMovie/ImportMovie/Import/ImportMovieConnector.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
@@ -41,7 +42,7 @@ function createMapStateToProps() {
       };
 
       if (items.length) {
-        const rootFolder = items.find({ id: rootFolderId });
+        const rootFolder = _.find(items, { id: rootFolderId });
 
         return {
           ...result,

frontend/src/AddMovie/ImportMovie/Import/ImportMovieRowConnector.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
@@ -11,7 +12,7 @@ function createImportMovieItemSelector() {
     (state, { id }) => id,
     (state) => state.importMovie.items,
     (id, items) => {
-      return items.find({ id }) || {};
+      return _.find(items, { id }) || {};
     }
   );
 }
@@ -22,7 +23,7 @@ function createMapStateToProps() {
     createAllMoviesSelector(),
     (item, movies) => {
       const selectedMovie = item && item.selectedMovie;
-      const isExistingMovie = !!selectedMovie && movies.some({ tmdbId: selectedMovie.tmdbId });
+      const isExistingMovie = !!selectedMovie && _.some(movies, { tmdbId: selectedMovie.tmdbId });
 
       return {
         ...item,

frontend/src/AddMovie/ImportMovie/Import/ImportMovieTable.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import VirtualTable from 'Components/Table/VirtualTable';
@@ -55,7 +56,7 @@ class ImportMovieTable extends Component {
         id
       } = prevItem;
 
-      const item = items.find({ id });
+      const item = _.find(items, { id });
 
       if (!item) {
         onRemoveSelectedStateItem(id);
@@ -66,7 +67,7 @@ class ImportMovieTable extends Component {
       const isSelected = selectedState[id];
 
       const isExistingMovie = !!selectedMovie &&
-        prevProps.allMovies.some({ tmdbId: selectedMovie.tmdbId });
+        _.some(prevProps.allMovies, { tmdbId: selectedMovie.tmdbId });
 
       // Props doesn't have a selected movie or
       // the selected movie is an existing movie.

frontend/src/AddMovie/ImportMovie/Import/SelectMovie/ImportMovieSelectMovieConnector.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
@@ -45,7 +46,7 @@ class ImportMovieSelectMovieConnector extends Component {
 
     this.props.setImportMovieValue({
       id,
-      selectedMovie: items.find({ tmdbId })
+      selectedMovie: _.find(items, { tmdbId })
     });
   }
 

frontend/src/Calendar/Day/CalendarDayConnector.js

@@ -21,7 +21,7 @@ function createCalendarEventsConnector() {
     (state, { date }) => date,
     (state) => state.calendar.items,
     (date, items) => {
-      const filtered = items.filter((item) => {
+      const filtered = _.filter(items, (item) => {
         return (item.inCinemas && moment(date).isSame(moment(item.inCinemas), 'day')) ||
           (item.physicalRelease && moment(date).isSame(moment(item.physicalRelease), 'day')) ||
           (item.digitalRelease && moment(date).isSame(moment(item.digitalRelease), 'day'));

frontend/src/Calendar/Header/CalendarHeaderConnector.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
@@ -13,16 +14,19 @@ function createMapStateToProps() {
     createDimensionsSelector(),
     createUISettingsSelector(),
     (calendar, dimensions, uiSettings) => {
-      return {
+      const result = _.pick(calendar, [
-        isFetching: calendar.isFetching,
+        'isFetching',
-        view: calendar.view,
+        'view',
-        time: calendar.time,
+        'time',
-        start: calendar.start,
+        'start',
-        end: calendar.end,
+        'end'
-        isSmallScreen: dimensions.isSmallScreen,
+      ]);
-        collapseViewButtons: dimensions.isLargeScreen,
+
-        longDateFormat: uiSettings.longDateFormat
+      result.isSmallScreen = dimensions.isSmallScreen;
-      };
+      result.collapseViewButtons = dimensions.isLargeScreen;
+      result.longDateFormat = uiSettings.longDateFormat;
+
+      return result;
     }
   );
 }

frontend/src/Components/ImportListList.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React from 'react';
 import { kinds, sizes } from 'Helpers/Props';
@@ -9,7 +10,7 @@ function ImportListList({ lists, importListList }) {
     <div className={styles.lists}>
       {
         lists.map((t) => {
-          const list = importListList.find({ id: t });
+          const list = _.find(importListList, { id: t });
 
           if (!list) {
             return null;

frontend/src/Components/Table/Cells/RelativeDateCellConnector.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
@@ -7,12 +8,12 @@ function createMapStateToProps() {
   return createSelector(
     createUISettingsSelector(),
     (uiSettings) => {
-      return {
+      return _.pick(uiSettings, [
-        showRelativeDates: uiSettings.showRelativeDates,
+        'showRelativeDates',
-        shortDateFormat: uiSettings.shortDateFormat,
+        'shortDateFormat',
-        longDateFormat: uiSettings.longDateFormat,
+        'longDateFormat',
-        timeFormat: uiSettings.timeFormat
+        'timeFormat'
-      };
+      ]);
     }
   );
 }

frontend/src/Components/TagList.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React from 'react';
 import { kinds } from 'Helpers/Props';
@@ -9,7 +10,7 @@ function TagList({ tags, tagList }) {
     <div className={styles.tags}>
       {
         tags.map((t) => {
-          const tag = tagList.find({ id: t });
+          const tag = _.find(tagList, { id: t });
 
           if (!tag) {
             return null;

frontend/src/Movie/Details/MovieDetails.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { Tab, TabList, TabPanel, Tabs } from 'react-tabs';
@@ -49,7 +50,7 @@ const defaultFontSize = parseInt(fonts.defaultFontSize);
 const lineHeight = parseFloat(fonts.lineHeight);
 
 function getFanartUrl(images) {
-  const fanartImage = images.find({ coverType: 'fanart' });
+  const fanartImage = _.find(images, { coverType: 'fanart' });
   if (fanartImage) {
     // Remove protocol
     return fanartImage.url.replace(/^https?:/, '');

frontend/src/Movie/Details/MovieReleaseDatesConnector.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
@@ -7,12 +8,12 @@ function createMapStateToProps() {
   return createSelector(
     createUISettingsSelector(),
     (uiSettings) => {
-      return {
+      return _.pick(uiSettings, [
-        showRelativeDates: uiSettings.showRelativeDates,
+        'showRelativeDates',
-        shortDateFormat: uiSettings.shortDateFormat,
+        'shortDateFormat',
-        longDateFormat: uiSettings.longDateFormat,
+        'longDateFormat',
-        timeFormat: uiSettings.timeFormat
+        'timeFormat'
-      };
+      ]);
     }
   );
 }

frontend/src/Movie/Details/MovieTagsConnector.js

@@ -11,7 +11,7 @@ function createMapStateToProps() {
     createTagsSelector(),
     (movie, tagList) => {
       const tags = _.reduce(movie.tags, (acc, tag) => {
-        const matchingTag = tagList.find({ id: tag });
+        const matchingTag = _.find(tagList, { id: tag });
 
         if (matchingTag) {
           acc.push(matchingTag.label);

frontend/src/Movie/Edit/EditMovieModalContentConnector.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
@@ -35,13 +36,13 @@ function createMapStateToProps() {
         pendingChanges
       } = moviesState;
 
-      const movieSettings = {
+      const movieSettings = _.pick(movie, [
-        monitored: movie.monitored,
+        'monitored',
-        qualityProfileId: movie.qualityProfileId,
+        'qualityProfileId',
-        minimumAvailability: movie.minimumAvailability,
+        'minimumAvailability',
-        path: movie.path,
+        'path',
-        tags: movie.tags
+        'tags'
-      };
+      ]);
 
       const settings = selectSettings(movieSettings, pendingChanges, saveError);
 

frontend/src/Movie/MovieFileStatusConnector.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
@@ -9,13 +10,16 @@ function createMapStateToProps() {
   return createSelector(
     createMovieSelector(),
     (movie) => {
-      return {
+      const result = _.pick(movie, [
-        inCinemas: movie.inCinemas,
+        'inCinemas',
-        isAvailable: movie.isAvailable,
+        'isAvailable',
-        monitored: movie.monitored,
+        'monitored',
-        grabbed: movie.grabbed,
+        'grabbed'
-        movieFile: movie.movieFile
+      ]);
-      };
+
+      result.movieFile = movie.movieFile;
+
+      return result;
     }
   );
 }

frontend/src/Settings/DownloadClients/DownloadClients/AddDownloadClientModalContentConnector.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
@@ -16,8 +17,8 @@ function createMapStateToProps() {
         schema
       } = downloadClients;
 
-      const usenetDownloadClients = schema.filter({ protocol: 'usenet' });
+      const usenetDownloadClients = _.filter(schema, { protocol: 'usenet' });
-      const torrentDownloadClients = schema.filter({ protocol: 'torrent' });
+      const torrentDownloadClients = _.filter(schema, { protocol: 'torrent' });
 
       return {
         isSchemaFetching,

frontend/src/Settings/ImportLists/ImportExclusions/EditImportExclusionModalContentConnector.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
@@ -26,7 +27,7 @@ function createImportExclusionSelector() {
         items
       } = importExclusions;
 
-      const mapping = id ? items.find({ id }) : newImportExclusion;
+      const mapping = id ? _.find(items, { id }) : newImportExclusion;
       const settings = selectSettings(mapping, pendingChanges, saveError);
 
       return {

frontend/src/Settings/Indexers/Restrictions/EditRestrictionModalContentConnector.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
@@ -26,7 +27,7 @@ function createMapStateToProps() {
         items
       } = restrictions;
 
-      const profile = id ? items.find({ id }) : newRestriction;
+      const profile = id ? _.find(items, { id }) : newRestriction;
       const settings = selectSettings(profile, pendingChanges, saveError);
 
       return {

frontend/src/Settings/Metadata/Metadata/EditMetadataModalContentConnector.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
@@ -19,7 +20,7 @@ function createMapStateToProps() {
         items
       } = metadata;
 
-      const settings = selectSettings(items.find({ id }), pendingChanges, saveError);
+      const settings = selectSettings(_.find(items, { id }), pendingChanges, saveError);
 
       return {
         advancedSettings,

frontend/src/Store/Actions/movieFileActions.js

@@ -68,7 +68,7 @@ export const actionHandlers = handleThunks({
 
     deletePromise.done(() => {
       const movies = getState().movies.items;
-      const moviesWithRemovedFiles = movies.filter({ movieFileId });
+      const moviesWithRemovedFiles = _.filter(movies, { movieFileId });
 
       dispatch(batchActions([
         ...moviesWithRemovedFiles.map((movie) => {
@@ -100,7 +100,7 @@ export const actionHandlers = handleThunks({
     promise.done(() => {
       const movies = getState().movies.items;
       const moviesWithRemovedFiles = movieFileIds.reduce((acc, movieFileId) => {
-        acc.push(...movies.filter({ movieFileId }));
+        acc.push(..._.filter(movies, { movieFileId }));
 
         return acc;
       }, []);

frontend/src/Utilities/String/parseUrl.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import qs from 'qs';
 
 // See: https://developer.mozilla.org/en-US/docs/Web/API/HTMLHyperlinkElementUtils
@@ -9,17 +10,18 @@ export default function parseUrl(url) {
   // The `origin`, `password`, and `username` properties are unavailable in
   // Opera Presto. We synthesize `origin` if it's not present. While `password`
   // and `username` are ignored intentionally.
-  const properties = {
+  const properties = _.pick(
-    hash: anchor.hash,
+    anchor,
-    host: anchor.host,
+    'hash',
-    hostname: anchor.hostname,
+    'host',
-    href: anchor.href,
+    'hostname',
-    origin: anchor.origin,
+    'href',
-    pathname: anchor.pathname,
+    'origin',
-    port: anchor.port,
+    'pathname',
-    protocol: anchor.protocol,
+    'port',
-    search: anchor.search
+    'protocol',
-  };
+    'search'
+  );
 
   properties.isAbsolute = (/^[\w:]*\/\//).test(url);