Skip to content

A self-hosted media server and file management system

chore: code smells

aminnausin1d33faa16d89
diff --git a/resources/js/components/dashboard/DashboardLibraries.vue b/resources/js/components/dashboard/DashboardLibraries.vue
index 5d42c5e6..630fdb5f 100644
--- a/resources/js/components/dashboard/DashboardLibraries.vue
+++ b/resources/js/components/dashboard/DashboardLibraries.vue
@@ -179,7 +179,7 @@ const handleStartScan = async () => {
try {
await startScanFilesTask(stateLibraryId.value > 0 ? stateLibraryId.value : undefined);
- const scanMessage = `Submitted scan request${cachedLibrary.value?.name ? ` for ${cachedLibrary.value.name}` : ''}!`;
+ const scanMessage = 'Submitted scan request' + (cachedLibrary.value?.name ? ` for ${cachedLibrary.value.name}!` : '!');
toast.add('Success', { type: 'success', description: scanMessage });
} catch (error) {
diff --git a/resources/js/service/sort/baseSort.ts b/resources/js/service/sort/baseSort.ts
index 059a8ec6..afbc6eee 100644
--- a/resources/js/service/sort/baseSort.ts
+++ b/resources/js/service/sort/baseSort.ts
@@ -35,11 +35,13 @@ export function sortObjectNew<T>(keys: SortKey<T>[], direction: SortDir = 1) {
const valueA = key ? (a[key] ?? '') : undefined;
const valueB = key ? (b[key] ?? '') : undefined;
- let result: number = compareFn
- ? key
- ? (compareFn as (a: any, b: any) => number)(valueA, valueB)
- : (compareFn as (a: T, b: T) => number)(a, b)
- : defaultCompare(valueA, valueB);
+ let result: number;
+
+ if (!compareFn) {
+ result = defaultCompare(valueA, valueB);
+ } else {
+ result = key ? (compareFn as (a: any, b: any) => number)(valueA, valueB) : (compareFn as (a: T, b: T) => number)(a, b);
+ }
if (result !== 0) return result * direction;
}