Merge pull request #783 from cbkadel/fix/finish-and-next-not-finding-note

Fix "Finish + Next" toolbar button not detecting the open project note

Author: jgclark

helpers/NPEditor.js

@@ -257,6 +257,9 @@ export function isNoteOpenInEditor(filename: string): boolean {
  */
 export async function getFirstRegularNoteAmongOpenEditors(): Promise<?TNote> {
   try {
+    if (Editor && Editor.type === 'Notes' && Editor.filename) {
+      return Editor
+    }
     const focusedNote = Editor?.note
     if (focusedNote && focusedNote.type === 'Notes') {
       return focusedNote
@@ -586,4 +589,4 @@ export function highlightSelectionInEditor(paras: Array<TParagraph>): void {
   } else {
     logWarn('highlightSelectionInEditor', `- could not highlight automatic block selection range for ${paras.length} paragraphs. firstStartCharIndex=${String(firstStartCharIndex)}, lastEndCharIndex=${String(lastEndCharIndex)}`)
   }
-}
+}

jgclark.Reviews/src/pluginToHTMLBridge.js

@@ -6,6 +6,7 @@
 
 import pluginJson from '../plugin.json'
 import { resolveProjectNoteFromListFilename } from './allProjectsListHelpers'
+import { getReviewSettings } from './reviewHelpers'
 import {
   addProgressUpdate,
   cancelProject,
@@ -430,12 +431,14 @@ export async function bridgeClickProjectListItem(data: MessageDataObject | any)
         if (filenameToOpen !== filename) {
           logInfo('bridgeClickProjectListItem', `-> showNoteInEditorFromFilename: list had '${filename}', opening current path '${filenameToOpen}'`)
         }
-        const openedNewSplit = openNoteInSplitViewIfNotOpenAlready(filenameToOpen, 'bridgeClickProjectListItem')
-        if (openedNewSplit) {
-          logDebug('bridgeClickProjectListItem', `-> opened or triggered split for filename ${filenameToOpen}`)
-        } else {
-          logDebug('bridgeClickProjectListItem', `-> focused existing editor or no-op for filename ${filenameToOpen}`)
-        }
+    const config = await getReviewSettings()
+    if (config?.preferredWindowType === 'Main Window') {
+      const openedNewSplit = openNoteInSplitViewIfNotOpenAlready(filenameToOpen, 'bridgeClickProjectListItem')
+      logDebug('bridgeClickProjectListItem', openedNewSplit ? `-> opened or triggered split for filename ${filenameToOpen}` : `-> focused existing editor or no-op for filename ${filenameToOpen}`)
+    } else {
+      const openedInMain = await Editor.openNoteByFilename(filenameToOpen)
+      logDebug('bridgeClickProjectListItem', openedInMain ? `-> opened filename ${filenameToOpen} in main Editor` : `-> couldn't open filename ${filenameToOpen} in main Editor`)
+    }
         break
       }
       case 'showLineInEditorFromFilename': {

jgclark.Reviews/src/reviewsActions.js

@@ -402,7 +402,7 @@ export async function finishReviewAndStartNextReview(
     const config: ?ReviewConfig = await getReviewSettings()
     if (!config) throw new Error('No config found. Stopping.')
 
-    const noteToFinish: ?TNote = noteArg ?? (await getFirstRegularNoteAmongOpenEditors())
+    const noteToFinish: ?TNote = noteArg || (await getFirstRegularNoteAmongOpenEditors())
     if (!noteToFinish) {
       logWarn('finishReviewAndStartNextReview', `- There's no project note in any open Editor pane to finish reviewing.`)
       await showMessage(`No open editor pane has a project note to finish reviewing. Open the project note (or focus it) and try again.`, 'OK, thanks', 'Reviews')