github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-07-08 05:51:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed: Editing provider/profile settings appearing to affect wrong item

Browse source
This commit is contained in:
ta264 2020-02-03 21:45:48 +00:00 • committed by Qstick
parent 843bc6aabc
commit b592b11b97
16 changed files with 53 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

5
frontend/src/Components/Form/MetadataProfileSelectInputConnector.js
View file

@ -4,12 +4,13 @@ import React, { Component } from 'react';
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import sortByName from 'Utilities/Array/sortByName';
import createSortedSectionSelector from 'Store/Selectors/createSortedSectionSelector';
import { metadataProfileNames } from 'Helpers/Props';
import SelectInput from './SelectInput';
function createMapStateToProps() {
return createSelector(
(state) => state.settings.metadataProfiles,
createSortedSectionSelector('settings.metadataProfiles', sortByName),
(state, { includeNoChange }) => includeNoChange,
(state, { includeMixed }) => includeMixed,
(state, { includeNone }) => includeNone,
@ -18,7 +19,7 @@ function createMapStateToProps() {
const profiles = metadataProfiles.items.filter((item) => item.name !== metadataProfileNames.NONE);
const noneProfile = metadataProfiles.items.find((item) => item.name === metadataProfileNames.NONE);
const values = _.map(profiles.sort(sortByName), (metadataProfile) => {
const values = _.map(profiles, (metadataProfile) => {
return {
key: metadataProfile.id,
value: metadataProfile.name

5
frontend/src/Components/Form/QualityProfileSelectInputConnector.js
View file

@ -4,15 +4,16 @@ import React, { Component } from 'react';
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import sortByName from 'Utilities/Array/sortByName';
import createSortedSectionSelector from 'Store/Selectors/createSortedSectionSelector';
import SelectInput from './SelectInput';
function createMapStateToProps() {
return createSelector(
(state) => state.settings.qualityProfiles,
createSortedSectionSelector('settings.qualityProfiles', sortByName),
(state, { includeNoChange }) => includeNoChange,
(state, { includeMixed }) => includeMixed,
(qualityProfiles, includeNoChange, includeMixed) => {
const values = _.map(qualityProfiles.items.sort(sortByName), (qualityProfile) => {
const values = _.map(qualityProfiles.items, (qualityProfile) => {
return {
key: qualityProfile.id,
value: qualityProfile.name

2
frontend/src/InteractiveImport/Artist/SelectArtistModalContentConnector.js
View file

@ -12,7 +12,7 @@ function createMapStateToProps() {
createAllArtistSelector(),
(items) => {
return {
items: items.sort((a, b) => {
items: [...items].sort((a, b) => {
if (a.sortName < b.sortName) {
return -1;
}

3
frontend/src/Settings/DownloadClients/DownloadClients/DownloadClients.js
View file

@ -1,6 +1,5 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import sortByName from 'Utilities/Array/sortByName';
import { icons } from 'Helpers/Props';
import FieldSet from 'Components/FieldSet';
import Card from 'Components/Card';
@ -66,7 +65,7 @@ class DownloadClients extends Component {
>
<div className={styles.downloadClients}>
{
items.sort(sortByName).map((item) => {
items.map((item) => {
return (
<DownloadClient
key={item.id}

10
frontend/src/Settings/DownloadClients/DownloadClients/DownloadClientsConnector.js
View file

@ -2,17 +2,15 @@ import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import sortByName from 'Utilities/Array/sortByName';
import createSortedSectionSelector from 'Store/Selectors/createSortedSectionSelector';
import { fetchDownloadClients, deleteDownloadClient } from 'Store/Actions/settingsActions';
import DownloadClients from './DownloadClients';
function createMapStateToProps() {
return createSelector(
(state) => state.settings.downloadClients,
(downloadClients) => {
return {
...downloadClients
};
}
createSortedSectionSelector('settings.downloadClients', sortByName),
(downloadClients) => downloadClients
);
}

3
frontend/src/Settings/ImportLists/ImportLists/ImportLists.js
View file

@ -1,6 +1,5 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import sortByName from 'Utilities/Array/sortByName';
import { icons } from 'Helpers/Props';
import FieldSet from 'Components/FieldSet';
import Card from 'Components/Card';
@ -68,7 +67,7 @@ class ImportLists extends Component {
>
<div className={styles.lists}>
{
items.sort(sortByName).map((item) => {
items.map((item) => {
return (
<ImportList
key={item.id}

10
frontend/src/Settings/ImportLists/ImportLists/ImportListsConnector.js
View file

@ -2,18 +2,16 @@ import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import sortByName from 'Utilities/Array/sortByName';
import createSortedSectionSelector from 'Store/Selectors/createSortedSectionSelector';
import { fetchImportLists, deleteImportList } from 'Store/Actions/settingsActions';
import { fetchRootFolders } from 'Store/Actions/rootFolderActions';
import ImportLists from './ImportLists';
function createMapStateToProps() {
return createSelector(
(state) => state.settings.importLists,
(importLists) => {
return {
...importLists
};
}
createSortedSectionSelector('settings.importLists', sortByName),
(importLists) => importLists
);
}

3
frontend/src/Settings/Indexers/Indexers/Indexers.js
View file

@ -1,6 +1,5 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import sortByName from 'Utilities/Array/sortByName';
import { icons } from 'Helpers/Props';
import FieldSet from 'Components/FieldSet';
import Card from 'Components/Card';
@ -66,7 +65,7 @@ class Indexers extends Component {
>
<div className={styles.indexers}>
{
items.sort(sortByName).map((item) => {
items.map((item) => {
return (
<Indexer
key={item.id}

10
frontend/src/Settings/Indexers/Indexers/IndexersConnector.js
View file

@ -2,17 +2,15 @@ import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import sortByName from 'Utilities/Array/sortByName';
import createSortedSectionSelector from 'Store/Selectors/createSortedSectionSelector';
import { fetchIndexers, deleteIndexer } from 'Store/Actions/settingsActions';
import Indexers from './Indexers';
function createMapStateToProps() {
return createSelector(
(state) => state.settings.indexers,
(indexers) => {
return {
...indexers
};
}
createSortedSectionSelector('settings.indexers', sortByName),
(indexers) => indexers
);
}

3
frontend/src/Settings/Metadata/Metadata/Metadatas.js
View file

@ -1,6 +1,5 @@
import PropTypes from 'prop-types';
import React from 'react';
import sortByName from 'Utilities/Array/sortByName';
import FieldSet from 'Components/FieldSet';
import PageSectionContent from 'Components/Page/PageSectionContent';
import Metadata from './Metadata';
@ -20,7 +19,7 @@ function Metadatas(props) {
>
<div className={styles.metadatas}>
{
items.sort(sortByName).map((item) => {
items.map((item) => {
return (
<Metadata
key={item.id}

10
frontend/src/Settings/Metadata/Metadata/MetadatasConnector.js
View file

@ -2,17 +2,15 @@ import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import sortByName from 'Utilities/Array/sortByName';
import createSortedSectionSelector from 'Store/Selectors/createSortedSectionSelector';
import { fetchMetadata } from 'Store/Actions/settingsActions';
import Metadatas from './Metadatas';
function createMapStateToProps() {
return createSelector(
(state) => state.settings.metadata,
(metadata) => {
return {
...metadata
};
}
createSortedSectionSelector('settings.metadata', sortByName),
(metadata) => metadata
);
}

3
frontend/src/Settings/Notifications/Notifications/Notifications.js
View file

@ -1,6 +1,5 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import sortByName from 'Utilities/Array/sortByName';
import { icons } from 'Helpers/Props';
import FieldSet from 'Components/FieldSet';
import Card from 'Components/Card';
@ -66,7 +65,7 @@ class Notifications extends Component {
>
<div className={styles.notifications}>
{
items.sort(sortByName).map((item) => {
items.map((item) => {
return (
<Notification
key={item.id}

10
frontend/src/Settings/Notifications/Notifications/NotificationsConnector.js
View file

@ -2,17 +2,15 @@ import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import sortByName from 'Utilities/Array/sortByName';
import createSortedSectionSelector from 'Store/Selectors/createSortedSectionSelector';
import { fetchNotifications, deleteNotification } from 'Store/Actions/settingsActions';
import Notifications from './Notifications';
function createMapStateToProps() {
return createSelector(
(state) => state.settings.notifications,
(notifications) => {
return {
...notifications
};
}
createSortedSectionSelector('settings.notifications', sortByName),
(notifications) => notifications
);
}

3
frontend/src/Settings/Profiles/Quality/QualityProfiles.js
View file

@ -1,6 +1,5 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import sortByName from 'Utilities/Array/sortByName';
import { icons } from 'Helpers/Props';
import FieldSet from 'Components/FieldSet';
import Card from 'Components/Card';
@ -58,7 +57,7 @@ class QualityProfiles extends Component {
>
<div className={styles.qualityProfiles}>
{
items.sort(sortByName).map((item) => {
items.map((item) => {
return (
<QualityProfile
key={item.id}

10
frontend/src/Settings/Profiles/Quality/QualityProfilesConnector.js
View file

@ -2,17 +2,15 @@ import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import sortByName from 'Utilities/Array/sortByName';
import createSortedSectionSelector from 'Store/Selectors/createSortedSectionSelector';
import { fetchQualityProfiles, deleteQualityProfile, cloneQualityProfile } from 'Store/Actions/settingsActions';
import QualityProfiles from './QualityProfiles';
function createMapStateToProps() {
return createSelector(
(state) => state.settings.qualityProfiles,
(qualityProfiles) => {
return {
...qualityProfiles
};
}
createSortedSectionSelector('settings.qualityProfiles', sortByName),
(qualityProfiles) => qualityProfiles
);
}

16
frontend/src/Store/Selectors/createSortedSectionSelector.js Normal file
View file

@ -0,0 +1,16 @@
import { createSelector } from 'reselect';
import getSectionState from 'Utilities/State/getSectionState';
function createSortedSectionSelector(section, comparer) {
return createSelector(
(state) => state,
(state) => {
const sectionState = getSectionState(state, section, true);
return {
...sectionState,
items: [...sectionState.items].sort(comparer)
};
}
);
}
export default createSortedSectionSelector;