From 196289325ad1747c42a8695a33a5df9cbdc0ae99 Mon Sep 17 00:00:00 2001 From: Christopher Loverich <1010084+cloverich@users.noreply.github.com> Date: Sun, 1 Dec 2024 17:11:59 -0800 Subject: [PATCH] fix null notes root - check for empty / null value when selecting new chronicles root - it implies the user clicked cancel --- src/preload/client/preferences.ts | 3 ++- src/views/preferences/index.tsx | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/preload/client/preferences.ts b/src/preload/client/preferences.ts index ef55fea..ca80a39 100644 --- a/src/preload/client/preferences.ts +++ b/src/preload/client/preferences.ts @@ -78,9 +78,10 @@ export class PreferencesClient { return new Promise<{ error?: string; value?: string }>( (resolve, reject) => { ipcRenderer.once("directory-selected", (event, arg) => { - console.log("directory-selected", arg); if (arg.error) { reject(arg.error); + } else if (!arg.value) { + resolve({ value: undefined }); } else { this.set("NOTES_DIR", arg.value); resolve(arg.value); diff --git a/src/views/preferences/index.tsx b/src/views/preferences/index.tsx index cf4046f..7cf250e 100644 --- a/src/views/preferences/index.tsx +++ b/src/views/preferences/index.tsx @@ -30,11 +30,11 @@ const Preferences = observer(() => { const client = useClient(); const navigate = useNavigate(); - async function openDialogNotesDir() { + async function selectNotesRoot() { store.loading = true; try { const result = await client.preferences.openDialogNotesDir(); - if (!result) { + if (!result?.value) { store.loading = false; return; } @@ -48,7 +48,7 @@ const Preferences = observer(() => { } } - async function openDialogImportDir() { + async function importDirectory() { store.loading = true; try { const result = await client.preferences.openDialogImportDir(); @@ -133,7 +133,7 @@ const Preferences = observer(() => { @@ -154,7 +154,7 @@ const Preferences = observer(() => {