From 6e6ee7931eeb2a7d4fd5eb003003de21aead4317 Mon Sep 17 00:00:00 2001 From: PearsonFlyer Date: Fri, 14 Jul 2023 07:12:33 -0400 Subject: [PATCH] Added the ability to skip redownload when marking an item as failed in the activity queue --- frontend/src/Activity/Queue/QueueRow.js | 4 ++-- frontend/src/Activity/Queue/RemoveQueueItemModal.js | 12 ++++++------ frontend/src/Activity/Queue/RemoveQueueItemsModal.js | 12 ++++++------ frontend/src/Store/Actions/queueActions.js | 8 ++++---- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/frontend/src/Activity/Queue/QueueRow.js b/frontend/src/Activity/Queue/QueueRow.js index 954e7ee79..868b870c6 100644 --- a/frontend/src/Activity/Queue/QueueRow.js +++ b/frontend/src/Activity/Queue/QueueRow.js @@ -44,14 +44,14 @@ class QueueRow extends Component { this.setState({ isRemoveQueueItemModalOpen: true }); }; - onRemoveQueueItemModalConfirmed = (blocklist, skipredownload) => { + onRemoveQueueItemModalConfirmed = (blocklist, skipRedownload) => { const { onRemoveQueueItemPress, onQueueRowModalOpenOrClose } = this.props; onQueueRowModalOpenOrClose(false); - onRemoveQueueItemPress(blocklist, skipredownload); + onRemoveQueueItemPress(blocklist, skipRedownload); this.setState({ isRemoveQueueItemModalOpen: false }); }; diff --git a/frontend/src/Activity/Queue/RemoveQueueItemModal.js b/frontend/src/Activity/Queue/RemoveQueueItemModal.js index f5ad6c4d6..dffe94162 100644 --- a/frontend/src/Activity/Queue/RemoveQueueItemModal.js +++ b/frontend/src/Activity/Queue/RemoveQueueItemModal.js @@ -23,7 +23,7 @@ class RemoveQueueItemModal extends Component { this.state = { remove: true, blocklist: false, - skipredownload: false + skipRedownload: false }; } @@ -34,7 +34,7 @@ class RemoveQueueItemModal extends Component { this.setState({ remove: true, blocklist: false, - skipredownload: false + skipRedownload: false }); }; @@ -50,7 +50,7 @@ class RemoveQueueItemModal extends Component { }; onSkipRedownloadChange = ({ value }) => { - this.setState({ skipredownload: value }); + this.setState({ skipRedownload: value }); }; onRemoveConfirmed = () => { @@ -76,7 +76,7 @@ class RemoveQueueItemModal extends Component { isPending } = this.props; - const { remove, blocklist, skipredownload } = this.state; + const { remove, blocklist, skipRedownload } = this.state; return ( {translate('SkipRedownload')} diff --git a/frontend/src/Activity/Queue/RemoveQueueItemsModal.js b/frontend/src/Activity/Queue/RemoveQueueItemsModal.js index 49bff5f4e..4576952c5 100644 --- a/frontend/src/Activity/Queue/RemoveQueueItemsModal.js +++ b/frontend/src/Activity/Queue/RemoveQueueItemsModal.js @@ -24,7 +24,7 @@ class RemoveQueueItemsModal extends Component { this.state = { remove: true, blocklist: false, - skipredownload: false + skipRedownload: false }; } @@ -35,7 +35,7 @@ class RemoveQueueItemsModal extends Component { this.setState({ remove: true, blocklist: false, - skipredownload: false + skipRedownload: false }); }; @@ -51,7 +51,7 @@ class RemoveQueueItemsModal extends Component { }; onSkipRedownloadChange = ({ value }) => { - this.setState({ skipredownload: value }); + this.setState({ skipRedownload: value }); }; onRemoveConfirmed = () => { @@ -77,7 +77,7 @@ class RemoveQueueItemsModal extends Component { allPending } = this.props; - const { remove, blocklist, skipredownload } = this.state; + const { remove, blocklist, skipRedownload } = this.state; return ( {translate('SkipRedownload')} diff --git a/frontend/src/Store/Actions/queueActions.js b/frontend/src/Store/Actions/queueActions.js index 7ad86f9c0..e4fbb3d90 100644 --- a/frontend/src/Store/Actions/queueActions.js +++ b/frontend/src/Store/Actions/queueActions.js @@ -382,13 +382,13 @@ export const actionHandlers = handleThunks({ id, remove, blocklist, - skipredownload + skipRedownload } = payload; dispatch(updateItem({ section: paged, id, isRemoving: true })); const promise = createAjaxRequest({ - url: `/queue/${id}?removeFromClient=${remove}&blocklist=${blocklist}&skipredownload=${skipredownload}`, + url: `/queue/${id}?removeFromClient=${remove}&blocklist=${blocklist}&skipRedownload=${skipRedownload}`, method: 'DELETE' }).request; @@ -406,7 +406,7 @@ export const actionHandlers = handleThunks({ ids, remove, blocklist, - skipredownload + skipRedownload } = payload; dispatch(batchActions([ @@ -422,7 +422,7 @@ export const actionHandlers = handleThunks({ ])); const promise = createAjaxRequest({ - url: `/queue/bulk?removeFromClient=${remove}&blocklist=${blocklist}&skipredownload=${skipredownload}`, + url: `/queue/bulk?removeFromClient=${remove}&blocklist=${blocklist}&skipRedownload=${skipRedownload}`, method: 'DELETE', dataType: 'json', contentType: 'application/json',