feat: suport WAITING task status, #17

ahonn · Oct 14, 2022 · f0869b3 · f0869b3
1 parent 5f069c1
commit f0869b3
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/src/api.ts b/src/api.ts
@@ -1,6 +1,11 @@
 import dayjs from 'dayjs';
 import { TaskEntityObject, TaskMarker } from './models/TaskEntity';
 
+export const MARKER_GROUPS: Record<string, TaskMarker[]> = {
+  [TaskMarker.TODO]: [TaskMarker.TODO, TaskMarker.DOING, TaskMarker.DONE],
+  [TaskMarker.LATER]: [TaskMarker.LATER, TaskMarker.NOW, TaskMarker.DONE],
+}
+
 export function isTodayTask(task: TaskEntityObject) {
   const { scheduled } = task;
   if (!scheduled) return false;
@@ -44,10 +49,16 @@ export function openTaskPage(page: TaskEntityObject['page'], opts?: IOpenTaskOpt
 
 export async function toggleTaskMarker(task: TaskEntityObject, options: IToggleOptions) {
   const { uuid, rawContent, marker } = task;
-  let newMarker = marker === TaskMarker.TODO ? TaskMarker.DOING : TaskMarker.TODO;
-  if (options.preferredTodo === TaskMarker.LATER) {
-    newMarker = marker === TaskMarker.LATER ? TaskMarker.NOW : TaskMarker.LATER;
+
+  let newMarker = marker;
+  if (marker === TaskMarker.WAITING) {
+    newMarker = options.preferredTodo === TaskMarker.LATER ? TaskMarker.LATER : TaskMarker.TODO;
+  } else {
+    const markerGroup = MARKER_GROUPS[options.preferredTodo];
+    const currentMarkIndex = markerGroup.findIndex(m => m === marker);
+    newMarker = markerGroup[(currentMarkIndex + 1) % markerGroup.length];
   }
+
   const newRawContent = rawContent.replace(new RegExp(`^${marker}`), newMarker);
   await window.logseq.Editor.updateBlock(uuid, newRawContent);
 }

diff --git a/src/models/TaskEntity.ts b/src/models/TaskEntity.ts
@@ -8,6 +8,7 @@ export enum TaskMarker {
   TODO = 'TODO',
   DOING = 'DOING',
   DONE = 'DONE',
+  WAITING = 'WAITING',
 }
 
 export enum TaskPriority {

diff --git a/src/querys/anytime.ts b/src/querys/anytime.ts
@@ -3,7 +3,7 @@ export default function getAnytimeTaskQuery() {
     [:find (pull ?b [*])
      :where
      [?b :block/marker ?marker]
-     [(contains? #{"NOW" "LATER" "TODO" "DOING"} ?marker)]
+     [(contains? #{"NOW" "LATER" "TODO" "DOING" "WAITING"} ?marker)]
      [?b :block/page ?p]
      (not [?p :block/journal? true])
      (not [?p :block/journalDay])

diff --git a/src/querys/scheduled.ts b/src/querys/scheduled.ts
@@ -6,7 +6,7 @@ export default function getScheduledTaskQuery() {
     [:find (pull ?b [*])
      :where
      [?b :block/marker ?marker]
-     [(contains? #{"NOW" "LATER" "TODO" "DOING"} ?marker)]
+     [(contains? #{"NOW" "LATER" "TODO" "DOING" "WAITING"} ?marker)]
      [?b :block/page ?p]
      (or
        [?b :block/scheduled ?d]

diff --git a/src/querys/today.ts b/src/querys/today.ts
@@ -6,7 +6,7 @@ export default function getTodayTaskQuery() {
     [:find (pull ?b [*])
      :where
      [?b :block/marker ?marker]
-     [(contains? #{"NOW" "LATER" "TODO" "DOING"} ?marker)]
+     [(contains? #{"NOW" "LATER" "TODO" "DOING" "WAITING"} ?marker)]
      [?b :block/page ?p]
      (or
        (and