Lodash replacements: take 2

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

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

frontend/src/Calendar/Header/CalendarHeaderConnector.js

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

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

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

frontend/src/Movie/Details/MovieReleaseDatesConnector.js

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

frontend/src/Movie/Edit/EditMovieModalContentConnector.js

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

frontend/src/Movie/MovieFileStatusConnector.js

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

frontend/src/Utilities/String/parseUrl.js

@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import qs from 'qs';
 
 // See: https://developer.mozilla.org/en-US/docs/Web/API/HTMLHyperlinkElementUtils
@@ -10,18 +9,17 @@ 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 = _.pick(
+  const properties = {
-    anchor,
+    hash: anchor.hash,
-    'hash',
+    host: anchor.host,
-    'host',
+    hostname: anchor.hostname,
-    'hostname',
+    href: anchor.href,
-    'href',
+    origin: anchor.origin,
-    'origin',
+    pathname: anchor.pathname,
-    'pathname',
+    port: anchor.port,
-    'port',
+    protocol: anchor.protocol,
-    'protocol',
+    search: anchor.search
-    'search'
+  };
-  );
 
   properties.isAbsolute = (/^[\w:]*\/\//).test(url);