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

frontend/src/Components/Form/MetadataProfileSelectInputConnector.js

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

frontend/src/Components/Form/QualityProfileSelectInputConnector.js

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

frontend/src/InteractiveImport/Artist/SelectArtistModalContentConnector.js

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

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

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

frontend/src/Settings/DownloadClients/DownloadClients/DownloadClientsConnector.js

@@ -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,
+    createSortedSectionSelector('settings.downloadClients', sortByName),
-    (downloadClients) => {
+    (downloadClients) => downloadClients
-      return {
-        ...downloadClients
-      };
-    }
   );
 }
 

frontend/src/Settings/ImportLists/ImportLists/ImportLists.js

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

frontend/src/Settings/ImportLists/ImportLists/ImportListsConnector.js

@@ -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,
+    createSortedSectionSelector('settings.importLists', sortByName),
-    (importLists) => {
+    (importLists) => importLists
-      return {
-        ...importLists
-      };
-    }
   );
 }
 

frontend/src/Settings/Indexers/Indexers/Indexers.js

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

frontend/src/Settings/Indexers/Indexers/IndexersConnector.js

@@ -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,
+    createSortedSectionSelector('settings.indexers', sortByName),
-    (indexers) => {
+    (indexers) => indexers
-      return {
-        ...indexers
-      };
-    }
   );
 }
 

frontend/src/Settings/Metadata/Metadata/Metadatas.js

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

frontend/src/Settings/Metadata/Metadata/MetadatasConnector.js

@@ -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,
+    createSortedSectionSelector('settings.metadata', sortByName),
-    (metadata) => {
+    (metadata) => metadata
-      return {
-        ...metadata
-      };
-    }
   );
 }
 

frontend/src/Settings/Notifications/Notifications/Notifications.js

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

frontend/src/Settings/Notifications/Notifications/NotificationsConnector.js

@@ -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,
+    createSortedSectionSelector('settings.notifications', sortByName),
-    (notifications) => {
+    (notifications) => notifications
-      return {
-        ...notifications
-      };
-    }
   );
 }
 

frontend/src/Settings/Profiles/Quality/QualityProfiles.js

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

frontend/src/Settings/Profiles/Quality/QualityProfilesConnector.js

@@ -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,
+    createSortedSectionSelector('settings.qualityProfiles', sortByName),
-    (qualityProfiles) => {
+    (qualityProfiles) => qualityProfiles
-      return {
-        ...qualityProfiles
-      };
-    }
   );
 }
 

frontend/src/Store/Selectors/createSortedSectionSelector.js

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