Show due notes

src/constants/Note.ts

@@ -6,6 +6,7 @@ interface Note {
   title: string;
   createdTime: string;
   updatedTime: string;
+  dueTime: string;
 }
 
 export default Note;

src/constants/NoteSearchTypes.ts

@@ -5,6 +5,7 @@ enum NoteSearchTypes {
   Created,
   Modified,
   Related,
+  Due,
 }
 
 export default NoteSearchTypes;

src/constants/Settings.ts

@@ -1,5 +1,6 @@
 export const SHOW_CALENDAR_BUTTON = "showCalendarToggleOnToolbar";
 export const SHOW_MODIFIED_NOTES = "showModifiedNotes";
+export const SHOW_DUE_NOTES = "showDueNotes";
 export const SHOW_RELATED_NOTES = "showRelatedNotes";
 export const WEEK_START_DAY = "weekStartDay";
 

src/gui/NoteList/NoteList.tsx

@@ -84,6 +84,7 @@ function NoteList(props: NoteListProps) {
     if (message.type === MsgType.NoteChanged) {
       refetchCreatedNotes();
       refetchModifiedNotes();
+      refetchDueNotes();
       refetchRelatedNotes();
       refetchSelectedNote();
     }
@@ -119,6 +120,19 @@ function NoteList(props: NoteListProps) {
     enabled: noteSearchTypes.includes(NoteSearchTypes.Modified),
   });
 
+  const { data: dueNotesData, refetch: refetchDueNotes } = useQuery<Note[]>({
+    queryKey: ["notes", "due", currentDate.toISOString()],
+    queryFn: async () => {
+      console.debug(`Requesting notes for ${currentDate.toLocaleString()}`);
+      return await webviewApi.postMessage({
+        type: MsgType.GetNotes,
+        currentDate: currentDate.toISOString(),
+        noteSearchTypes: [NoteSearchTypes.Due],
+      });
+    },
+    enabled: noteSearchTypes.includes(NoteSearchTypes.Due),
+  });
+
   const { data: relatedNotesData, refetch: refetchRelatedNotes } = useQuery<
     Note[]
   >({
@@ -215,6 +229,22 @@ function NoteList(props: NoteListProps) {
             />
           </>
         )}
+
+        {noteSearchTypes.includes(NoteSearchTypes.Dued) && (
+          <>
+            <NoteTypeHeader>Due Notes</NoteTypeHeader>
+            <NoteListItems
+              notes={dueNotesData ?? []}
+              selectedNoteId={selectedNote?.id}
+              sortBy={sortBy}
+              sortDirection={sortDirection}
+              key={`DuedNotes:{currentDate.toISOString()}`}
+              primaryTextStrategy={(note) =>
+                `${moment(note.dueTime).format("LT")}`
+              }
+            />
+          </>
+        )}
       </ListContainer>
     </>
   );

src/gui/hooks/useNoteSearchTypes.ts

@@ -1,8 +1,9 @@
 import NoteSearchTypes from "@constants/NoteSearchTypes";
-import MsgType from "@constants/messageTypes";
-import { useEffect, useState } from "react";
-import useWebviewApiOnMessage from "./useWebViewApiOnMessage";
-import { SHOW_MODIFIED_NOTES, SHOW_RELATED_NOTES } from "@constants/Settings";
+import {
+  SHOW_DUE_NOTES,
+  SHOW_MODIFIED_NOTES,
+  SHOW_RELATED_NOTES,
+} from "@constants/Settings";
 import useOnSettingsChange from "./useOnSettingsChange";
 
 /**
@@ -15,6 +16,7 @@ function useNoteSearchTypes() {
     SHOW_MODIFIED_NOTES,
     false
   );
+  const showDueNotes = useOnSettingsChange<boolean>(SHOW_DUE_NOTES, true);
   const showRelatedNotes = useOnSettingsChange<boolean>(
     SHOW_RELATED_NOTES,
     false
@@ -26,6 +28,9 @@ function useNoteSearchTypes() {
   if (showModifiedNotes) {
     noteSearchTypes.push(NoteSearchTypes.Modified);
   }
+  if (showDueNotes) {
+    noteSearchTypes.push(NoteSearchTypes.Due);
+  }
   if (showRelatedNotes) {
     noteSearchTypes.push(NoteSearchTypes.Related);
   }

src/handlers/GetMonthStatistics.ts

@@ -3,6 +3,7 @@ import MonthStatistics from "@constants/MonthStatistics";
 import {
   getCreatedNotesForDay,
   getModifiedNotesForDay,
+  getDueNotesForDay,
   getRelatedNotesForDay,
 } from "./GetNotesForDay";
 import Note from "@constants/Note";
@@ -63,6 +64,12 @@ export async function getMonthModifiedNoteStatistics(
   return getMonthStatistics(date, getModifiedNotesForDay);
 }
 
+export async function getMonthDueNoteStatistics(
+  date: moment.Moment
+): Promise<MonthStatistics> {
+  return getMonthStatistics(date, getDueNotesForDay);
+}
+
 export async function getMonthRelatedNoteStatistics(
   date: moment.Moment
 ): Promise<MonthStatistics> {

src/handlers/GetNearestDayWithNote.ts

@@ -32,7 +32,13 @@ async function getNearestDayWithNote(
   }
 
   const response = await joplin.data.get(["search"], {
-    fields: ["id", "title", "user_created_time", "user_updated_time"],
+    fields: [
+      "id",
+      "title",
+      "user_created_time",
+      "user_updated_time",
+      "due_time",
+    ],
     limit: 1,
     order_by: orderByTerm,
     order_dir: direction === "past" ? "DESC" : "ASC",
@@ -114,7 +120,13 @@ export async function getNearestDayWithRelatedNote(
     const dateString = workingDate.format(dateFormat);
 
     const response = await joplin.data.get(["search"], {
-      fields: ["id", "title", "user_created_time", "user_updated_time"],
+      fields: [
+        "id",
+        "title",
+        "user_created_time",
+        "user_updated_time",
+        "due_time",
+      ],
       limit: 1,
       query: `title:/"${dateString}"`,
     });

src/handlers/GetNotesForDay.ts

@@ -23,7 +23,13 @@ async function getNotesForDay(date: moment.Moment, operatorTerm: string) {
   let paginatedResponse: Record<string, any>;
   do {
     paginatedResponse = await joplin.data.get(["search"], {
-      fields: ["id", "title", "user_created_time", "user_updated_time"],
+      fields: [
+        "id",
+        "title",
+        "user_created_time",
+        "user_updated_time",
+        "due_time",
+      ],
       query: `${operatorTerm}:${fromDate} -${operatorTerm}:${toDate}`,
       page: page,
     });
@@ -45,6 +51,10 @@ export async function getModifiedNotesForDay(date: moment.Moment) {
   return getNotesForDay(date, "updated");
 }
 
+export async function getDueNotesForDay(date: moment.Moment) {
+  return getNotesForDay(date, "due");
+}
+
 /**
  * Gets list of related notes for a specific day.
  * Related notes are notes that have the day in the title.
@@ -58,7 +68,13 @@ export async function getRelatedNotesForDay(date: moment.Moment) {
   let paginatedResponse: Record<string, any>;
   do {
     paginatedResponse = await joplin.data.get(["search"], {
-      fields: ["id", "title", "user_created_time", "user_updated_time"],
+      fields: [
+        "id",
+        "title",
+        "user_created_time",
+        "user_updated_time",
+        "due_time",
+      ],
       query: `title:/"${dateString}"`,
       page: page,
     });

src/handlers/PanelMessageHandler.ts

@@ -9,11 +9,13 @@ import {
 import {
   getMonthCreatedNoteStatistics,
   getMonthModifiedNoteStatistics,
+  getMonthDueNoteStatistics,
   getMonthRelatedNoteStatistics,
 } from "./GetMonthStatistics";
 import {
   getCreatedNotesForDay,
   getModifiedNotesForDay,
+  getDueNotesForDay,
   getRelatedNotesForDay,
 } from "./GetNotesForDay";
 import NoteSearchTypes from "@constants/NoteSearchTypes";
@@ -51,6 +53,11 @@ async function handleGetNotes(message) {
       ))
     );
   }
+  if (noteTypes.includes(NoteSearchTypes.Due)) {
+    notes.push(
+      ...(await getDueNotesForDay(moment(message.currentDate, moment.ISO_8601)))
+    );
+  }
   if (noteTypes.includes(NoteSearchTypes.Related)) {
     notes.push(
       ...(await getRelatedNotesForDay(

src/handlers/Transforms.ts

@@ -20,5 +20,6 @@ export function convertEpochDateInNoteToIsoString(note: Note): Note {
     ...note,
     createdTime: moment(note.createdTime).toISOString(),
     updatedTime: moment(note.updatedTime).toISOString(),
+    dueTime: moment(note.dueTime).toISOString(),
   };
 }