From acee2915aa61b5e2e948b7e732296c2e363d8437 Mon Sep 17 00:00:00 2001
From: Mark McDowall <mark@mcdowall.ca>
Date: Tue, 7 Jan 2020 17:36:57 -0800
Subject: [PATCH] New: Limit recent folders in Manual import to 10 and
 descending order

---
 .../InteractiveImportSelectFolderModalContent.js     |  2 +-
 .../src/Store/Actions/interactiveImportActions.js    | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/frontend/src/InteractiveImport/Folder/InteractiveImportSelectFolderModalContent.js b/frontend/src/InteractiveImport/Folder/InteractiveImportSelectFolderModalContent.js
index 711bf6df05..882af76105 100644
--- a/frontend/src/InteractiveImport/Folder/InteractiveImportSelectFolderModalContent.js
+++ b/frontend/src/InteractiveImport/Folder/InteractiveImportSelectFolderModalContent.js
@@ -93,7 +93,7 @@ class InteractiveImportSelectFolderModalContent extends Component {
                 >
                   <TableBody>
                     {
-                      recentFolders.map((recentFolder) => {
+                      recentFolders.slice(0).reverse().map((recentFolder) => {
                         return (
                           <RecentFolderRow
                             key={recentFolder.folder}
diff --git a/frontend/src/Store/Actions/interactiveImportActions.js b/frontend/src/Store/Actions/interactiveImportActions.js
index 2585e5231f..5c91dda474 100644
--- a/frontend/src/Store/Actions/interactiveImportActions.js
+++ b/frontend/src/Store/Actions/interactiveImportActions.js
@@ -19,6 +19,8 @@ export const section = 'interactiveImport';
 const albumsSection = `${section}.albums`;
 const trackFilesSection = `${section}.trackFiles`;
 
+const MAXIMUM_RECENT_FOLDERS = 10;
+
 //
 // State
 
@@ -203,12 +205,14 @@ export const reducers = createHandleActions({
     const index = recentFolders.findIndex((r) => r.folder === folder);
 
     if (index > -1) {
-      recentFolders.splice(index, 1, recentFolder);
-    } else {
-      recentFolders.push(recentFolder);
+      recentFolders.splice(index, 1);
     }
 
-    return Object.assign({}, state, { recentFolders });
+    recentFolders.push(recentFolder);
+
+    const sliceIndex = Math.max(recentFolders.length - MAXIMUM_RECENT_FOLDERS, 0);
+
+    return Object.assign({}, state, { recentFolders: recentFolders.slice(sliceIndex) });
   },
 
   [REMOVE_RECENT_FOLDER]: function(state, { payload }) {