New: Favorite folders in Manual Import

(cherry picked from commit 3ddc6ac6de5c27a9aab915672321c8818dc5da48)

Closes #10630

frontend/src/App/State/InteractiveImportAppState.ts

@@ -1,11 +1,20 @@
 import AppSectionState from 'App/State/AppSectionState';
-import RecentFolder from 'InteractiveImport/Folder/RecentFolder';
 import ImportMode from 'InteractiveImport/ImportMode';
 import InteractiveImport from 'InteractiveImport/InteractiveImport';
 
+interface FavoriteFolder {
+  folder: string;
+}
+
+interface RecentFolder {
+  folder: string;
+  lastUsed: string;
+}
+
 interface InteractiveImportAppState extends AppSectionState<InteractiveImport> {
   originalItems: InteractiveImport[];
   importMode: ImportMode;
+  favoriteFolders: FavoriteFolder[];
   recentFolders: RecentFolder[];
 }
 

frontend/src/Helpers/Props/icons.ts

@@ -15,6 +15,7 @@ import {
   faFileVideo as farFileVideo,
   faFolder as farFolder,
   faHdd as farHdd,
+  faHeart as farHeart,
   faKeyboard as farKeyboard,
   faObjectGroup as farObjectGroup,
   faObjectUngroup as farObjectUngroup,
@@ -174,6 +175,7 @@ export const GENRE = fasTheaterMasks;
 export const GROUP = farObjectGroup;
 export const HEALTH = fasMedkit;
 export const HEART = fasHeart;
+export const HEART_OUTLINE = farHeart;
 export const HISTORY = fasHistory;
 export const HOUSEKEEPING = fasHome;
 export const IGNORE = fasTimesCircle;

frontend/src/InteractiveImport/Folder/FavoriteFolderRow.css

@@ -0,0 +1,5 @@
+.actions {
+  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+
+  width: 70px;
+}

frontend/src/InteractiveImport/Folder/FavoriteFolderRow.css.d.ts

@@ -0,0 +1,7 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  'actions': string;
+}
+export const cssExports: CssExports;
+export default cssExports;

frontend/src/InteractiveImport/Folder/FavoriteFolderRow.tsx

@@ -0,0 +1,48 @@
+import React, { SyntheticEvent, useCallback } from 'react';
+import { useDispatch } from 'react-redux';
+import IconButton from 'Components/Link/IconButton';
+import TableRowCell from 'Components/Table/Cells/TableRowCell';
+import TableRowButton from 'Components/Table/TableRowButton';
+import { icons } from 'Helpers/Props';
+import { removeFavoriteFolder } from 'Store/Actions/interactiveImportActions';
+import translate from 'Utilities/String/translate';
+import styles from './FavoriteFolderRow.css';
+
+interface FavoriteFolderRowProps {
+  folder: string;
+  onPress: (folder: string) => unknown;
+}
+
+function FavoriteFolderRow({ folder, onPress }: FavoriteFolderRowProps) {
+  const dispatch = useDispatch();
+
+  const handlePress = useCallback(() => {
+    onPress(folder);
+  }, [folder, onPress]);
+
+  const handleRemoveFavoritePress = useCallback(
+    (e: SyntheticEvent) => {
+      e.stopPropagation();
+
+      dispatch(removeFavoriteFolder({ folder }));
+    },
+    [folder, dispatch]
+  );
+
+  return (
+    <TableRowButton onPress={handlePress}>
+      <TableRowCell>{folder}</TableRowCell>
+
+      <TableRowCell className={styles.actions}>
+        <IconButton
+          title={translate('FavoriteFolderRemove')}
+          kind="danger"
+          name={icons.HEART}
+          onPress={handleRemoveFavoritePress}
+        />
+      </TableRowCell>
+    </TableRowButton>
+  );
+}
+
+export default FavoriteFolderRow;

frontend/src/InteractiveImport/Folder/InteractiveImportSelectFolderModalContent.css

@@ -1,7 +1,12 @@
-.recentFoldersContainer {
+.foldersContainer {
   margin-top: 15px;
 }
 
+.foldersTitle {
+  border-bottom: 1px solid var(--borderColor);
+  font-size: 21px;
+}
+
 .buttonsContainer {
   margin-top: 30px;
 }

frontend/src/InteractiveImport/Folder/InteractiveImportSelectFolderModalContent.css.d.ts

@@ -5,7 +5,8 @@ interface CssExports {
   'buttonContainer': string;
   'buttonIcon': string;
   'buttonsContainer': string;
-  'recentFoldersContainer': string;
+  'foldersContainer': string;
+  'foldersTitle': string;
 }
 export const cssExports: CssExports;
 export default cssExports;

frontend/src/InteractiveImport/Folder/InteractiveImportSelectFolderModalContent.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useState } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { createSelector } from 'reselect';
 import AppState from 'App/State/AppState';
@@ -14,14 +14,23 @@ import Table from 'Components/Table/Table';
 import TableBody from 'Components/Table/TableBody';
 import { icons, kinds, sizes } from 'Helpers/Props';
 import { executeCommand } from 'Store/Actions/commandActions';
-import {
+import { addRecentFolder } from 'Store/Actions/interactiveImportActions';
-  addRecentFolder,
-  removeRecentFolder,
-} from 'Store/Actions/interactiveImportActions';
 import translate from 'Utilities/String/translate';
+import FavoriteFolderRow from './FavoriteFolderRow';
 import RecentFolderRow from './RecentFolderRow';
 import styles from './InteractiveImportSelectFolderModalContent.css';
 
+const favoriteFoldersColumns = [
+  {
+    name: 'folder',
+    label: () => translate('Folder'),
+  },
+  {
+    name: 'actions',
+    label: '',
+  },
+];
+
 const recentFoldersColumns = [
   {
     name: 'folder',
@@ -49,15 +58,22 @@ function InteractiveImportSelectFolderModalContent(
   const { modalTitle, onFolderSelect, onModalClose } = props;
   const [folder, setFolder] = useState('');
   const dispatch = useDispatch();
-  const recentFolders = useSelector(
+  const { favoriteFolders, recentFolders } = useSelector(
     createSelector(
-      (state: AppState) => state.interactiveImport.recentFolders,
+      (state: AppState) => state.interactiveImport,
-      (recentFolders) => {
+      (interactiveImport) => {
-        return recentFolders;
+        return {
+          favoriteFolders: interactiveImport.favoriteFolders,
+          recentFolders: interactiveImport.recentFolders,
+        };
       }
     )
   );
 
+  const favoriteFolderMap = useMemo(() => {
+    return new Map(favoriteFolders.map((f) => [f.folder, f]));
+  }, [favoriteFolders]);
+
   const onPathChange = useCallback(
     ({ value }: { value: string }) => {
       setFolder(value);
@@ -90,13 +106,6 @@ function InteractiveImportSelectFolderModalContent(
     onFolderSelect(folder);
   }, [folder, onFolderSelect, dispatch]);
 
-  const onRemoveRecentFolderPress = useCallback(
-    (folderToRemove: string) => {
-      dispatch(removeRecentFolder({ folder: folderToRemove }));
-    },
-    [dispatch]
-  );
-
   return (
     <ModalContent onModalClose={onModalClose}>
       <ModalHeader>
@@ -110,8 +119,34 @@ function InteractiveImportSelectFolderModalContent(
           onChange={onPathChange}
         />
 
+        {favoriteFolders.length ? (
+          <div className={styles.foldersContainer}>
+            <div className={styles.foldersTitle}>
+              {translate('FavoriteFolders')}
+            </div>
+
+            <Table columns={favoriteFoldersColumns}>
+              <TableBody>
+                {favoriteFolders.map((favoriteFolder) => {
+                  return (
+                    <FavoriteFolderRow
+                      key={favoriteFolder.folder}
+                      folder={favoriteFolder.folder}
+                      onPress={onRecentPathPress}
+                    />
+                  );
+                })}
+              </TableBody>
+            </Table>
+          </div>
+        ) : null}
+
         {recentFolders.length ? (
-          <div className={styles.recentFoldersContainer}>
+          <div className={styles.foldersContainer}>
+            <div className={styles.foldersTitle}>
+              {translate('RecentFolders')}
+            </div>
+
             <Table columns={recentFoldersColumns}>
               <TableBody>
                 {recentFolders
@@ -123,8 +158,8 @@ function InteractiveImportSelectFolderModalContent(
                         key={recentFolder.folder}
                         folder={recentFolder.folder}
                         lastUsed={recentFolder.lastUsed}
+                        isFavorite={favoriteFolderMap.has(recentFolder.folder)}
                         onPress={onRecentPathPress}
-                        onRemoveRecentFolderPress={onRemoveRecentFolderPress}
                       />
                     );
                   })}

frontend/src/InteractiveImport/Folder/RecentFolder.ts

@@ -1,6 +0,0 @@
-interface RecentFolder {
-  folder: string;
-  lastUsed: string;
-}
-
-export default RecentFolder;

frontend/src/InteractiveImport/Folder/RecentFolderRow.css

@@ -1,5 +1,5 @@
 .actions {
   composes: cell from '~Components/Table/Cells/TableRowCell.css';
 
-  width: 40px;
+  width: 70px;
 }

frontend/src/InteractiveImport/Folder/RecentFolderRow.js

@@ -1,65 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import IconButton from 'Components/Link/IconButton';
-import RelativeDateCell from 'Components/Table/Cells/RelativeDateCell';
-import TableRowCell from 'Components/Table/Cells/TableRowCell';
-import TableRowButton from 'Components/Table/TableRowButton';
-import { icons } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
-import styles from './RecentFolderRow.css';
-
-class RecentFolderRow extends Component {
-
-  //
-  // Listeners
-
-  onPress = () => {
-    this.props.onPress(this.props.folder);
-  };
-
-  onRemovePress = (event) => {
-    event.stopPropagation();
-
-    const {
-      folder,
-      onRemoveRecentFolderPress
-    } = this.props;
-
-    onRemoveRecentFolderPress(folder);
-  };
-
-  //
-  // Render
-
-  render() {
-    const {
-      folder,
-      lastUsed
-    } = this.props;
-
-    return (
-      <TableRowButton onPress={this.onPress}>
-        <TableRowCell>{folder}</TableRowCell>
-
-        <RelativeDateCell date={lastUsed} />
-
-        <TableRowCell className={styles.actions}>
-          <IconButton
-            title={translate('Remove')}
-            name={icons.REMOVE}
-            onPress={this.onRemovePress}
-          />
-        </TableRowCell>
-      </TableRowButton>
-    );
-  }
-}
-
-RecentFolderRow.propTypes = {
-  folder: PropTypes.string.isRequired,
-  lastUsed: PropTypes.string.isRequired,
-  onPress: PropTypes.func.isRequired,
-  onRemoveRecentFolderPress: PropTypes.func.isRequired
-};
-
-export default RecentFolderRow;

frontend/src/InteractiveImport/Folder/RecentFolderRow.tsx

@@ -0,0 +1,85 @@
+import React, { SyntheticEvent, useCallback } from 'react';
+import { useDispatch } from 'react-redux';
+import IconButton from 'Components/Link/IconButton';
+import RelativeDateCell from 'Components/Table/Cells/RelativeDateCell';
+import TableRowCell from 'Components/Table/Cells/TableRowCell';
+import TableRowButton from 'Components/Table/TableRowButton';
+import { icons } from 'Helpers/Props';
+import {
+  addFavoriteFolder,
+  removeFavoriteFolder,
+  removeRecentFolder,
+} from 'Store/Actions/interactiveImportActions';
+import translate from 'Utilities/String/translate';
+import styles from './RecentFolderRow.css';
+
+interface RecentFolderRowProps {
+  folder: string;
+  lastUsed: string;
+  isFavorite: boolean;
+  onPress: (folder: string) => unknown;
+}
+
+function RecentFolderRow({
+  folder,
+  lastUsed,
+  isFavorite,
+  onPress,
+}: RecentFolderRowProps) {
+  const dispatch = useDispatch();
+
+  const handlePress = useCallback(() => {
+    onPress(folder);
+  }, [folder, onPress]);
+
+  const handleFavoritePress = useCallback(
+    (e: SyntheticEvent) => {
+      e.stopPropagation();
+
+      if (isFavorite) {
+        dispatch(removeFavoriteFolder({ folder }));
+      } else {
+        dispatch(addFavoriteFolder({ folder }));
+      }
+    },
+    [folder, isFavorite, dispatch]
+  );
+
+  const handleRemovePress = useCallback(
+    (e: SyntheticEvent) => {
+      e.stopPropagation();
+
+      dispatch(removeRecentFolder({ folder }));
+    },
+    [folder, dispatch]
+  );
+
+  return (
+    <TableRowButton onPress={handlePress}>
+      <TableRowCell>{folder}</TableRowCell>
+
+      <RelativeDateCell date={lastUsed} />
+
+      <TableRowCell className={styles.actions}>
+        <IconButton
+          title={
+            isFavorite
+              ? translate('FavoriteFolderRemove')
+              : translate('FavoriteFolderAdd')
+          }
+          kind={isFavorite ? 'danger' : 'default'}
+          name={isFavorite ? icons.HEART : icons.HEART_OUTLINE}
+          onPress={handleFavoritePress}
+        />
+
+        <IconButton
+          title={translate('Remove')}
+          name={icons.REMOVE}
+          onPress={handleRemovePress}
+        />
+      </TableRowCell>
+    </TableRowButton>
+  );
+}
+
+export default RecentFolderRow;

frontend/src/Store/Actions/interactiveImportActions.js

@@ -3,6 +3,7 @@ import { createAction } from 'redux-actions';
 import { batchActions } from 'redux-batched-actions';
 import { sortDirections } from 'Helpers/Props';
 import { createThunk, handleThunks } from 'Store/thunks';
+import sortByProp from 'Utilities/Array/sortByProp';
 import createAjaxRequest from 'Utilities/createAjaxRequest';
 import naturalExpansion from 'Utilities/String/naturalExpansion';
 import { set, update, updateItem } from './baseActions';
@@ -30,6 +31,7 @@ export const defaultState = {
   items: [],
   sortKey: 'relativePath',
   sortDirection: sortDirections.ASCENDING,
+  favoriteFolders: [],
   recentFolders: [],
   importMode: 'chooseImportMode',
   sortPredicates: {
@@ -58,6 +60,7 @@ export const defaultState = {
 export const persistState = [
   'interactiveImport.sortKey',
   'interactiveImport.sortDirection',
+  'interactiveImport.favoriteFolders',
   'interactiveImport.recentFolders',
   'interactiveImport.importMode'
 ];
@@ -73,6 +76,8 @@ export const UPDATE_INTERACTIVE_IMPORT_ITEMS = 'interactiveImport/updateInteract
 export const CLEAR_INTERACTIVE_IMPORT = 'interactiveImport/clearInteractiveImport';
 export const ADD_RECENT_FOLDER = 'interactiveImport/addRecentFolder';
 export const REMOVE_RECENT_FOLDER = 'interactiveImport/removeRecentFolder';
+export const ADD_FAVORITE_FOLDER = 'interactiveImport/addFavoriteFolder';
+export const REMOVE_FAVORITE_FOLDER = 'interactiveImport/removeFavoriteFolder';
 export const SET_INTERACTIVE_IMPORT_MODE = 'interactiveImport/setInteractiveImportMode';
 
 //
@@ -86,6 +91,8 @@ export const updateInteractiveImportItems = createAction(UPDATE_INTERACTIVE_IMPO
 export const clearInteractiveImport = createAction(CLEAR_INTERACTIVE_IMPORT);
 export const addRecentFolder = createAction(ADD_RECENT_FOLDER);
 export const removeRecentFolder = createAction(REMOVE_RECENT_FOLDER);
+export const addFavoriteFolder = createAction(ADD_FAVORITE_FOLDER);
+export const removeFavoriteFolder = createAction(REMOVE_FAVORITE_FOLDER);
 export const setInteractiveImportMode = createAction(SET_INTERACTIVE_IMPORT_MODE);
 
 //
@@ -264,9 +271,31 @@ export const reducers = createHandleActions({
     return Object.assign({}, state, { recentFolders });
   },
 
+  [ADD_FAVORITE_FOLDER]: function(state, { payload }) {
+    const folder = payload.folder;
+    const favoriteFolder = { folder };
+    const favoriteFolders = [...state.favoriteFolders, favoriteFolder].sort(sortByProp('folder'));
+
+    return Object.assign({}, state, { favoriteFolders });
+  },
+
+  [REMOVE_FAVORITE_FOLDER]: function(state, { payload }) {
+    const folder = payload.folder;
+    const favoriteFolders = state.favoriteFolders.reduce((acc, item) => {
+      if (item.folder !== folder) {
+        acc.push(item);
+      }
+
+      return acc;
+    }, []);
+
+    return Object.assign({}, state, { favoriteFolders });
+  },
+
   [CLEAR_INTERACTIVE_IMPORT]: function(state) {
     const newState = {
       ...defaultState,
+      favoriteFolders: state.favoriteFolders,
       recentFolders: state.recentFolders,
       importMode: state.importMode
     };

src/NzbDrone.Core/Localization/Core/en.json

@@ -629,6 +629,9 @@
   "FailedToLoadMovieFromAPI": "Failed to load movie from API",
   "FailedToUpdateSettings": "Failed to update settings",
   "False": "False",
+  "FavoriteFolderAdd": "Add Favorite Folder",
+  "FavoriteFolderRemove": "Remove Favorite Folder",
+  "FavoriteFolders": "Favorite Folders",
   "FeatureRequests": "Feature Requests",
   "File": "File",
   "FileBrowser": "File Browser",