Merge branch 'main' of https://github.com/NotePlan/plugins

Author: jgclark

helpers/paragraph.js

@@ -3,10 +3,8 @@
 // Paragraph and block-level helpers functions
 //-----------------------------------------------------------------------------
 
-import { getDateStringFromCalendarFilename } from './dateTime'
-import { clo, logDebug, logError, logInfo, logWarn } from './dev'
-import { parseTeamspaceFilename } from './teamspace'
-import { getElementsFromTask } from './sorting'
+import { getDateStringFromCalendarFilename } from '@helpers/dateTime'
+import { clo, logDebug, logError, logInfo, logWarn } from '@helpers/dev'
 import { endOfFrontmatterLineIndex } from '@helpers/NPFrontMatter'
 import { isParaAMatchForHeading } from '@helpers/headings'
 import {
@@ -19,7 +17,9 @@ import {
   RE_SIMPLE_URI_MATCH_G,
 } from '@helpers/regex'
 import { getLineMainContentPos } from '@helpers/search'
+import { getElementsFromTask } from '@helpers/sorting'
 import { stripLinksFromString } from '@helpers/stringTransforms'
+import { parseTeamspaceFilename } from '@helpers/teamspace'
 
 //-----------------------------------------------------------------------------
 
@@ -974,48 +974,58 @@ export function setParagraphToIncomplete(p: TParagraph): void {
 
 /**
  * Read lines in 'note' and return any lines (as strings) that contain fields that start with 'fieldName' parameter before a colon with text after.
- * The matching is done case insensitively, and only in the active region of the note (i.e. _not_ in the frontmatter or 'Done' sections).
+ * The matching is done case insensitively, and only in the main region of the note (i.e. _not_ in the frontmatter or 'Done' sections).
  * Note: see also getFieldParagraphsFromNote() variation on this.
  * @param {TNote} note
  * @param {string} fieldName
  * @returns {Array<string>} lines containing fields
  */
 export function getFieldsFromNote(note: TNote, fieldName: string): Array<string> {
-  const paras = note.paragraphs
-  const startOfActive = findStartOfActivePartOfNote(note)
-  const endOfActive = findEndOfActivePartOfNote(note)
-  const matchArr = []
-  const RE = new RegExp(`^${fieldName}:\\s*(.+)`, 'i') // case-insensitive match at start of line
-  for (const p of paras) {
-    const matchRE = p.content.match(RE)
-    if (matchRE && p.lineIndex >= startOfActive && p.lineIndex <= endOfActive) {
-      matchArr.push(matchRE[1])
+  try {
+    const paras = note.paragraphs
+    const endOfActive = findEndOfActivePartOfNote(note)
+    const matchArr = []
+    const RE = new RegExp(`^${fieldName}:\\s*(.+)`, 'i') // case-insensitive match at start of line
+    for (const p of paras) {
+      const matchRE = p.content.match(RE)
+      if (matchRE && p.lineIndex <= endOfActive) {
+        matchArr.push(matchRE[1])
+        // logDebug('getFieldsFromNote', `-> match: '${matchRE[1]}'`)
+      }
     }
+    // logDebug('getFieldsFromNote()', `-> Found ${matchArr.length} fields matching '${fieldName}' in note '${displayTitle(note)}'`)
+    return matchArr
+  } catch (error) {
+    logError('getFieldsFromNote', error.message)
+    return []
   }
-  // logDebug('getFieldsFromNote()', `Found ${matchArr.length} fields matching '${fieldName}'`)
-  return matchArr
 }
 
 /**
  * Read lines in 'note' and return any paragraphs that contain fields that start with 'fieldName' parameter before a colon with text after.
- * The matching is done case insensitively, and only in the active region of the note (i.e. _not_ in the frontmatter or 'Done' sections).
+ * The matching is done case insensitively, and only in the main region of the note (i.e. _not_ in the frontmatter or 'Done' sections).
  * Note: see also getFieldsFromNote() variation on this.
  * @param {TNote} note
  * @param {string} fieldName
  * @returns {Array<string>} lines containing fields
  */
 export function getFieldParagraphsFromNote(note: TNote, fieldName: string): Array<TParagraph> {
-  const paras = note.paragraphs
-  const startOfActive = findStartOfActivePartOfNote(note)
-  const endOfActive = findEndOfActivePartOfNote(note)
-  const matchArr = []
-  const RE = new RegExp(`^${fieldName}:\\s*(.+)`, 'i') // case-insensitive match at start of line
-  for (const p of paras) {
-    const matchRE = p.content.match(RE)
-    if (matchRE && p.lineIndex >= startOfActive && p.lineIndex <= endOfActive) {
-      matchArr.push(p)
+  try {
+    const paras = note.paragraphs
+    const endOfActive = findEndOfActivePartOfNote(note)
+    const matchArr = []
+    const RE = new RegExp(`^${fieldName}:\\s*(.+)`, 'i') // case-insensitive match at start of line
+    for (const p of paras) {
+      const matchRE = p.content.match(RE)
+      if (matchRE && p.lineIndex <= endOfActive) {
+        matchArr.push(p)
+        // logDebug('getFieldParagraphsFromNote', `-> match: '${p.content}'`)
+      }
     }
+    // logDebug('getFieldParagraphsFromNote()', `Found ${matchArr.length} fields matching '${fieldName}'`)
+    return matchArr
+  } catch (error) {
+    logError('getFieldParagraphsFromNote', error.message)
+    return []
   }
-  // logDebug('getFieldParagraphsFromNote()', `Found ${matchArr.length} fields matching '${fieldName}'`)
-  return matchArr
 }

jgclark.Reviews/CHANGELOG.md

@@ -1,8 +1,48 @@
 # What's changed in 🔬 Projects + Reviews plugin?
 See [website README for more details](https://github.com/NotePlan/plugins/tree/main/jgclark.Reviews), and how to configure.under-the-hood fixes for integration with Dashboard plugin
 
-## [1.3.0.b11] - 2026-02-14
+<!--
+## [1.3.0] - 2026-02-???
+### Display Improvements
+- Supports opening the Project Lists window in NotePlan's main window on macOS. See Display setting "Open Project Lists in what sort of macOS window?".
+- Adds the plugin to the NP Sidebar list of plugins
+- Now highlights the project in the list that is currently being reviewed
+- Moved the display toggles to a new "Filter…" menu in the top bar, and added "Show next actions?" and "Show paused?" toggles. Other changes to layout at narrower window widths.
+- When running in the main window, clicking on a project note now opens it in a split view to the side.
+- Added 'Next' review button to top bar.
+- Added 'Start' review button to the edit dialogs
+- Smartly truncates long 'next action' lines
+- Uses a note's icon in the project list, if set in the note's frontmatter
+- Turned back on the automatic updates of Dashboard plugin (if open). [Requires Dashboard v2.4.0 beta 18 or later.]
+- Improved the dialog box title (now includes folder and clickable project note name)
+- Progress line format now changed to remove colon after date by default (i.e. `Progress: <num>@YYYY-MM-DD <description>`), but existing lines will still be parsed correctly.
+- If "display dates?" setting is off, then any progress or next actions lines are shown under the project title, rather than to the side.
+
+### Processing Improvements
+- Supports projects in (Team)Space notes, using the settings in the Perspective from Dashboard v2.4 which allows you to specify which (Team)Spaces you wish to include, plus whether or not to include the Private "Space" (all notes not in a Space).
+- New 'Sequential' project marker that automatically makes the first open task/checklist in a project note the 'next action'. To set this add the frontmatter `project: #sequential`.
+- Improved next action processing: now only the first tagged item is shown; if there are no tagged items and a sequential tag is present in the frontmatter, the first open item is displayed instead.
+- New setting "Progress Heading" allows to put a heading wherever you want in a project note for the  `Progress: ...` lines to live. If a note has existing progress lines when this is first set, it will first find them and insert the heading above the lines. (Requested by @Harold.)
+- New setting "Also write most recent Progress line to frontmatter?". When turned on this allows the current progress information to be used in Folder Views. (default: off) (for @oak86)
+- Pausing or un-pausing on a Project now also updates the `@reviewed()` date
+- Stops the 'next action' check from running if the project note is marked as `#sequential`
+<!-- - added new **weekly projects progress** command for JGC -->
+<!--
+### Fixed
+- Re-wrote finding open project note now there can be multiple Editors open.
+- Folder name (including Space name) not being included in project completion list in yearly note
+- Progress lines with 100% were parsed as 10%
+- Other smaller improvements and fixes (including those reported by @Garba, @Mourique and @Doug)
+-->
+
+## [1.3.0.b12] - 2026-02-16
+- Added a count badge to project list rows: shows count of open (non-future) items in a small grey square. Badges only appear for active projects and when counts are greater than zero.
+- Added an "Add Task" button to the edit dialog, which asks user for task details, and which heading to add it under.
+
+## [1.3.0.b11] - 2026-02-15
+- get display of progress lines working again in the main display, and truncate when too long
 - fix for folder name (including Space name) not being included in project completion list in yearly note
+- if "display dates?" setting is off, then any progress or next actions lines are shown under the project title, rather than to the side.
 
 ## [1.3.0.b10] - 2026-02-14
 - Added 'Next' review button to top bar.
@@ -18,7 +58,7 @@ See [website README for more details](https://github.com/NotePlan/plugins/tree/m
 
 ## [1.3.0.b8] - 2026-02-08
 - dev: refactor to move most HTML code into separate htmlGenerators.js file
-- stop the 'next action' check from running if the project note is marked as `#ssequential`
+- stop the 'next action' check from running if the project note is marked as `#sequential`
 - added new hidden **weekly projects progress** command for JGC
 - new 'Display Filter...' menu for the various checkboxes
 - improve dialog box title (now includes folder and clickable project note name)

jgclark.Reviews/README.md

@@ -138,7 +138,7 @@ Progress: 0@2021-04-05 Project started with a briefing from M about SPECTRE's da
 ```
 
 The starting percentage number doesn't have to be given; if it's not it is **calculated from the % of open and completed tasks** found in the note. From v1.2. there are new settings that affect which open tasks/checklists are included:
-- Ignore tasks set more than these days in the future: If set more than 0, then when the progress percentage is calculated it will ignore items scheduled more than this number of days in the future. (Default is 0 days -- i.e. no future items are ignored).
+- Ignore tasks set more than these days in the future: If set more than 0, then when the progress percentage is calculated it will ignore items scheduled more than this number of days in the future. (Default is 1 day: all items with future scheduled dates are ignored.)
 - Ignore checklists in progress? If set, then checklists in progress will not be counted as part of the project's completion percentage.
 
 ### Other settings

jgclark.Reviews/plugin.json

@@ -9,7 +9,7 @@
   "plugin.author": "Jonathan Clark",
   "plugin.url": "https://noteplan.com/plugins/jgclark.Reviews",
   "plugin.changelog": "https://github.com/NotePlan/plugins/blob/main/jgclark.Reviews/CHANGELOG.md",
-  "plugin.version": "1.3.0.b11",
+  "plugin.version": "1.3.0.b12",
   "plugin.releaseStatus": "beta",
   "plugin.lastUpdateInfo": "1.3.0.b9: New 'Also write most recent Progress line to frontmatter?' option.\n1.3.0.b8: Improved the project dialog box, including new 'Start' button for reviews.\n1.3.0.b7: Improved next action processing. Turned back on automatic updates of Dashboard plugin (if open).\n1.3.0.b6: Small improvements.\n1.3.0.b5: New 'Progress Heading' settings. Fix when using `metadata:` key in frontmatter, and \n1.3.0.b4: 'Start Reviews' bug fix and various layout  improvements.\n1.3.0.b3: can now display the first open task/checklist in a project as the 'next action' by adding a new 'Sequential project marker' to the frontmatter (e.g. `project: #sequential`).\n1.3.0.b2: now supports 'show in main window' setting. Other small improvements and fixes.\n1.3.0.b1: now supports projects in (Team)Space notes, using the Perspective setting from Dashboard v2.4 which allows you to specify which (Team)Spaces you wish to include.",
   "plugin.script": "script.js",
@@ -327,7 +327,7 @@
     {
       "key": "numberDaysForFutureToIgnore",
       "title": "Ignore tasks set more than these days in the future",
-      "description": "If set more than 0, then when the progress percentage is calculated it will ignore items scheduled more than this number of days in the future. (Default is 0 days -- i.e. no future items are ignored).",
+      "description": "If set more than 0, then when the progress percentage is calculated it will ignore items scheduled more than this number of days in the future. (Default is 1 day: all items with future scheduled dates are ignored.)",
       "type": "number",
       "default": 1,
       "required": true

jgclark.Reviews/requiredFiles/projectList.css

@@ -1,6 +1,6 @@
 /**
  * CSS specific to reviewList() from jgclark.Reviews plugin
- * Last updated 2026-02-10 for v1.3.0.b9, @jgclark 
+ * Last updated 2026-02-16 for v1.3.0.b12, @jgclark 
  */
 
 body {
@@ -113,9 +113,19 @@ h3, .h3 {
 
 table {
   border-collapse: collapse; /* always! */
+  table-layout: fixed; /* so column widths are respected and col 2 doesn't push 3+4 off */
   width: 100%; /* keep wide to avoid different table widths */
   empty-cells: show;
-  margin-bottom: 2rem;
+  margin-bottom: 0rem;
+}
+
+/* Constrain column 2 so long progress text doesn't push Next Review and Due Date off viewport */
+table colgroup:has(col:nth-child(4)) col:nth-child(2) {
+  width: calc(100% - 14.2rem); /* 3.2rem (col1) + 5.5rem + 5.5rem (col3+4) */
+}
+tr.projectRow td:nth-child(2) {
+  overflow: hidden;
+  min-width: 0; /* allow cell to shrink so ellipsis can apply */
 }
 
 /* Styling for each cell in each row */
@@ -138,6 +148,7 @@ td:first-child, th:first-child {
   font-size: 1.0rem;
   font-weight: normal;
   color: var(--fg-main-color);
+  margin-left: 1rem;
 }
 
 details {
@@ -388,7 +399,7 @@ button, .fake-button, .clickTarget {
 /* first line of column 2 */
 .projectTitle {
   display: flex;
-  align-items: baseline;
+  align-items: center;
   gap: 0.5rem;
 }
 /* make noteTitle icon + text bold and coloured, and indicate its clickable */
@@ -413,7 +424,35 @@ button, .fake-button, .clickTarget {
   text-decoration: underline;
 }
 
+/* ---- ITEM COUNTS ----------------------------------------- */
+
+/* Task count badge (rounded square) */
+.openItemCount {
+  display: inline-flex;
+  justify-content: center;
+  /* min-width: 0.9rem; */
+  height: 0.85rem;
+  padding: 0.1rem 0.2rem 0rem 0.2rem;
+  border-radius: 6px;
+  color: rgb(from var(--fg-main-color) r g b / 0.7);
+  border: 1px solid rgb(from var(--fg-main-color) r g b / 0.4);
+  font-size: 0.7rem;
+  /* font-weight: 400; */
+  line-height: 0.8rem;
+  margin-left: 0.1rem;
+}
+
 /* ---- PROGRESS ----------------------------------------- */
+/* Progress line row: last progress comment, styled like Dashboard ProjectItem */
+.projectProgress {
+  color: var(--fg-placeholder-color);
+  font-size: 0.95rem;
+  display: block;
+  min-width: 0;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
 .progress {
   display: flex;
   align-items: baseline;
@@ -428,9 +467,12 @@ button, .fake-button, .clickTarget {
 
 /* ---- NEXT ACTIONS ----------------------------------------- */
 .nextAction {
-  display: flex;
+  display: block;
   align-items: baseline;
   gap: 0.5rem;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
 }
 .nextActionIcon {
   /* placeholder */

jgclark.Reviews/requiredFiles/projectListDialog.css

@@ -1,6 +1,6 @@
 /**
   CSS for the items Actions Dialog 
-  Last updated: 2025-02-01 for v1.0.2+ by @jgclark
+  Last updated: 2026-02-14 for v1.3.0.b11 by @jgclark
   */
 dialog {
   /* Unset the margin around it, to allow absolute positioning by left/top */
@@ -79,6 +79,25 @@ dialog:modal {
   justify-self: end;
 }
 
+/* Progress row: button then latest summary to the right */
+.dialogProgressRow {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+}
+
+.dialogLatestProgressLabel {
+  font-weight: normal;
+  text-align: left;
+  color: var(--fg-placeholder-color);
+}
+
+.dialogLatestProgressText {
+  font-weight: normal;
+  text-align: left;
+  color: var(--fg-main-color);
+}
+
 /* for Dialog main buttons: a little more pronounced */
 .mainButton {
 	background-color: var(--bg-alt-color);

jgclark.Reviews/requiredFiles/projectListEvents.js

@@ -37,7 +37,7 @@ function showProjectControlDialog(dataObject) {
   const thisFolderName = getFolderFromFilename(thisFilename)
   const thisTitle = decodeRFC3986URIComponent(dataObject.encodedTitle)
   const dialogNoteFolderElem = document.getElementById('dialogProjectFolder')
-  dialogNoteFolderElem.innerHTML = thisFolderName !== '' ? `${thisFolderName} / ` : ''
+  dialogNoteFolderElem.innerHTML = thisFolderName !== '' ? `${thisFolderName}/` : ''
   const dialogItemNoteElem = document.getElementById('dialogProjectNote')
   dialogItemNoteElem.innerHTML = thisTitle ?? thisFilename
 
@@ -59,6 +59,14 @@ function showProjectControlDialog(dataObject) {
   const dialogItemIntervalElem = document.getElementById('dialogProjectInterval')
   dialogItemIntervalElem.innerHTML = ` (review every ${thisReviewInterval})`
 
+  // Set latest progress summary (encoded for safe passing in onclick)
+  const encodedLastProgress = dataObject.encodedLastProgressComment ?? ''
+  const lastProgressComment = encodedLastProgress ? decodeRFC3986URIComponent(encodedLastProgress) : ''
+  const dialogLatestProgressLabelElem = document.getElementById('dialogLatestProgressLabel')
+  dialogLatestProgressLabelElem.textContent = lastProgressComment ? 'Latest: ' : ''
+  const dialogLatestProgressTextElem = document.getElementById('dialogLatestProgressText')
+  dialogLatestProgressTextElem.textContent = lastProgressComment ? `${lastProgressComment}` : ''
+
   console.log(`showProjectControlDialog() starting for filename '${thisFilename}', interval '${thisReviewInterval}', title '${thisTitle}'`)
 
   const possibleControlTypes = [
@@ -69,6 +77,7 @@ function showProjectControlDialog(dataObject) {
     { controlStr: 'nr+1m', handlingFunction: 'setNextReviewDate' },
     { controlStr: 'nr+1q', handlingFunction: 'setNextReviewDate' },
     { controlStr: 'newrevint', handlingFunction: 'setNewReviewInterval' },
+    { controlStr: 'addtask', handlingFunction: 'quickAddTaskUnderHeading' },
     { controlStr: 'progress', handlingFunction: 'addProgress' },
     { controlStr: 'pause', handlingFunction: 'togglePause' },
     { controlStr: 'complete', handlingFunction: 'completeProject' },