From 4b85251c00d0bb5a3c4d5e27260404674d516a6a Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Wed, 19 Apr 2023 15:53:30 +0800
Subject: [PATCH 1/3] Add labels and state to save api in web frontend

---
 packages/web/pages/api/save.ts | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/web/pages/api/save.ts b/packages/web/pages/api/save.ts
index a43e6ccb7..d3474a494 100644
--- a/packages/web/pages/api/save.ts
+++ b/packages/web/pages/api/save.ts
@@ -3,7 +3,12 @@ import { v4 as uuidv4 } from 'uuid'
 import { SaveResponseData } from '../../lib/networking/mutations/saveUrlMutation'
 import { ssrFetcher } from '../../lib/networking/networkHelpers'
 
-const saveUrl = async (req: NextApiRequest, url: URL) => {
+const saveUrl = async (
+  req: NextApiRequest,
+  url: URL,
+  labels: string[] | undefined,
+  state: string | undefined
+) => {
   const clientRequestId = uuidv4()
   const mutation = `
     mutation SaveUrl($input: SaveUrlInput!) {
@@ -26,6 +31,8 @@ const saveUrl = async (req: NextApiRequest, url: URL) => {
         clientRequestId,
         url: url.toString(),
         source: 'api-save-url',
+        labels: labels?.map((label) => ({ name: label })),
+        state,
       },
     })
 
@@ -47,8 +54,10 @@ export default async (
   res: NextApiResponse
 ): Promise<void> => {
   const urlStr = req.query['url']
+  const labels = req.query['labels'] as string[] | undefined
+  const state = req.query['state'] as string | undefined
   const url = new URL(urlStr as string)
-  const saveResult = await saveUrl(req, url)
+  const saveResult = await saveUrl(req, url, labels, state)
   console.log('saveResult: ', saveResult)
   if (saveResult?.url) {
     res.redirect(`?url=${encodeURIComponent(url.toString())}`)

From 16a058dc26b60bfde2671128cd7fc576fd8dd7a9 Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Thu, 20 Apr 2023 09:31:41 +0800
Subject: [PATCH 2/3] Fix redirect

---
 packages/web/pages/api/save.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/web/pages/api/save.ts b/packages/web/pages/api/save.ts
index d3474a494..87e8bfbe7 100644
--- a/packages/web/pages/api/save.ts
+++ b/packages/web/pages/api/save.ts
@@ -54,13 +54,16 @@ export default async (
   res: NextApiResponse
 ): Promise<void> => {
   const urlStr = req.query['url']
+  if (req.query['labels'] && typeof req.query['labels'] === 'string') {
+    req.query['labels'] = [req.query['labels']]
+  }
   const labels = req.query['labels'] as string[] | undefined
   const state = req.query['state'] as string | undefined
   const url = new URL(urlStr as string)
   const saveResult = await saveUrl(req, url, labels, state)
   console.log('saveResult: ', saveResult)
-  if (saveResult?.url) {
-    res.redirect(`?url=${encodeURIComponent(url.toString())}`)
+  if (saveResult) {
+    res.redirect(`/article?url=${encodeURIComponent(url.toString())}`)
     return
   }
 

From 5ce4bf71716a01eb2cd2434b5adbef33d17f95b2 Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Thu, 20 Apr 2023 09:38:04 +0800
Subject: [PATCH 3/3] Compare labels with lower cased

---
 packages/api/src/services/labels.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/api/src/services/labels.ts b/packages/api/src/services/labels.ts
index 102265155..b2251b57a 100644
--- a/packages/api/src/services/labels.ts
+++ b/packages/api/src/services/labels.ts
@@ -129,8 +129,12 @@ export const createLabels = async (
     })
     .getMany()
 
-  const existingLabels = labelEntities.map((l) => l.name)
-  const newLabels = labels.filter((l) => !existingLabels.includes(l.name))
+  const existingLabelsInLowerCase = labelEntities.map((l) =>
+    l.name.toLowerCase()
+  )
+  const newLabels = labels.filter(
+    (l) => !existingLabelsInLowerCase.includes(l.name.toLowerCase())
+  )
   // create new labels
   const newLabelEntities = await getRepository(Label).save(
     newLabels.map((l) => ({