Fix accounts sorting - Closes #347

Bubka · Jul 30, 2024 · 5d3a1be · 5d3a1be
1 parent 4e463a7
commit 5d3a1be
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 8 deletions.
diff --git a/resources/js/composables/helpers.js b/resources/js/composables/helpers.js
@@ -49,4 +49,8 @@ export function useDisplayablePassword(pwd, reveal = false) {
 	}
 
 	return user.preferences.showOtpAsDot && !reveal ? pwd.replace(/[0-9]/g, '●') : pwd
+}
+
+export function startsWithUppercase(str) {
+    return str.substr(0, 1).match(/[A-Z\u00C0-\u00DC]/);
 }
diff --git a/resources/js/stores/twofaccounts.js b/resources/js/stores/twofaccounts.js
@@ -1,4 +1,5 @@
 import { defineStore } from 'pinia'
+import { startsWithUppercase } from '@/composables/helpers'
 import { useUserStore } from '@/stores/user'
 import { useNotifyStore } from '@/stores/notify'
 import twofaccountService from '@/services/twofaccountService'
@@ -181,21 +182,33 @@ export const useTwofaccounts = defineStore({
          * Sorts accounts ascending
          */
         sortAsc() {
-            if (useUserStore().preferences.sortCaseSensitive) {
-                this.items.sort((a, b) => a.service > b.service ? 1 : -1)
-            }
-            else this.items.sort((a, b) => a.service.toLowerCase() > b.service.toLowerCase() ? 1 : -1)
+            this.items.sort(function(a, b) {
+                if (useUserStore().preferences.sortCaseSensitive) {
+                    if (startsWithUppercase(a.service) && !startsWithUppercase(b.service)) {
+                        return -1;
+                    } else if (startsWithUppercase(b.service) && !startsWithUppercase(a.service)) {
+                        return 1;
+                    }
+                }
+                return a.service.localeCompare(b.service, useUserStore().preferences.lang)
+            });
             this.saveOrder()
         },
 
         /**
          * Sorts accounts descending
         */
         sortDesc() {
-            if (useUserStore().preferences.sortCaseSensitive) {
-                this.items.sort((a, b) => a.service < b.service ? 1 : -1)
-            }
-            else this.items.sort((a, b) => a.service.toLowerCase() < b.service.toLowerCase() ? 1 : -1)
+            this.items.sort(function(a, b) {
+                if (useUserStore().preferences.sortCaseSensitive) {
+                    if (startsWithUppercase(a.service) && !startsWithUppercase(b.service)) {
+                        return 1;
+                    } else if (startsWithUppercase(b.service) && !startsWithUppercase(a.service)) {
+                        return -1;
+                    }
+                }
+                return b.service.localeCompare(a.service, useUserStore().preferences.lang)
+            });
             this.saveOrder()
         },