Skip to content

[stable22] Properly abort uploads #30637

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PVince81 merged 2 commits into from
Jan 13, 2022
Merged

[stable22] Properly abort uploads #30637

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db64ed7
Properly abort uploads
PVince81 Jan 12, 2022
8a9fcb6
Properly hide progress bar after error
PVince81 Jan 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Properly hide progress bar after error 
Whenever an error occurs, also hide the progress bar.

The logic was also adjusted to properly detect uploads that are pending
deletion, in which case the progress bar can already be hidden.

Signed-off-by: Vincent Petry <[email protected]>
  • Loading branch information
@PVince81 @backportbot
PVince81 authored and backportbot[bot] committed Jan 13, 2022
commit 8a9fcb611e9dad0de7fb117a212fa058d61dd8a2
21 changes: 16 additions & 5 deletions apps/files/js/file-upload.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,6 @@ OC.FileUpload.prototype = {
},

_delete: function() {
var self = this;
if (this.data.isChunked) {
this._deleteChunkFolder()
}
Expand All @@ -334,7 +333,6 @@ OC.FileUpload.prototype = {
* Abort the upload
*/
abort: function() {
var self = this;
if (this.aborted) {
return
}
Expand Down Expand Up @@ -691,11 +689,24 @@ OC.Uploader.prototype = _.extend({
// the upload info there still
var self = this;
var uploadId = upload.data.uploadId;
// mark as deleted for the progress bar
this._uploads[uploadId].deleted = true;
window.setTimeout(function() {
delete self._uploads[uploadId];
}, 5000)
},

_activeUploadCount: function() {
var count = 0;
for (var key in this._uploads) {
if (!this._uploads[key].deleted) {
count++;
}
}

return count;
},

showUploadCancelMessage: _.debounce(function() {
OC.Notification.show(t('files', 'Upload cancelled.'), {timeout : 7, type: 'error'});
}, 500),
Expand Down Expand Up @@ -1321,9 +1332,9 @@ OC.Uploader.prototype = _.extend({

self._pendingUploadDoneCount++;

upload.done().then(function() {
upload.done().always(function() {
self._pendingUploadDoneCount--;
if (Object.keys(self._uploads).length === 0 && self._pendingUploadDoneCount === 0) {
if (self._activeUploadCount() === 0 && self._pendingUploadDoneCount === 0) {
// All the uploads ended and there is no pending
// operation, so hide the progress bar.
// Note that this happens here only with chunked
Expand All @@ -1337,7 +1348,7 @@ OC.Uploader.prototype = _.extend({
// hides the progress bar in that case).
self._hideProgressBar();
}

}).done(function() {
self.trigger('done', e, upload);
}).fail(function(status, response) {
if (upload.aborted) {
Expand Down