prehistoric-systems/omnivore
1
0
Fork 0
mirror of https://github.com/omnivore-app/omnivore.git synced 2026-03-11 08:54:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #613 from omnivore-app/fix/update-label-result

Browse source 
Fix UpdateLabelResult undefined
This commit is contained in:
Jackson Harper 2022-05-13 09:02:41 -07:00 committed by GitHub
commit 0b49dbb022
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
packages/api/src/resolvers/function_resolvers.ts
View file

@ -553,4 +553,5 @@ export const functionResolvers = {
...resultResolveTypeResolver('Search'),
...resultResolveTypeResolver('Subscriptions'),
...resultResolveTypeResolver('Unsubscribe'),
...resultResolveTypeResolver('UpdateLabel'),
}

22
packages/api/src/resolvers/labels/index.ts
View file

@ -278,9 +278,9 @@ export const updateLabelResolver = authorized<
}
}
const label = await getRepository(Label).findOne({
where: { id: labelId },
relations: ['user'],
const label = await getRepository(Label).findOneBy({
id: labelId,
user: { id: uid },
})
if (!label) {
return {
@ -297,14 +297,12 @@ export const updateLabelResolver = authorized<
const result = await AppDataSource.transaction(async (t) => {
await setClaims(t, uid)
return t.getRepository(Label).update(
{ id: labelId },
{
name: name,
description: description || undefined,
color: color,
}
)
label.name = name
label.color = color
label.description = description || undefined
label.createdAt = new Date()
return t.getRepository(Label).update({ id: labelId }, label)
})
if (!result.affected) {
@ -314,7 +312,7 @@ export const updateLabelResolver = authorized<
}
}
return { label: label }
return { label }
} catch (error) {
log.error('error updating label', error)
return {