Add command for toggling filter by notebook

rsandz · Jun 24, 2024 · a872af1 · a872af1
1 parent d7e8794
commit a872af1
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 3 deletions.
diff --git a/src/commands.ts b/src/commands.ts
@@ -1,6 +1,8 @@
+import { FILTER_NOTES_BY_NOTEBOOK } from "@constants/Settings";
 import joplin from "api";
 
 export const TOGGLE_CALENDAR_COMMAND = "toggleCalendar";
+export const FILTER_BY_NOTEBOOK_COMMAND = "filterNotesByNotebook";
 
 export async function registerCommands(panelHandle: string) {
   await joplin.commands.register({
@@ -16,6 +18,22 @@ export async function registerCommands(panelHandle: string) {
     },
   });
 
+  await joplin.commands.register({
+    name: FILTER_BY_NOTEBOOK_COMMAND,
+    label: "Toggle Filter by Notebook",
+    iconName: "fas fa-filter",
+    execute: async () => {
+      const currentSetting = await joplin.settings.value(
+        FILTER_NOTES_BY_NOTEBOOK
+      );
+      if (currentSetting) {
+        await joplin.settings.setValue(FILTER_NOTES_BY_NOTEBOOK, false);
+      } else {
+        await joplin.settings.setValue(FILTER_NOTES_BY_NOTEBOOK, true);
+      }
+    },
+  });
+
   joplin.views.menus.create("calendar-menu", "Calendar", [
     {
       label: "Toggle Calendar",

diff --git a/src/gui/NoteList/NoteList.tsx b/src/gui/NoteList/NoteList.tsx
@@ -84,7 +84,10 @@ function NoteList(props: NoteListProps) {
 
   useWebviewApiOnMessage((data) => {
     const message = data.message;
-    if (message.type === MsgType.NoteChanged) {
+    if (
+      message.type === MsgType.NoteChanged ||
+      message.type === MsgType.SettingChanged
+    ) {
       refetchCreatedNotes();
       refetchModifiedNotes();
       refetchRelatedNotes();

diff --git a/src/gui/hooks/useGetMonthStatistics.ts b/src/gui/hooks/useGetMonthStatistics.ts
@@ -5,6 +5,7 @@ import { useQuery } from "@tanstack/react-query";
 import { Moment } from "moment";
 import useSelectedNote from "./useSelectedNote";
 import { useEffect, useState } from "react";
+import useWebviewApiOnMessage from "./useWebViewApiOnMessage";
 
 function useGetMonthStatistics(
   month: Moment,
@@ -32,6 +33,13 @@ function useGetMonthStatistics(
     }
   });
 
+  useWebviewApiOnMessage((data) => {
+    const message = data.message;
+    if (message.type === MsgType.SettingChanged) {
+      refetch();
+    }
+  });
+
   return { data, refetch };
 }
 

diff --git a/src/gui/hooks/useSelectedNote.ts b/src/gui/hooks/useSelectedNote.ts
@@ -16,7 +16,10 @@ function useSelectedNote() {
 
   useWebviewApiOnMessage((data) => {
     const message = data.message;
-    if (message.type === MsgType.NoteChanged) {
+    if (
+      message.type === MsgType.NoteChanged ||
+      message.type === MsgType.SettingChanged
+    ) {
       refetch();
     }
   });

diff --git a/src/settings.ts b/src/settings.ts
@@ -10,6 +10,7 @@ import {
   WeekStartDay,
 } from "@constants/Settings";
 import { getDateFormat } from "./handlers/GlobalSettings";
+import { FILTER_BY_NOTEBOOK_COMMAND } from "./commands";
 
 const SETTINGS_SECTION_ID = "joplinCalendarSection";
 
@@ -54,7 +55,8 @@ export async function registerSettings() {
     [FILTER_NOTES_BY_NOTEBOOK]: {
       label: "Filter Notes by Notebook",
       description: `If enabled, the note list will only show notes in the selected notebook.  
-      Note: Selecting "All Notes" will NOT show notes from all note books, just the previously selected one.`,
+      Note: Selecting "All Notes" will NOT show notes from all note books, just the previously selected one.
+      This setting can also be toggled using the ${FILTER_BY_NOTEBOOK_COMMAND} command.`,
       public: true,
       type: SettingItemType.Bool,
       value: false,