diff --git a/frontend/src/Movie/Details/MovieDetails.tsx b/frontend/src/Movie/Details/MovieDetails.tsx index bcb5af0144..d30df91fea 100644 --- a/frontend/src/Movie/Details/MovieDetails.tsx +++ b/frontend/src/Movie/Details/MovieDetails.tsx @@ -76,7 +76,6 @@ import { cancelFetchReleases, clearReleases, } from 'Store/Actions/releaseActions'; -import { fetchRootFolders } from 'Store/Actions/rootFolderActions'; import { fetchImportListSchema } from 'Store/Actions/Settings/importLists'; import createAllMoviesSelector from 'Store/Selectors/createAllMoviesSelector'; import createCommandsSelector from 'Store/Selectors/createCommandsSelector'; @@ -466,7 +465,6 @@ function MovieDetails({ movieId }: MovieDetailsProps) { dispatch(fetchMovieCredits({ movieId })); dispatch(fetchQueueDetails({ movieId })); dispatch(fetchImportListSchema()); - dispatch(fetchRootFolders()); }, [movieId, dispatch]); useEffect(() => { diff --git a/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.js b/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.js index cb7c933a6d..dcef833833 100644 --- a/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.js +++ b/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.js @@ -27,7 +27,6 @@ function EditImportListModalContent(props) { advancedSettings, isFetching, error, - rootFolderError, isSaving, isTesting, saveError, @@ -67,12 +66,13 @@ function EditImportListModalContent(props) { { - isFetching && - + isFetching ? + : + null } { - !isFetching && (!!error || !!rootFolderError) ? + !isFetching && !!error ? {translate('AddListError')} : @@ -80,7 +80,7 @@ function EditImportListModalContent(props) { } { - !isFetching && !error && !rootFolderError && + !isFetching && !error ?
@@ -240,7 +240,8 @@ function EditImportListModalContent(props) { }) } -
+ : + null }
@@ -291,7 +292,6 @@ EditImportListModalContent.propTypes = { advancedSettings: PropTypes.bool.isRequired, isFetching: PropTypes.bool.isRequired, error: PropTypes.object, - rootFolderError: PropTypes.object, isSaving: PropTypes.bool.isRequired, isTesting: PropTypes.bool.isRequired, saveError: PropTypes.object, diff --git a/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContentConnector.js b/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContentConnector.js index dc4fee0681..ebcbd4ae19 100644 --- a/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContentConnector.js +++ b/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContentConnector.js @@ -15,21 +15,11 @@ import EditImportListModalContent from './EditImportListModalContent'; function createMapStateToProps() { return createSelector( (state) => state.settings.advancedSettings, - (state) => state.rootFolders, createProviderSettingsSelector('importLists'), - (advancedSettings, rootFolders, importList) => { - const { - isFetching, - isPopulated, - ...otherProps - } = importList; - + (advancedSettings, importList) => { return { advancedSettings, - isFetching: rootFolders.isFetching || isFetching, - isPopulated: rootFolders.isPopulated && isPopulated, - rootFolderError: rootFolders.error, - ...otherProps + ...importList }; } );