From 37a0cfa36bb34f3d2c00138cd3d646adb0c3693c Mon Sep 17 00:00:00 2001 From: Gregor Becker Date: Tue, 26 Nov 2024 17:16:28 +0100 Subject: [PATCH 1/2] fix(pinia-orm): Ordering sometimes wrong with Query.orderBy and UseCollect.sortBy --- packages/pinia-orm/src/support/Utils.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/pinia-orm/src/support/Utils.ts b/packages/pinia-orm/src/support/Utils.ts index 0b8e13bc..2cb3cd8b 100644 --- a/packages/pinia-orm/src/support/Utils.ts +++ b/packages/pinia-orm/src/support/Utils.ts @@ -83,6 +83,7 @@ export function orderBy ( const result = collection.map>((value) => { const criteria = iteratees.map((iteratee) => { if (typeof iteratee === 'function') { return iteratee(value) } + if (!iteratee.includes('.') && !isDate(value[iteratee])) { return value[iteratee]} const newValue = getValue(value, iteratee, false) return isDate(newValue) ? new Date(newValue).getTime() : newValue }) From 9279eb2e2932eaddf7cf5ffe9422491ad26904a7 Mon Sep 17 00:00:00 2001 From: Gregor Becker Date: Tue, 26 Nov 2024 17:21:11 +0100 Subject: [PATCH 2/2] refactor(pinia-orm): linting --- packages/pinia-orm/src/support/Utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pinia-orm/src/support/Utils.ts b/packages/pinia-orm/src/support/Utils.ts index 2cb3cd8b..840c91ba 100644 --- a/packages/pinia-orm/src/support/Utils.ts +++ b/packages/pinia-orm/src/support/Utils.ts @@ -83,7 +83,7 @@ export function orderBy ( const result = collection.map>((value) => { const criteria = iteratees.map((iteratee) => { if (typeof iteratee === 'function') { return iteratee(value) } - if (!iteratee.includes('.') && !isDate(value[iteratee])) { return value[iteratee]} + if (!iteratee.includes('.') && !isDate(value[iteratee])) { return value[iteratee] } const newValue = getValue(value, iteratee, false) return isDate(newValue) ? new Date(newValue).getTime() : newValue })