Merge pull request #1891 from omnivore-app/fix/labels-to-add-event

Only publish labels to add to the pubsub queue

packages/api/src/elastic/labels.ts

@@ -57,7 +57,8 @@ export const addLabelInPage = async (
 export const updateLabelsInPage = async (
   pageId: string,
   labels: Label[],
-  ctx: PageContext
+  ctx: PageContext,
+  labelsToAdd?: Label[]
 ): Promise<boolean> => {
   try {
     const { body } = await client.update({
@@ -74,12 +75,16 @@ export const updateLabelsInPage = async (
     })
 
     if (body.result !== 'updated') return false
-
-    for (const label of labels) {
-      await ctx.pubsub.entityCreated<Label & { pageId: string }>(
-        EntityType.LABEL,
-        { pageId, ...label },
-        ctx.uid
+    if (labelsToAdd) {
+      // publish labels to be added
+      await Promise.all(
+        labelsToAdd.map((label) =>
+          ctx.pubsub.entityCreated<Label & { pageId: string }>(
+            EntityType.LABEL,
+            { pageId, ...label },
+            ctx.uid
+          )
+        )
       )
     }
 

packages/api/src/resolvers/labels/index.ts

@@ -243,12 +243,20 @@ export const setLabelsResolver = authorized<
         errorCodes: [SetLabelsErrorCode.NotFound],
       }
     }
-
+    // filter out labels that are already set
+    const labelsToAdd = labels.filter(
+      (label) => !page.labels?.some((pageLabel) => pageLabel.id === label.id)
+    )
     // update labels in the page
-    const updated = await updateLabelsInPage(pageId, labels, {
-      pubsub,
-      uid,
-    })
+    const updated = await updateLabelsInPage(
+      pageId,
+      labels,
+      {
+        pubsub,
+        uid,
+      },
+      labelsToAdd
+    )
     if (!updated) {
       return {
         errorCodes: [SetLabelsErrorCode.NotFound],