feat: fix conflict bug

microvoid · Mar 29, 2023 · 63cbfc3 · 63cbfc3
1 parent 78f33a9
commit 63cbfc3
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 13 deletions.
diff --git a/src/common/components/content-panel.tsx b/src/common/components/content-panel.tsx
@@ -92,19 +92,26 @@ const ContentPanel = (props: IContentPanelProps) => {
     setPromptType(p || promptType || query)
     setResult("")
     setSending(true)
-    await sendNotionPostToBackground({
-      prompt: query,
-      context: selectionText,
-      promptType: p || promptType,
-      onProgress: (e: IPostNotionProgress) => {
-        resultTemp += e.value.completion
-        if (!e.done) {
-          setResult(resultTemp)
-        } else {
-          setSending(false)
+
+    try {
+      await sendNotionPostToBackground({
+        prompt: query,
+        context: selectionText,
+        promptType: p || promptType,
+        onProgress: (e: IPostNotionProgress) => {
+          resultTemp += e.value.completion
+          if (!e.done) {
+            setResult(resultTemp)
+          } else {
+            setSending(false)
+          }
         }
-      }
-    })
+      })
+    } catch (error) {
+      console.log(error, "error")
+      showToast(t("MessageProcessing"))
+    }
+
     setSending(false)
   }
 
@@ -186,7 +193,7 @@ const ContentPanel = (props: IContentPanelProps) => {
               className="pl-12 pr-12 input input-bordered w-full rounded-none box-border h-12"
               style={{
                 outline: "none",
-                minWidth: "700px"
+                minWidth: "900px"
               }}
               placeholder={t("AskInputPlaceholder") as string}
               onChange={(event) => {

diff --git a/src/lib/notion.ts b/src/lib/notion.ts
@@ -31,6 +31,10 @@ export const sendNotionPostToBackground = ({
   prompt?: string
   onProgress: (data: IPostNotionProgress) => void
 }) => {
+  if (onProgressHandler) {
+    return Promise.reject("posting")
+  }
+
   onProgressHandler = onProgress
   postNotionAddEventListener()
   return new Promise(async (resolve) => {