mirror of
https://github.com/omnivore-app/omnivore.git
synced 2026-03-11 08:54:26 +00:00
Order labels by createdAt so they maintain a consistent order
This commit is contained in:
parent
f4a037677f
commit
2c15516d96
1 changed files with 11 additions and 4 deletions
|
|
@ -42,9 +42,16 @@ export const labelsResolver = authorized<LabelsSuccess, LabelsError>(
|
|||
})
|
||||
|
||||
try {
|
||||
const user = await User.findOne(uid, {
|
||||
relations: ['labels'],
|
||||
})
|
||||
const user = await getRepository(User)
|
||||
.createQueryBuilder("user")
|
||||
.innerJoinAndSelect(
|
||||
"user.labels",
|
||||
"labels",
|
||||
)
|
||||
.where("user.id = :uid", { uid })
|
||||
.orderBy("labels.createdAt", "DESC")
|
||||
.getOne()
|
||||
|
||||
if (!user) {
|
||||
return {
|
||||
errorCodes: [LabelsErrorCode.Unauthorized],
|
||||
|
|
@ -52,7 +59,7 @@ export const labelsResolver = authorized<LabelsSuccess, LabelsError>(
|
|||
}
|
||||
|
||||
return {
|
||||
labels: user.labels || [],
|
||||
labels: user.labels?.sort((a,b) => a.createdAt.getTime() - b.createdAt.getTime()) || [],
|
||||
}
|
||||
} catch (error) {
|
||||
log.error(error)
|
||||
|
|
|
|||
Loading…
Reference in a new issue