Mirrors/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr.git synced 2024-08-18 00:09:37 +02:00
Code Issues Releases Wiki Activity

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

Browse Source 
This reverts commit d8a0aac9c3.
This commit is contained in:
ta264 2020-09-28 06:26:23 +01:00
parent 9075fdc1c1
commit 081fe64bff
21 changed files with 94 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/src/Activity/History/Details/HistoryDetailsConnector.js
View File

@ -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 {
shortDateFormat: uiSettings.shortDateFormat,
timeFormat: uiSettings.timeFormat
};
return _.pick(uiSettings, [
'shortDateFormat',
'timeFormat'
]);
}
);
}

3
frontend/src/AddMovie/ImportMovie/Import/ImportMovieConnector.js
View File

@ -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,

5
frontend/src/AddMovie/ImportMovie/Import/ImportMovieRowConnector.js
View File

@ -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,

5
frontend/src/AddMovie/ImportMovie/Import/ImportMovieTable.js
View File

@ -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.

3
frontend/src/AddMovie/ImportMovie/Import/SelectMovie/ImportMovieSelectMovieConnector.js
View File

@ -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 })
});
}

2
frontend/src/Calendar/Day/CalendarDayConnector.js
View File

@ -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'));

24
frontend/src/Calendar/Header/CalendarHeaderConnector.js
View File

@ -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 {
isFetching: calendar.isFetching,
view: calendar.view,
time: calendar.time,
start: calendar.start,
end: calendar.end,
isSmallScreen: dimensions.isSmallScreen,
collapseViewButtons: dimensions.isLargeScreen,
longDateFormat: uiSettings.longDateFormat
};
const result = _.pick(calendar, [
'isFetching',
'view',
'time',
'start',
'end'
]);
result.isSmallScreen = dimensions.isSmallScreen;
result.collapseViewButtons = dimensions.isLargeScreen;
result.longDateFormat = uiSettings.longDateFormat;
return result;
}
);
}

3
frontend/src/Components/ImportListList.js
View File

@ -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;

13
frontend/src/Components/Table/Cells/RelativeDateCellConnector.js
View File

@ -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 {
showRelativeDates: uiSettings.showRelativeDates,
shortDateFormat: uiSettings.shortDateFormat,
longDateFormat: uiSettings.longDateFormat,
timeFormat: uiSettings.timeFormat
};
return _.pick(uiSettings, [
'showRelativeDates',
'shortDateFormat',
'longDateFormat',
'timeFormat'
]);
}
);
}

3
frontend/src/Components/TagList.js
View File

@ -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;

3
frontend/src/Movie/Details/MovieDetails.js
View File

@ -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?:/, '');

13
frontend/src/Movie/Details/MovieReleaseDatesConnector.js
View File

@ -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 {
showRelativeDates: uiSettings.showRelativeDates,
shortDateFormat: uiSettings.shortDateFormat,
longDateFormat: uiSettings.longDateFormat,
timeFormat: uiSettings.timeFormat
};
return _.pick(uiSettings, [
'showRelativeDates',
'shortDateFormat',
'longDateFormat',
'timeFormat'
]);
}
);
}

2
frontend/src/Movie/Details/MovieTagsConnector.js
View File

@ -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);

15
frontend/src/Movie/Edit/EditMovieModalContentConnector.js
View File

@ -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 = {
monitored: movie.monitored,
qualityProfileId: movie.qualityProfileId,
minimumAvailability: movie.minimumAvailability,
path: movie.path,
tags: movie.tags
};
const movieSettings = _.pick(movie, [
'monitored',
'qualityProfileId',
'minimumAvailability',
'path',
'tags'
]);
const settings = selectSettings(movieSettings, pendingChanges, saveError);

18
frontend/src/Movie/MovieFileStatusConnector.js
View File

@ -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 {
inCinemas: movie.inCinemas,
isAvailable: movie.isAvailable,
monitored: movie.monitored,
grabbed: movie.grabbed,
movieFile: movie.movieFile
};
const result = _.pick(movie, [
'inCinemas',
'isAvailable',
'monitored',
'grabbed'
]);
result.movieFile = movie.movieFile;
return result;
}
);
}

5
frontend/src/Settings/DownloadClients/DownloadClients/AddDownloadClientModalContentConnector.js
View File

@ -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 torrentDownloadClients = schema.filter({ protocol: 'torrent' });
const usenetDownloadClients = _.filter(schema, { protocol: 'usenet' });
const torrentDownloadClients = _.filter(schema, { protocol: 'torrent' });
return {
isSchemaFetching,

3
frontend/src/Settings/ImportLists/ImportExclusions/EditImportExclusionModalContentConnector.js
View File

@ -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 {

3
frontend/src/Settings/Indexers/Restrictions/EditRestrictionModalContentConnector.js
View File

@ -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 {

3
frontend/src/Settings/Metadata/Metadata/EditMetadataModalContentConnector.js
View File

@ -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,

4
frontend/src/Store/Actions/movieFileActions.js
View File

@ -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;
}, []);

24
frontend/src/Utilities/String/parseUrl.js
View File

@ -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 = {
hash: anchor.hash,
host: anchor.host,
hostname: anchor.hostname,
href: anchor.href,
origin: anchor.origin,
pathname: anchor.pathname,
port: anchor.port,
protocol: anchor.protocol,
search: anchor.search
};
const properties = _.pick(
anchor,
'hash',
'host',
'hostname',
'href',
'origin',
'pathname',
'port',
'protocol',
'search'
);
properties.isAbsolute = (/^[\w:]*\/\//).test(url);