Fixed: Import series spinning forever when error is returned

Fixes #3944
pull/3953/head
Mark McDowall 4 years ago
parent b2737a3d35
commit b35fd7e507

@ -31,3 +31,7 @@
margin: 0 10px 0 12px;
text-align: left;
}
.importError {
margin-left: 10px;
}

@ -1,13 +1,15 @@
import _ from 'lodash';
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { inputTypes, kinds } from 'Helpers/Props';
import { icons, inputTypes, kinds, tooltipPositions } from 'Helpers/Props';
import Icon from 'Components/Icon';
import Button from 'Components/Link/Button';
import SpinnerButton from 'Components/Link/SpinnerButton';
import LoadingIndicator from 'Components/Loading/LoadingIndicator';
import CheckInput from 'Components/Form/CheckInput';
import FormInputGroup from 'Components/Form/FormInputGroup';
import PageContentFooter from 'Components/Page/PageContentFooter';
import Popover from 'Components/Tooltip/Popover';
import styles from './ImportSeriesFooter.css';
const MIXED = 'mixed';
@ -118,6 +120,7 @@ class ImportSeriesFooter extends Component {
isSeriesTypeMixed,
hasUnsearchedItems,
showLanguageProfile,
importError,
onImportPress,
onLookupPress,
onCancelLookupPress
@ -226,38 +229,71 @@ class ImportSeriesFooter extends Component {
</SpinnerButton>
{
isLookingUpSeries &&
isLookingUpSeries ?
<Button
className={styles.loadingButton}
kind={kinds.WARNING}
onPress={onCancelLookupPress}
>
Cancel Processing
</Button>
</Button> :
null
}
{
hasUnsearchedItems &&
hasUnsearchedItems ?
<Button
className={styles.loadingButton}
kind={kinds.SUCCESS}
onPress={onLookupPress}
>
Start Processing
</Button>
</Button> :
null
}
{
isLookingUpSeries &&
isLookingUpSeries ?
<LoadingIndicator
className={styles.loading}
size={24}
/>
/> :
null
}
{
isLookingUpSeries &&
'Processing Folders'
isLookingUpSeries ?
'Processing Folders' :
null
}
{
importError ?
<Popover
anchor={
<Icon
className={styles.importError}
name={icons.WARNING}
kind={kinds.WARNING}
/>
}
title="Import Errors"
body={
<ul>
{
importError.responseJSON.map((error, index) => {
return (
<li key={index}>
{error.errorMessage}
</li>
);
})
}
</ul>
}
position={tooltipPositions.RIGHT}
/> :
null
}
</div>
</div>
@ -282,6 +318,7 @@ ImportSeriesFooter.propTypes = {
isSeasonFolderMixed: PropTypes.bool.isRequired,
hasUnsearchedItems: PropTypes.bool.isRequired,
showLanguageProfile: PropTypes.bool.isRequired,
importError: PropTypes.object,
onInputChange: PropTypes.func.isRequired,
onImportPress: PropTypes.func.isRequired,
onLookupPress: PropTypes.func.isRequired,

@ -27,7 +27,8 @@ function createMapStateToProps() {
const {
isLookingUpSeries,
isImporting,
items
items,
importError
} = importSeries;
const isMonitorMixed = isMixed(items, selectedIds, defaultMonitor, 'monitor');
@ -51,6 +52,7 @@ function createMapStateToProps() {
isLanguageProfileIdMixed,
isSeriesTypeMixed,
isSeasonFolderMixed,
importError,
hasUnsearchedItems
};
}

@ -249,7 +249,8 @@ export const actionHandlers = handleThunks({
set({
section,
isImporting: false,
isImported: true
isImported: true,
importError: null
}),
...data.map((series) => updateItem({ section: 'series', ...series })),
@ -261,19 +262,19 @@ export const actionHandlers = handleThunks({
});
promise.fail((xhr) => {
dispatch(batchActions(
dispatch(batchActions([
set({
section,
isImporting: false,
isImported: true
isImported: true,
importError: xhr
}),
addedIds.map((id) => updateItem({
...addedIds.map((id) => updateItem({
section,
id,
importError: xhr
id
}))
));
]));
});
}
});

Loading…
Cancel
Save