1
0
mirror of https://github.com/Sonarr/Sonarr.git synced 2026-04-26 22:56:23 -04:00

Better selection of executing commands in series list

This commit is contained in:
Mark McDowall
2019-04-04 18:38:19 -07:00
parent e5f264a510
commit 8087996c8e
3 changed files with 22 additions and 13 deletions
@@ -3,9 +3,8 @@ import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import { isCommandExecuting } from 'Utilities/Command';
import createSeriesSelector from 'Store/Selectors/createSeriesSelector';
import createCommandsSelector from 'Store/Selectors/createCommandsSelector';
import createExecutingCommandsSelector from 'Store/Selectors/createCommandsSelector';
import createQualityProfileSelector from 'Store/Selectors/createQualityProfileSelector';
import createLanguageProfileSelector from 'Store/Selectors/createLanguageProfileSelector';
import { executeCommand } from 'Store/Actions/commandActions';
@@ -35,27 +34,25 @@ function createMapStateToProps() {
createQualityProfileSelector(),
createLanguageProfileSelector(),
selectShowSearchAction(),
createCommandsSelector(),
createExecutingCommandsSelector(),
(
series,
qualityProfile,
languageProfile,
showSearchAction,
commands
executingCommands
) => {
const isRefreshingSeries = commands.some((command) => {
const isRefreshingSeries = executingCommands.some((command) => {
return (
command.name === commandNames.REFRESH_SERIES &&
command.body.seriesId === series.id &&
isCommandExecuting(command)
command.body.seriesId === series.id
);
});
const isSearchingSeries = commands.some((command) => {
const isSearchingSeries = executingCommands.some((command) => {
return (
command.name === commandNames.SERIES_SEARCH &&
command.body.seriesId === series.id &&
isCommandExecuting(command)
command.body.seriesId === series.id
);
});