Skip to content

[stable26] fix(trashbin): Allow a single delete/restore operation at a time #44399

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

Closed
Pytal wants to merge 3 commits into from
Closed

[stable26] fix(trashbin): Allow a single delete/restore operation at a time #44399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a3c4379
fix(trashbin): Allow a single delete/restore operation at a time
Pytal Mar 21, 2024
2c791ea
chore: compile assets
Pytal Mar 21, 2024
006173a
test: Update tests
Pytal Mar 26, 2024
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
2 changes: 1 addition & 1 deletion apps/files_trashbin/src/filelist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ import PQueue from 'p-queue'
var FileList = function($el, options) {
this.client = options.client
this.initialize($el, options)
this.deleteOperationQueue = new PQueue({ concurrency: 4 })
this.deleteOperationQueue = new PQueue({ concurrency: 1 })
}
FileList.prototype = _.extend({}, OCA.Files.FileList.prototype,
/** @lends OCA.Trashbin.FileList.prototype */ {
Expand Down
3 changes: 3 additions & 0 deletions apps/files_trashbin/tests/js/filelistSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,7 @@ describe('OCA.Trashbin.FileList tests', function () {
expect($('.selectedActions .item-restore').is(':visible')).toEqual(false);
});
it('Deletes selected files when "Delete" clicked', function (done) {
pending() // Skip test as concurrency is disabled
var request;
var promise = fileList._onClickDeleteSelected({
preventDefault: function () {
Expand Down Expand Up @@ -353,6 +354,7 @@ describe('OCA.Trashbin.FileList tests', function () {
});
describe('Restore', function () {
it('Restores selected files when "Restore" clicked', function (done) {
pending() // Skip test as concurrency is disabled
var request;
var promise = fileList._onClickRestoreSelected({
preventDefault: function () {
Expand All @@ -374,6 +376,7 @@ describe('OCA.Trashbin.FileList tests', function () {
}).then(done, done);
});
it('Restores all files when all selected when "Restore" clicked', function (done) {
pending() // Skip test as concurrency is disabled
var request;
$('.select-all').click();
var promise = fileList._onClickRestoreSelected({
Expand Down
Loading