Fix: sorting by date and number

Signed-off-by: Hamza Mahjoubi <[email protected]>
nextcloud · Aug 9, 2024 · db4314c · db4314c
1 parent 01fa7a3
commit db4314c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/js/viewer-main.js b/js/viewer-main.js
diff --git a/js/viewer-main.js.map b/js/viewer-main.js.map
diff --git a/js/viewer-vendors-node_modules_nextcloud_dialogs_dist_chunks_FilePicker-DBGB1Rec_mjs.js b/js/viewer-vendors-node_modules_nextcloud_dialogs_dist_chunks_FilePicker-DBGB1Rec_mjs.js
diff --git a/js/viewer-vendors-node_modules_nextcloud_dialogs_dist_chunks_FilePicker-DBGB1Rec_mjs.js.map b/js/viewer-vendors-node_modules_nextcloud_dialogs_dist_chunks_FilePicker-DBGB1Rec_mjs.js.map
diff --git a/src/utils/fileUtils.ts b/src/utils/fileUtils.ts
@@ -61,7 +61,8 @@ const sortCompare = function(fileInfo1, fileInfo2, key, asc = true) {
 
 	// if this is a number, let's sort by integer
 	if (isNumber(fileInfo1[key]) && isNumber(fileInfo2[key])) {
-		return Number(fileInfo1[key]) - Number(fileInfo2[key])
+		const result = Number(fileInfo1[key]) - Number(fileInfo2[key])
+		return asc ? result : -result
 	}
 
 	// else we sort by string, so let's sort directories first
@@ -70,7 +71,11 @@ const sortCompare = function(fileInfo1, fileInfo2, key, asc = true) {
 	} else if (fileInfo1.type !== 'directory' && fileInfo2.type === 'directory') {
 		return 1
 	}
-
+	// sort by date if key is lastmod
+	if (key === 'lastmod') {
+		const result = new Date(fileInfo1[key]).getTime() - new Date(fileInfo2[key]).getTime()
+		return asc ? -result : result
+	}
 	// finally sort by name
 	return asc
 		? fileInfo1[key].localeCompare(fileInfo2[key], OC.getLanguage(), { numeric: true })
@@ -139,4 +144,4 @@ function getDavPath({ filename, basename, source = '' }: { filename: string, bas
 	return getRootPath() + encodePath(filename)
 }
 
-export { extractFilePaths, sortCompare, genFileInfo, getDavPath }
+export { extractFilePaths, sortCompare, genFileInfo, getDavPath }