tedkulp/Readarr
1
0
Fork 0
mirror of https://github.com/Readarr/Readarr.git synced 2026-04-17 21:25:39 -04:00
Code Issues Projects Releases Wiki Activity

Fixed: Error refreshing page on Activity/Wanted

Browse Source
This commit is contained in:
ta264
2020-08-18 23:31:00 +01:00
parent cc0fea2aab
commit bb409b9929
10 changed files with 65 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/src/Activity/Queue/Queue.js
View File

@@ -125,6 +125,8 @@ class Queue extends Component {
isPopulated,
error,
items,
isAuthorFetching,
isAuthorPopulated,
isBooksFetching,
isBooksPopulated,
booksError,
@@ -145,8 +147,8 @@ class Queue extends Component {
isPendingSelected
} = this.state;
const isRefreshing = isFetching || isBooksFetching || isRefreshMonitoredDownloadsExecuting;
const isAllPopulated = isPopulated && (isBooksPopulated || !items.length || items.every((e) => !e.bookId));
const isRefreshing = isFetching || isAuthorFetching || isBooksFetching || isRefreshMonitoredDownloadsExecuting;
const isAllPopulated = isPopulated && ((isAuthorPopulated && isBooksPopulated) || !items.length || items.every((e) => !e.bookId));
const hasError = error || booksError;
const selectedIds = this.getSelectedIds();
const selectedCount = selectedIds.length;
@@ -280,6 +282,8 @@ Queue.propTypes = {
isPopulated: PropTypes.bool.isRequired,
error: PropTypes.object,
items: PropTypes.arrayOf(PropTypes.object).isRequired,
isAuthorFetching: PropTypes.bool.isRequired,
isAuthorPopulated: PropTypes.bool.isRequired,
isBooksFetching: PropTypes.bool.isRequired,
isBooksPopulated: PropTypes.bool.isRequired,
booksError: PropTypes.object,

5
frontend/src/Activity/Queue/QueueConnector.js
View File

@@ -15,12 +15,15 @@ import Queue from './Queue';
function createMapStateToProps() {
return createSelector(
(state) => state.authors,
(state) => state.books,
(state) => state.queue.options,
(state) => state.queue.paged,
createCommandExecutingSelector(commandNames.REFRESH_MONITORED_DOWNLOADS),
(books, options, queue, isRefreshMonitoredDownloadsExecuting) => {
(authors, books, options, queue, isRefreshMonitoredDownloadsExecuting) => {
return {
isAuthorFetching: authors.isFetching,
isAuthorPopulated: authors.isPopulated,
isBooksFetching: books.isFetching,
isBooksPopulated: books.isPopulated,
booksError: books.error,