id: 'open-folder',
displayName(files: Node[]) {
// Only works on single node
- const displayName = files[0].attributes.displayname || files[0].basename
+ const displayName = files[0].displayname
return t('files', 'Open folder {displayName}', { displayName })
},
iconSvgInline: () => FolderSvg,
return this.$navigation?.active?.name || t('files', 'Home')
}
- const source: FileSource | null = this.getFileSourceFromPath(path)
- const node: Node | undefined = source ? this.getNodeFromSource(source) : undefined
- return node?.attributes?.displayname || basename(path)
+ const source = this.getFileSourceFromPath(path)
+ const node = source ? this.getNodeFromSource(source) : undefined
+ return node?.displayname || basename(path)
},
onClick(to) {
+++ /dev/null
-/**
- * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-import { describe, expect } from '@jest/globals'
-import { orderBy } from './SortingService'
-
-describe('SortingService', () => {
- test('By default the identify and ascending order is used', () => {
- const array = ['a', 'z', 'b']
- expect(orderBy(array)).toEqual(['a', 'b', 'z'])
- })
-
- test('Use identifiy but descending', () => {
- const array = ['a', 'z', 'b']
- expect(orderBy(array, undefined, ['desc'])).toEqual(['z', 'b', 'a'])
- })
-
- test('Can set identifier function', () => {
- const array = [
- { text: 'a', order: 2 },
- { text: 'z', order: 1 },
- { text: 'b', order: 3 },
- ] as const
- expect(orderBy(array, [(v) => v.order]).map((v) => v.text)).toEqual(['z', 'a', 'b'])
- })
-
- test('Can set multiple identifier functions', () => {
- const array = [
- { text: 'a', order: 2, secondOrder: 2 },
- { text: 'z', order: 1, secondOrder: 3 },
- { text: 'b', order: 2, secondOrder: 1 },
- ] as const
- expect(orderBy(array, [(v) => v.order, (v) => v.secondOrder]).map((v) => v.text)).toEqual(['z', 'b', 'a'])
- })
-
- test('Can set order partially', () => {
- const array = [
- { text: 'a', order: 2, secondOrder: 2 },
- { text: 'z', order: 1, secondOrder: 3 },
- { text: 'b', order: 2, secondOrder: 1 },
- ] as const
-
- expect(
- orderBy(
- array,
- [(v) => v.order, (v) => v.secondOrder],
- ['desc'],
- ).map((v) => v.text),
- ).toEqual(['b', 'a', 'z'])
- })
-
- test('Can set order array', () => {
- const array = [
- { text: 'a', order: 2, secondOrder: 2 },
- { text: 'z', order: 1, secondOrder: 3 },
- { text: 'b', order: 2, secondOrder: 1 },
- ] as const
-
- expect(
- orderBy(
- array,
- [(v) => v.order, (v) => v.secondOrder],
- ['desc', 'desc'],
- ).map((v) => v.text),
- ).toEqual(['a', 'b', 'z'])
- })
-
- test('Numbers are handled correctly', () => {
- const array = [
- { text: '2.3' },
- { text: '2.10' },
- { text: '2.0' },
- { text: '2.2' },
- ] as const
-
- expect(
- orderBy(
- array,
- [(v) => v.text],
- ).map((v) => v.text),
- ).toEqual(['2.0', '2.2', '2.3', '2.10'])
- })
-
- test('Numbers with suffixes are handled correctly', () => {
- const array = [
- { text: '2024-01-05' },
- { text: '2024-05-01' },
- { text: '2024-01-10' },
- { text: '2024-01-05 Foo' },
- ] as const
-
- expect(
- orderBy(
- array,
- [(v) => v.text],
- ).map((v) => v.text),
- ).toEqual(['2024-01-05', '2024-01-05 Foo', '2024-01-10', '2024-05-01'])
- })
-})
+++ /dev/null
-/**
- * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-import { getCanonicalLocale, getLanguage } from '@nextcloud/l10n'
-
-type IdentifierFn<T> = (v: T) => unknown
-type SortingOrder = 'asc'|'desc'
-
-/**
- * Helper to create string representation
- * @param value Value to stringify
- */
-function stringify(value: unknown) {
- // The default representation of Date is not sortable because of the weekday names in front of it
- if (value instanceof Date) {
- return value.toISOString()
- }
- return String(value)
-}
-
-/**
- * Natural order a collection
- * You can define identifiers as callback functions, that get the element and return the value to sort.
- *
- * @param collection The collection to order
- * @param identifiers An array of identifiers to use, by default the identity of the element is used
- * @param orders Array of orders, by default all identifiers are sorted ascening
- */
-export function orderBy<T>(collection: readonly T[], identifiers?: IdentifierFn<T>[], orders?: SortingOrder[]): T[] {
- // If not identifiers are set we use the identity of the value
- identifiers = identifiers ?? [(value) => value]
- // By default sort the collection ascending
- orders = orders ?? []
- const sorting = identifiers.map((_, index) => (orders[index] ?? 'asc') === 'asc' ? 1 : -1)
-
- const collator = Intl.Collator(
- [getLanguage(), getCanonicalLocale()],
- {
- // handle 10 as ten and not as one-zero
- numeric: true,
- usage: 'sort',
- },
- )
-
- return [...collection].sort((a, b) => {
- for (const [index, identifier] of identifiers.entries()) {
- // Get the local compare of stringified value a and b
- const value = collator.compare(stringify(identifier(a)), stringify(identifier(b)))
- // If they do not match return the order
- if (value !== 0) {
- return value * sorting[index]
- }
- // If they match we need to continue with the next identifier
- }
- // If all are equal we need to return equality
- return 0
- })
-}
import { useUploaderStore } from '../store/uploader.ts'
import { useUserConfigStore } from '../store/userconfig.ts'
import { useViewConfigStore } from '../store/viewConfig.ts'
-import { orderBy } from '../services/SortingService.ts'
import BreadCrumbs from '../components/BreadCrumbs.vue'
import FilesListVirtual from '../components/FilesListVirtual.vue'
import filesListWidthMixin from '../mixins/filesListWidth.ts'
/**
* The current directory contents.
*/
- dirContentsSorted(): Node[] {
+ dirContentsSorted() {
if (!this.currentView) {
return []
}
return this.isAscSorting ? results : results.reverse()
}
- return orderBy(
- filteredDirContent,
- ...this.sortingParameters,
- )
+ return sortNodes(filteredDirContent, {
+ sortFavoritesFirst: this.userConfig.sort_favorites_first,
+ sortFoldersFirst: this.userConfig.sort_folders_first,
+ sortingMode: this.sortingMode,
+ sortingOrder: this.isAscSorting ? 'asc' : 'desc',
+ })
},
dirContents(): Node[] {
"@nextcloud/capabilities": "^1.2.0",
"@nextcloud/dialogs": "^5.3.5",
"@nextcloud/event-bus": "^3.3.1",
- "@nextcloud/files": "^3.5.1",
+ "@nextcloud/files": "^3.6.0",
"@nextcloud/initial-state": "^2.2.0",
"@nextcloud/l10n": "^3.1.0",
"@nextcloud/logger": "^2.5.0",
projects / nextcloud-server.git / commitdiff