yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-27 07:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add cancel fetch file

Browse Source 
Signed-off-by: soupette <cyril.lpz@gmail.com>
This commit is contained in:
soupette 2020-03-31 18:54:56 +02:00
parent 2f6cec21e3
commit 43ab0edeb8
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/strapi-plugin-upload/admin/src/containers/ModalStepper/index.js
View File

@ -78,10 +78,13 @@ const ModalStepper = ({
try {
await Promise.all(
files.map(file => {
const { source } = file;
return axios
.get(file.fileURL, {
headers: new Headers({ Origin: window.location.origin, mode: 'cors' }),
responseType: 'blob',
cancelToken: source.token,
})
.then(({ data }) => {
const createdFile = new File([data], file.fileURL, {
@ -123,9 +126,14 @@ const ModalStepper = ({
const handleCancelFileToUpload = fileOriginalIndex => {
const fileToCancel = filesToUpload.find(file => file.originalIndex === fileOriginalIndex);
const { source } = fileToCancel;
// Cancel upload
fileToCancel.abortController.abort();
if (source) {
source.cancel('Operation canceled by the user.');
} else {
// Cancel upload
fileToCancel.abortController.abort();
}
dispatch({
type: 'REMOVE_FILE_TO_UPLOAD',

6
packages/strapi-plugin-upload/admin/src/utils/createNewFilesToDownloadArray.js
View File

@ -1,4 +1,4 @@
// import axios from 'axios';
import axios from 'axios';
import { isEmpty } from 'lodash';
const getTempsIds = alreadyUploadedFiles => {
@ -18,11 +18,15 @@ const createNewFilesToDownloadArray = (filesURLArray, alreadyUploadedFiles) => {
return acc;
}
const CancelToken = axios.CancelToken;
// TODO change with axios cancel request
const abortController = new AbortController();
const source = CancelToken.source();
acc.push({
abortController,
source,
file: null,
fileInfo: {
alternativeText: '',