fix(stringSorter): Use localeCompare in the stringSorter to prevent i…

…ncorrect sorting when mixed case fix HAWNG-7
hawtio · Nov 24, 2023 · 3bce079 · 3bce079
1 parent a23b6c5
commit 3bce079
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/packages/hawtio/src/util/strings.test.ts b/packages/hawtio/src/util/strings.test.ts
@@ -1,4 +1,4 @@
-import { humanizeLabels, matchWithWildcard, parseBoolean, toString, trimQuotes } from './strings'
+import { humanizeLabels, matchWithWildcard, parseBoolean, stringSorter, toString, trimQuotes } from './strings'
 
 describe('strings', () => {
   test('toString', () => {
@@ -59,4 +59,22 @@ describe('strings', () => {
     expect(matchWithWildcard(value, '*apache.c*')).toBe(true)
     expect(matchWithWildcard(value, '*ap*e.c*')).toBe(true)
   })
+
+  describe('stringSorter', () => {
+    expect(stringSorter('a-string', 'b-string')).toBe(-1)
+    expect(stringSorter('a-string', 'B-string')).toBe(-1)
+    expect(stringSorter('A-string', 'B-string')).toBe(-1)
+    expect(stringSorter('A-string', 'b-string')).toBe(-1)
+
+    expect(stringSorter('a-string', 'b-string', true)).toBe(1)
+    expect(stringSorter('a-string', 'B-string', true)).toBe(1)
+    expect(stringSorter('A-string', 'B-string', true)).toBe(1)
+    expect(stringSorter('A-string', 'b-string', true)).toBe(1)
+
+    expect(stringSorter('string', 'String')).toBe(-1)
+    expect(stringSorter('string', 'string')).toBe(0)
+
+    expect(stringSorter('string-7', 'string-8')).toBe(-1)
+    expect(stringSorter('string-7', 'string-8', true)).toBe(1)
+  })
 })
diff --git a/packages/hawtio/src/util/strings.ts b/packages/hawtio/src/util/strings.ts
@@ -78,13 +78,7 @@ export function trimQuotes(text: string): string {
 }
 
 export function stringSorter(a: string, b: string, sortDesc?: boolean): number {
-  let res = 0
-  if (a < b) {
-    res = -1
-  }
-  if (a > b) {
-    res = 1
-  }
+  let res = a.localeCompare(b)
   if (sortDesc) {
     res *= -1
   }