Skip to content

A self-hosted media server and file management system

chore: code smells

aminnausin222b79efa57f
diff --git a/resources/js/service/sort/baseSort.ts b/resources/js/service/sort/baseSort.ts
index d6eec83b..c8466e58 100644
--- a/resources/js/service/sort/baseSort.ts
+++ b/resources/js/service/sort/baseSort.ts
@@ -13,10 +13,10 @@ export function sortObject<T>(column: keyof T, direction: SortDir = 1, dateColum
return (dateB.getTime() - dateA.getTime()) * direction;
}
- const numA = parseFloat(valueA as any);
- const numB = parseFloat(valueB as any);
+ const numA = Number.parseFloat(valueA as any);
+ const numB = Number.parseFloat(valueB as any);
- if (!isNaN(numA) && !isNaN(numB)) {
+ if (!Number.isNaN(numA) && !Number.isNaN(numB)) {
return (numA - numB) * direction;
}
return String(valueA).toLowerCase().replace(/\s+/g, ' ').localeCompare(String(valueB).toLowerCase().replace(/\s+/g, ' ')) * direction;
@@ -45,16 +45,16 @@ export function sortObjectNew<T extends { id?: any }>(keys: SortKey<T>[], direct
}
function defaultCompare(a: any, b: any): number {
- const numA = parseFloat(a);
- const numB = parseFloat(b);
+ const numA = Number.parseFloat(a);
+ const numB = Number.parseFloat(b);
- if (!isNaN(numA) && !isNaN(numB)) {
+ if (!Number.isNaN(numA) && !Number.isNaN(numB)) {
return numA - numB;
}
const dateA = new Date(a);
const dateB = new Date(b);
- if (!isNaN(dateA.getTime()) && !isNaN(dateB.getTime())) {
+ if (!Number.isNaN(dateA.getTime()) && !Number.isNaN(dateB.getTime())) {
return dateA.getTime() - dateB.getTime();
}
diff --git a/resources/js/service/sort/strategies.ts b/resources/js/service/sort/strategies.ts
index 85f5914a..399c0942 100644
--- a/resources/js/service/sort/strategies.ts
+++ b/resources/js/service/sort/strategies.ts
@@ -7,7 +7,8 @@ export const CompareStrategies: { [key: string]: (a: any, b: any) => number } =
const result = strA.localeCompare(strB, 'en', { sensitivity: 'base' });
if (result !== 0) return result;
// tiebreaker
- return strA < strB ? -1 : strA > strB ? 1 : 0;
+ if (strA < strB) return -1;
+ return strA > strB ? 1 : 0;
},
date: (a: any, b: any) => {