Projects-new-layout

__mocks__/Note.mock.js

@@ -13,6 +13,8 @@ import { textWithoutSyncedCopyTag } from '@helpers/syncedCopies'
 export class Note {
   // Explicitly define properties that are dynamically assigned
   content: string
+  /** Full note markdown when tests construct notes with `{ rawContent }` only */
+  rawContent: string = ''
   paragraphs: any[]
   // Properties
   backlinks: any[] = [] /* sample:  [ SOMETHING ], */
@@ -237,6 +239,12 @@ export class Note {
           this._content = value
           this.paragraphs = makeParagraphsFromContent(this._content)
         }
+      } else if (key === 'rawContent') {
+        this.rawContent = value
+        if (typeof value === 'string' && value !== '' && (data.content === undefined || data.content === '')) {
+          this._content = value
+          this.paragraphs = makeParagraphsFromContent(this._content)
+        }
       } else {
         this[key] = data[key]
       }

helpers/HTMLView.js

@@ -8,7 +8,7 @@ import showdown from 'showdown' // for Markdown -> HTML from https://github.com/
 import { hasFrontMatter } from '@helpers/NPFrontMatter'
 import { getFolderFromFilename } from '@helpers/folders'
 import { clo, logDebug, logError, logInfo, logWarn, JSP, timer } from '@helpers/dev'
-import { getStoredWindowRect, getWindowFromCustomId, isHTMLWindowOpen, storeWindowRect } from '@helpers/NPWindows'
+import { getStoredWindowRect, getWindowFromCustomId, getWindowIdFromCustomId, isHTMLWindowOpen, storeWindowRect } from '@helpers/NPWindows'
 import { generateCSSFromTheme, RGBColourConvert } from '@helpers/NPThemeToCSS'
 import { isTermInEventLinkHiddenPart, isTermInNotelinkOrURI, isTermInMarkdownPath } from '@helpers/paragraph'
 import { RE_EVENT_LINK, RE_SYNC_MARKER, formRegExForUsersOpenTasks } from '@helpers/regex'
@@ -146,6 +146,7 @@ export async function getNoteContentAsHTML(content: string, note: TNote): Promis
     // Make some necessary changes before conversion to HTML
     for (let i = 0; i < lines.length; i++) {
       // remove any sync link markers (blockIds)
+      // TODO: there's a helper function for this, I think.
       lines[i] = lines[i].replace(/\^[A-z0-9]{6}([^A-z0-9]|$)/g, '').trimRight()
 
       // change open tasks to GFM-flavoured task syntax
@@ -716,6 +717,7 @@ export async function sendToHTMLWindow(windowId: string, actionType: string, dat
 
     const windowExists = isHTMLWindowOpen(windowId)
     if (!windowExists) logWarn(`sendToHTMLWindow`, `Window ${windowId} does not exist; setting NPWindowID = undefined`)
+    // TEST: Not sure the comment about iphone/ipad is still relevant, but leaving it in for now.
     const windowIdToSend = windowExists ? windowId : undefined // for iphone/ipad you have to send undefined
 
     const dataWithUpdated = {

helpers/NPConfiguration.js

@@ -55,55 +55,79 @@ export async function initConfiguration(pluginJsonData: any): Promise<any> {
   return migrateData
 }
 
+/**
+ * Return the Default for a setting from plugin.json.
+ * Only return empty string when default is null/undefined, so false and 0 are preserved.
+ * @param {any} setting - single entry from plugin.settings
+ * @returns {any}
+ */
+function getDefaultValueForNewSetting(setting: any): any {
+  const d = setting?.default
+  return d === undefined || d === null ? '' : d
+}
+
 /**
  * Add new top-level keys to setting.json's data in the event plugin.settings object has been updated in a Plugin's plugin.json file.
  * @author @codedungeon
  * @param {any} pluginJsonData - plugin.json data for which plugin is being migrated
- * @return {number} update result (1 settings updated, 0 no update necessary, -1 update failed)
+ * @return {number} update result (1 settings updated, 0 no update necessary, -1 update failed or invalid pluginJsonData)
  */
 export function updateSettingData(pluginJsonData: any): number {
   let updateResult = 0
 
+  if (pluginJsonData == null || typeof pluginJsonData !== 'object' || Array.isArray(pluginJsonData)) {
+    logWarn(
+      'NPConfiguration/updateSettingData',
+      'Invalid pluginJsonData: expected a non-null object (not an array). Skipping settings migration.',
+    )
+    return -1
+  }
+
   const newSettings = {}
   const currentSettingData = DataStore.settings
 
   const pluginSettings = pluginJsonData.hasOwnProperty('plugin.settings') ? pluginJsonData['plugin.settings'] : []
+  // clo(pluginSettings, `pluginSettings`)
   pluginSettings.forEach((setting) => {
-    const key: any = setting?.key || null
-    if (key) {
+    const key: any = setting?.key
+    const hasValidKey = key != null && key !== ''
+    // For each setting with a key (i.e. ignoring headings) check if it is in the current settings, and if not, add it with the default value.
+    if (hasValidKey) {
       if (!currentSettingData.hasOwnProperty(key)) {
-        newSettings[key] = setting?.default || ''
+        newSettings[key] = getDefaultValueForNewSetting(setting)
+        logInfo('updateSettingData', `- Added new setting: ${key} = ${newSettings[key]}`)
         updateResult = 1 // we have made at least one update, change result code accordingly
       } else {
         newSettings[key] = currentSettingData[key]
       }
     }
   })
+
   // logDebug(`NPConfiguration/updateSettingData: Object.keys(DataStore): ${Object.keys(DataStore).join(',')}`)
   // logDebug('currentSettingData:', JSP(currentSettingData, 2))
   // logDebug('newSettings:', JSP(newSettings, 2))
   // logDebug('DataStore.settings:', JSP(DataStore.settings, 2))
   try {
-    if (DataStore && typeof DataStore.settings === 'object' && updateResult > 0) {
+    if (updateResult > 0 && DataStore && typeof DataStore.settings === 'object') {
       // WARNING: @jgclark at least once saw an 'undefined is not an object' error, which appeared to be for this line.
       // dbw added the following logging to try to track it down but it looks like, JS thinks that DataStore is not an object at times.
       // And yet, somehow the migration actually does work and migrates new settings. So, I'm not sure what's going on here.
       // We are going to leave this alone for the time being, but if you see this error again, please uncomment the following to keep hunting.
-      logDebug(
-        `NPConfiguration/updateSettingData for ${pluginJsonData['plugin.id']} updateResult: ${updateResult}`,
-        `typeof DataStore: ${typeof DataStore} isArray:${String(
-          Array.isArray(DataStore),
-        )} typeof DataStore.settings: ${typeof DataStore?.settings} typeof newSettings: ${typeof newSettings}`,
-      )
+      // logDebug(
+      //   `NPConfiguration/updateSettingData for ${pluginJsonData['plugin.id']} updateResult: ${updateResult}`,
+      //   `typeof DataStore: ${typeof DataStore} isArray:${String(
+      //     Array.isArray(DataStore),
+      //   )} typeof DataStore.settings: ${typeof DataStore?.settings} typeof newSettings: ${typeof newSettings}`,
+      // )
       logDebug(
         'NPConfiguration/updateSettingData',
         `About to update DataStore.settings to newSettings after an update. If you see a TypeError right after this, please ignore it. It's a known NP bug that doesn't seem to matter.`,
       )
       DataStore.settings = newSettings
     }
   } catch (error) {
-    console.log(
-      'NPConfiguration/updateSettingData/Plugin Settings Migration Failed. Was not able to automatically migrate your plugin settings to the new version. Please open the plugin settings and save in order to update your settings.',
+    logError('updateSettingData', 
+      'Plugin Settings Migration Failed. Was not able to automatically migrate your plugin settings to the new version. Please open the plugin settings, check them, and then save in order to update your settings.',
     )
     updateResult = -1
   }
@@ -568,6 +592,7 @@ export async function getSettingFromAnotherPlugin(pluginID: string, settingName:
 
 /**
  * Backup the settings.json file for 'pluginID' to a dated version in the plugin data folder.
+ * Note: this fails if the file is not valid JSON, unfortunately. @jgclark can't find a way around this.
  * @author @jgclark
  * @param {string} pluginID
  * @param {string} reason
@@ -579,12 +604,15 @@ export async function backupSettings(pluginID: string, reason: string = 'backup'
     const pluginSettings = await DataStore.loadJSON(`../${pluginID}/settings.json`)
     const backupFilename = `settings_${reason}_${moment().format('YYYYMMDDHHmmss')}.json`
     const backupPath = `../${pluginID}/${backupFilename}`
-    await DataStore.saveJSON(pluginSettings, backupPath)
+    const res = await DataStore.saveJSON(pluginSettings, backupPath)
+    if (!res) {
+      throw new Error(`Error saving backup to ${backupPath}`)
+    }
     if (!suppressMessage) {
       await showMessage(`Backup of ${pluginID} settings saved to ${backupPath}`, 'OK', `${pluginID} Settings Backup`)
     }
     logInfo('backupSettings', `Backup of ${pluginID} settings saved to ${backupPath}`)
-    return true
+    return res
   } catch (error) {
     if (!suppressMessage) {
       await showMessage(`Error trying to Backup ${pluginID} settings. Please see Plugin Console log for details.`, 'OK', `${pluginID} Settings Backup`)

helpers/NPEditor.js

@@ -262,22 +262,57 @@ export function isNoteOpenInEditor(filename: string): boolean {
 /**
  * Returns the first open Editor window that matches a given filename (if any).
  * If 'getLastOpenEditor' is true, then return the last matching open Editor window (which is the most recently opened one) instead.
+ * TEST: Changes 30.3.2026
  * @author @jgclark
  * @param {string} openNoteFilename to find in list of open Editor windows
  * @param {boolean} getLastOpenEditor - whether to return the last open Editor window (which is the most recently opened one) instead of the first one that matches the filename (the default)
  * @returns {TEditor | false} the matching open Editor window or false if not found
  */
 export function getOpenEditorFromFilename(openNoteFilename: string, getLastOpenEditor: boolean = false): TEditor | false {
-  const allEditorWindows = NotePlan.editors
-  const matchingEditorWindows = allEditorWindows.filter(ew => ew.filename === openNoteFilename)
-  if (matchingEditorWindows.length === 0) {
-    logDebug('getOpenEditorFromFilename', `No open Editor window found for filename '${openNoteFilename}'`)
+  try {
+    const allEditorWindows = NotePlan.editors
+    const matchingEditorWindows = allEditorWindows?.filter(ew => ew.filename === openNoteFilename) ?? []
+    if (matchingEditorWindows.length === 0) {
+      logDebug('getOpenEditorFromFilename', `No open Editor window found for filename '${openNoteFilename}'`)
+      return false
+    }
+    if (getLastOpenEditor) {
+      return matchingEditorWindows[matchingEditorWindows.length - 1]
+    }
+    return matchingEditorWindows[0]
+  } catch (error) {
+    logError('getOpenEditorFromFilename', error.message)
     return false
   }
-  if (getLastOpenEditor) {
-    return matchingEditorWindows[matchingEditorWindows.length - 1]
+}
+
+/**
+ * Find a regular (folder) note that is open in some Editor pane — not only the focused one.
+ * Prefers the globally focused `Editor` when its note is already type 'Notes'; otherwise scans
+ * `NotePlan.editors` so split views with a calendar note focused still expose an open project note.
+ * @author @jgclark
+ * @returns {?TNote} the note, or null if no Editor pane shows a regular note
+ */
+export function getFirstRegularNoteAmongOpenEditors(): ?TNote {
+  try {
+    const focusedNote = Editor?.note
+    if (focusedNote && focusedNote.type === 'Notes') {
+      return focusedNote
+    }
+    const allEditorWindows = NotePlan.editors ?? []
+    for (const thisEditorWindow of allEditorWindows) {
+      const candidate = thisEditorWindow?.note
+      if (candidate && candidate.type === 'Notes') {
+        logDebug('getFirstRegularNoteAmongOpenEditors', `Using open editor pane for '${candidate.filename || candidate.title || '?'}' (focused pane was not a regular note)`)
+        return candidate
+      }
+    }
+    logDebug('getFirstRegularNoteAmongOpenEditors', `No open Editor pane contains a regular (Notes) note`)
+    return null
+  } catch (error) {
+    logError('getFirstRegularNoteAmongOpenEditors', error.message)
+    return null
   }
-  return matchingEditorWindows[0]
 }
 
 /**