Merge pull request #1788 from nextcloud/fix/groups-sort

Properly sort groups
nextcloud · Sep 6, 2020 · 6144342 · 6144342
2 parents ead1bfa + 13abadd
commit 6144342
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -53,6 +53,7 @@
 		"p-queue": "^6.6.1",
 		"qr-image": "^3.2.0",
 		"regenerator-runtime": "^0.13.7",
+		"string-natural-compare": "^3.0.1",
 		"uuid": "^8.3.0",
 		"vue": "^2.6.12",
 		"vue-click-outside": "^1.1.0",

diff --git a/src/views/Contacts.vue b/src/views/Contacts.vue
@@ -249,6 +249,7 @@ import { VCardTime } from 'ical.js'
 import download from 'downloadjs'
 import moment from 'moment'
 import pLimit from 'p-limit'
+import naturalCompare from 'string-natural-compare'
 
 import ContactDetails from '../components/ContactDetails'
 import ContactsList from '../components/ContactsList'
@@ -447,7 +448,7 @@ export default {
 					toString: () => group.name,
 				})
 			})
-			menu.sort()
+			menu.sort((a, b) => naturalCompare(a.toString(), b.toString(), { caseInsensitive: true }))
 
 			// Find the Recently Contacted group, delete it from array
 			const recentlyIndex = menu.findIndex(group => group.name === GROUP_RECENTLY_CONTACTED)