refactor: sort strings with localeCompare

Signed-off-by: Pedro Lamas <[email protected]>

src/store/cameras/getters.ts

@@ -13,11 +13,7 @@ export const getters: GetterTree<CamerasState, RootState> = {
     return [
       ...state.cameras,
       ...camerasInConfig
-    ].sort((a, b) => {
-      const name1 = a.name.toLowerCase()
-      const name2 = b.name.toLowerCase()
-      return (name1 < name2) ? -1 : (name1 > name2) ? 1 : 0
-    })
+    ].sort((a, b) => a.name.localeCompare(b.name))
   },
 
   getCamerasInConfig: (state, getters, rootState, rootGetters) => {

src/store/config/getters.ts

@@ -15,10 +15,13 @@ export const getters: GetterTree<ConfigState, RootState> = {
   },
 
   getInstances: (state) => {
-    const instances = [...state.instances]
-    instances.sort((a, b) => {
-      return a.active ? -1 : (b.active ? 1 : a.name.localeCompare(b.name))
-    })
+    const instances = [
+      ...state.instances
+    ].sort((a, b) =>
+      a.active
+        ? -1
+        : (b.active ? 1 : a.name.localeCompare(b.name))
+    )
     return instances
   },
 

src/store/history/getters.ts

@@ -8,7 +8,7 @@ export const getters: GetterTree<HistoryState, RootState> = {
    */
   getHistory: (state) => {
     return (state.jobs && state.jobs.length)
-      ? [...state.jobs].sort((a, b) => { return b.start_time - a.start_time })
+      ? [...state.jobs].sort((a, b) => b.start_time - a.start_time)
       : []
   },
 

src/store/macros/getters.ts

@@ -46,11 +46,7 @@ export const getters: GetterTree<MacrosState, RootState> = {
 
         return r
       })
-      .sort((a, b) => {
-        const name1 = a.name.toLowerCase()
-        const name2 = b.name.toLowerCase()
-        return (name1 < name2) ? -1 : (name1 > name2) ? 1 : 0
-      })
+      .sort((a, b) => a.name.localeCompare(b.name))
     return macros
   },
 
@@ -109,11 +105,7 @@ export const getters: GetterTree<MacrosState, RootState> = {
           count
         }
       })
-      .sort((a, b) => {
-        const name1 = a.name.toLowerCase()
-        const name2 = b.name.toLowerCase()
-        return (name1 < name2) ? -1 : (name1 > name2) ? 1 : 0
-      })
+      .sort((a, b) => a.name.localeCompare(b.name))
 
     return categories
   }

src/store/mesh/getters.ts

@@ -41,12 +41,15 @@ export const getters: GetterTree<MeshState, RootState> = {
         }
       }
     }
-    return meshes.sort((a: KlipperMesh, b: KlipperMesh) => {
-      const name1 = a.profile_name.toLowerCase()
-      const name2 = b.profile_name.toLowerCase()
-      if (a.profile_name === 'default' || b.profile_name === 'default') return 1
-      return (name1 < name2) ? -1 : (name1 > name2) ? 1 : 0
-    })
+    return meshes.sort((a, b) =>
+      a.profile_name === 'default'
+        ? -1
+        : (
+            b.profile_name === 'default'
+              ? 1
+              : a.profile_name.localeCompare(b.profile_name)
+          )
+    )
   },
 
   /**

src/store/printer/getters.ts

@@ -381,11 +381,8 @@ export const getters: GetterTree<PrinterState, RootState> = {
           })
         }
       })
-      return r.sort((a: Heater, b: Heater) => {
-        const name1 = a.name.toUpperCase()
-        const name2 = b.name.toUpperCase()
-        return (name1 < name2) ? -1 : (name1 > name2) ? 1 : 0
-      })
+
+      return r.sort((a, b) => a.name.localeCompare(b.name))
     }
     return []
   },
@@ -438,7 +435,7 @@ export const getters: GetterTree<PrinterState, RootState> = {
     const outputs = getters.getOutputs([
       'output_pin'
     ])
-    return outputs.sort((output: OutputPin) => output.pwm ? 1 : 1)
+    return outputs.sort((output: OutputPin) => output.pwm ? 1 : -1)
   },
 
   /**

src/store/version/getters.ts

@@ -16,12 +16,8 @@ export const getters: GetterTree<VersionState, RootState> = {
         r.key = k
         return r
       })
+      .sort((a, b) => a.key.localeCompare(b.key))
 
-    o.sort((a, b) => {
-      const name1 = a.key.toLowerCase()
-      const name2 = b.key.toLowerCase()
-      return (name1 < name2) ? -1 : (name1 > name2) ? 1 : 0
-    })
     return o
   },