Web: Files: fixed cancel upload
This commit is contained in:
parent
cbd8781a24
commit
74b19e27f2
@ -142,11 +142,11 @@ class FileRow extends Component {
|
|||||||
onCancelCurrentUpload = (e) => {
|
onCancelCurrentUpload = (e) => {
|
||||||
//console.log("cancel upload ", e);
|
//console.log("cancel upload ", e);
|
||||||
const { id, action, fileId } = e.currentTarget.dataset;
|
const { id, action, fileId } = e.currentTarget.dataset;
|
||||||
const { cancelCurrentUpload, cancelCurrentFileConversion } = this.props;
|
const { t, cancelCurrentUpload, cancelCurrentFileConversion } = this.props;
|
||||||
|
|
||||||
return action === "convert"
|
return action === "convert"
|
||||||
? cancelCurrentFileConversion(fileId)
|
? cancelCurrentFileConversion(fileId)
|
||||||
: cancelCurrentUpload(id);
|
: cancelCurrentUpload(id, t);
|
||||||
};
|
};
|
||||||
|
|
||||||
onMediaClick = (id) => {
|
onMediaClick = (id) => {
|
||||||
|
@ -215,7 +215,31 @@ class UploadDataStore {
|
|||||||
this.setUploadData(newUploadData);
|
this.setUploadData(newUploadData);
|
||||||
};
|
};
|
||||||
|
|
||||||
cancelCurrentUpload = (id) => {
|
cancelCurrentUpload = (id, t) => {
|
||||||
|
if (this.isParallel) {
|
||||||
|
runInAction(() => {
|
||||||
|
const uploadedFilesHistory = this.uploadedFilesHistory.filter(
|
||||||
|
(el) => el.uniqueId !== id
|
||||||
|
);
|
||||||
|
|
||||||
|
const canceledFile = this.files.find((f) => f.uniqueId === id);
|
||||||
|
const newPercent = this.getFilesPercent(canceledFile.file.size);
|
||||||
|
canceledFile.cancel = true;
|
||||||
|
canceledFile.percent = 100;
|
||||||
|
canceledFile.action = "uploaded";
|
||||||
|
|
||||||
|
this.currentUploadNumber -= 1;
|
||||||
|
this.uploadedFilesHistory = uploadedFilesHistory;
|
||||||
|
this.percent = newPercent;
|
||||||
|
const nextFileIndex = this.files.findIndex((f) => !f.inAction);
|
||||||
|
|
||||||
|
if (nextFileIndex !== -1) {
|
||||||
|
this.startSessionFunc(nextFileIndex, t);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const newFiles = this.files.filter((el) => el.uniqueId !== id);
|
const newFiles = this.files.filter((el) => el.uniqueId !== id);
|
||||||
const uploadedFilesHistory = this.uploadedFilesHistory.filter(
|
const uploadedFilesHistory = this.uploadedFilesHistory.filter(
|
||||||
(el) => el.uniqueId !== id
|
(el) => el.uniqueId !== id
|
||||||
|
Loading…
Reference in New Issue
Block a user