Skip to content
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

Jump to bottom

fix(sorting): The display name attribute is called displayname not displayName for DAV #992

Merged
merged 1 commit into from
Jun 18, 2024
Merged

fix(sorting): The display name attribute is called displayname not displayName for DAV #992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions __tests__/utils/fileSorting.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ describe('sortNodes', () => {
mtime: new Date(100),
size: 100,
attributes: {
displayName: 'a',
displayname: 'a',
},
}),
file('b', 100, 100),
Expand All @@ -95,7 +95,7 @@ describe('sortNodes', () => {
mtime: new Date(100),
size: 100,
attributes: {
displayName: 'a',
displayname: 'a',
},
}),
// File with basename "b" but displayname "a"
Expand All @@ -107,7 +107,7 @@ describe('sortNodes', () => {
mtime: new Date(100),
size: 100,
attributes: {
displayName: 'a',
displayname: 'a',
},
}),
]
Expand Down
6 changes: 3 additions & 3 deletions lib/utils/fileSorting.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ export function sortNodes(nodes: readonly INode[], options: FilesSortingOptions
...(sortingOptions.sortFavoritesFirst ? [(v: INode) => v.attributes?.favorite !== 1] : []),
// 2: Sort folders first if sorting by name
...(sortingOptions.sortFoldersFirst ? [(v: INode) => v.type !== 'folder'] : []),
// 3: Use sorting mode if NOT basename (to be able to use displayName too)
// 3: Use sorting mode if NOT basename (to be able to use displayname too)
...(sortingOptions.sortingMode !== FilesSortingMode.Name ? [(v: INode) => v[sortingOptions.sortingMode]] : []),
// 4: Use displayName if available, fallback to name
(v: INode) => basename(v.attributes?.displayName || v.basename),
// 4: Use displayname if available, fallback to name
(v: INode) => basename(v.attributes?.displayname || v.basename),
// 5: Finally, use basename if all previous sorting methods failed
(v: INode) => v.basename,
]
Expand Down
Loading