[fix] send task check incorrect

benjypng · Apr 22, 2023 · 92fe4d2 · 92fe4d2
1 parent ee90760
commit 92fe4d2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "logseq-todoist-plugin",
-  "version": "5.2.2",
+  "version": "5.2.3",
   "author": "hkgnp",
   "description": "Simple Todoist plugin to pull only active tasks from specified project, i.e. Inbox",
   "logseq": {

diff --git a/src/index.tsx b/src/index.tsx
@@ -1,7 +1,6 @@
 import "@logseq/libs";
 import handleListeners from "./utils/handleListeners";
 import callSettings from "./services/settings";
-
 import React from "react";
 import ReactDOM from "react-dom";
 import SendTask from "./components/SendTask";
@@ -23,31 +22,33 @@ async function main() {
       logseq.settings!;
     let content: string = (await logseq.Editor.getEditingBlockContent()).trim();
 
+    if (content === "") {
+      logseq.UI.showMsg("Task cannot be empty!", "error");
+      return;
+    }
+
     if (
-      sendDefaultProject !== "--- ---" ||
-      sendDefaultLabel !== "--- ---" ||
+      sendDefaultProject === "--- ---" ||
+      sendDefaultProject === "" ||
+      sendDefaultLabel === "--- ---" ||
+      sendDefaultLabel === "" ||
       sendDefaultDeadline
     ) {
+      ReactDOM.render(
+        <React.StrictMode>
+          <SendTask content={content} uuid={e.uuid} />
+        </React.StrictMode>,
+        document.getElementById("app")
+      );
+      logseq.showMainUI();
+    } else {
       await sendTaskToTodoist(
         e.uuid,
         content,
         getIdFromString(sendDefaultProject),
         getIdFromString(sendDefaultLabel),
         sendDefaultDeadline ? "today" : ""
       );
-    } else {
-      if (content === "") {
-        logseq.UI.showMsg("Task cannot be empty!", "error");
-        return;
-      } else {
-        ReactDOM.render(
-          <React.StrictMode>
-            <SendTask content={content} uuid={e.uuid} />
-          </React.StrictMode>,
-          document.getElementById("app")
-        );
-        logseq.showMainUI();
-      }
     }
   });