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

Update labels for both pages and highlights

Browse source
This commit is contained in:
Hongbo Wu 2022-06-08 17:39:38 +08:00
parent 7c840f5b1e
commit 2dcab66af2
2 changed files with 34 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
packages/api/src/elastic/labels.ts
View file

@ -95,7 +95,6 @@ export const updateLabelsInPage = async (
}
export const deleteLabel = async (
userId: string,
label: string,
ctx: PageContext
): Promise<boolean> => {
@ -119,7 +118,7 @@ export const deleteLabel = async (
bool: {
must: {
term: {
userId,
userId: ctx.uid,
},
},
should: [
@ -167,7 +166,7 @@ export const deleteLabel = async (
}
}
export const updateLabelInPage = async (
export const updateLabel = async (
label: Label,
ctx: PageContext
): Promise<boolean> => {
@ -176,8 +175,14 @@ export const updateLabelInPage = async (
index: INDEX_ALIAS,
body: {
script: {
source: `ctx._source.labels.removeIf(l -> l.id == params.label.id);
ctx._source.labels.add(params.label)`,
source: `if (ctx._source.labels != null) {
ctx._source.labels.removeIf(l -> l.id == params.label.id);
ctx._source.labels.add(params.label)
}
if (ctx._source.highlights != null) {
ctx._source.highlights[0].labels.removeIf(l -> l.id == params.label.id);
ctx._source.highlights[0].labels.add(params.label)
}`,
lang: 'painless',
params: {
label: label,
@ -185,12 +190,12 @@ export const updateLabelInPage = async (
},
query: {
bool: {
filter: [
{
term: {
userId: ctx.uid,
},
must: {
term: {
userId: ctx.uid,
},
},
should: [
{
nested: {
path: 'labels',
@ -201,7 +206,23 @@ export const updateLabelInPage = async (
},
},
},
{
nested: {
path: 'highlights',
query: {
nested: {
path: 'highlights.labels',
query: {
term: {
'highlights.labels.id': label.id,
},
},
},
},
},
},
],
minimum_should_match: 1,
},
},
},

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

@ -33,7 +33,7 @@ import { getPageById } from '../../elastic/pages'
import {
deleteLabel,
setLabelsForHighlight,
updateLabelInPage,
updateLabel,
updateLabelsInPage,
} from '../../elastic/labels'
import { getHighlightById } from '../../elastic/highlights'
@ -179,7 +179,7 @@ export const deleteLabelResolver = authorized<
}
// delete label in elastic pages and highlights
await deleteLabel(uid, labelId, {
await deleteLabel(labelId, {
pubsub: createPubSubClient(),
uid,
})
@ -322,15 +322,10 @@ export const updateLabelResolver = authorized<
}
}
const updated = await updateLabelInPage(label, {
await updateLabel(label, {
pubsub,
uid,
})
if (!updated) {
return {
errorCodes: [UpdateLabelErrorCode.BadRequest],
}
}
return { label }
} catch (error) {