upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-24 23:59:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 35

feat(files): sort local files first - used when filtering + local search

Browse source 
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
This commit is contained in:
Ferdinand Thiessen 2025-07-04 16:35:41 +02:00
parent 3978e056cf
commit 18777affe2
No known key found for this signature in database
GPG key ID: 45FAE7268762B400
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
apps/files/src/views/FilesList.vue
View file

@ -155,7 +155,7 @@ import { getCapabilities } from '@nextcloud/capabilities'
import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
import { Node, Permission, sortNodes, getFileListActions } from '@nextcloud/files'
import { translate as t } from '@nextcloud/l10n'
import { join, dirname, normalize } from 'path'
import { join, dirname, normalize, relative } from 'path'
import { showError, showSuccess, showWarning } from '@nextcloud/dialogs'
import { ShareType } from '@nextcloud/sharing'
import { UploadPicker, UploadStatus } from '@nextcloud/upload'
@ -356,12 +356,28 @@ export default defineComponent({
return this.isAscSorting ? results : results.reverse()
}
return sortNodes(this.dirContentsFiltered, {
const nodes = sortNodes(this.dirContentsFiltered, {
sortFavoritesFirst: this.userConfig.sort_favorites_first,
sortFoldersFirst: this.userConfig.sort_folders_first,
sortingMode: this.sortingMode,
sortingOrder: this.isAscSorting ? 'asc' : 'desc',
})
// TODO upstream this
if (this.currentView.id === 'files') {
nodes.sort((a, b) => {
const aa = relative(a.source, this.currentFolder!.source) === '..'
const bb = relative(b.source, this.currentFolder!.source) === '..'
if (aa && bb) {
return 0
} else if (aa) {
return -1
}
return 1
})
}
return nodes
},
/**