Merge pull request #29611 from newroco/bugfix/16412/show-most-recently-deleted-files-first

Show most recently deleted files first in trash can

Author: CarlSchwan

apps/files_trashbin/js/files_trashbin.js

@@ -47,7 +47,7 @@ public function listTrashRoot(IUser $user): array {
 			return array_merge($items, $backend->listTrashRoot($user));
 		}, []);
 		usort($items, function (ITrashItem $a, ITrashItem $b) {
-			return $a->getDeletedTime() - $b->getDeletedTime();
+			return $b->getDeletedTime() - $a->getDeletedTime();
 		});
 		return $items;
 	}

apps/files_trashbin/js/files_trashbin.js.map

@@ -90,7 +90,7 @@
 			this.$el.find('.undelete').click('click', _.bind(this._onClickRestoreSelected, this))
 
 			// Sort by most recently deleted first
-			this.setSort('mtime', 'asc')
+			this.setSort('mtime', 'desc')
 
 			/**
 			 * Override crumb making to add "Deleted Files" entry

apps/files_trashbin/lib/Trash/TrashManager.php

@@ -136,7 +136,7 @@ describe('OCA.Trashbin.FileList tests', function () {
 	describe('Initialization', function () {
 		it('Sorts by mtime by default', function () {
 			expect(fileList._sort).toEqual('mtime');
-			expect(fileList._sortDirection).toEqual('asc');
+			expect(fileList._sortDirection).toEqual('desc');
 		});
 		it('Always returns read and delete permission', function () {
 			expect(fileList.getDirectoryPermissions()).toEqual(OC.PERMISSION_READ | OC.PERMISSION_DELETE);