fix: show message when upload a non-task block to todoist

haydenull · Jul 9, 2022 · c5497ce · c5497ce
1 parent 5903f2e
commit c5497ce
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/helper/transform.tsx b/src/helper/transform.tsx
@@ -104,7 +104,7 @@ export const transformBlockToEvent = async (block: BlockEntity, settings: ISetti
   const time = getEventTimeInfo(block)
   const pomodoros = getPomodoroInfo(block.content, block.format)
   const isMilestone = judgeIsMilestone(block)
-  const projectPage = block.refs.find(ref => ref.originalName === block.properties?.project?.[0])
+  const projectPage = block.refs?.find(ref => ref.originalName === block.properties?.project?.[0])
   const isJournal = projectPage
                       ? Boolean(projectPage?.journalDay)
                       : Boolean(page?.journalDay)

diff --git a/src/main.tsx b/src/main.tsx
@@ -130,9 +130,9 @@ if (isDevelopment) {
         const settings = getInitalSettings()
         const { todoist } = settings
         const block = await logseq.Editor.getBlock(uuid)
+        if (!block?.marker) return logseq.App.showMsg('This block is not a task', 'error')
+        if (block?.properties?.todoistId) return logseq.App.showMsg('This task has already been uploaded,\nplease do not upload it again', 'error')
         const event = await transformBlockToEvent(block!, settings)
-        if (!event.marker) return logseq.App.showMsg('This block is not a task', 'error')
-        if (event.properties?.todoistId) return logseq.App.showMsg('This task has already been uploaded', 'warning')
 
         let params: AddTaskArgs = { content: event.addOns.contentWithoutTime?.split('\n')?.[0] }
         if (event.addOns.allDay === true) params.dueDate = dayjs(event.addOns.start).format('YYYY-MM-DD')