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

Author: jgclark

helpers/HTMLView.js

@@ -995,13 +995,18 @@ export function convertNPBlockIDToHTML(input: string): string {
  * @param {string} commandName to call when button is 'clicked'
  * @param {string} commandArgs (may be empty)
  * @param {string?} tooltipText to hover display next to button
+ * @param {boolean} nativeTooltips use native browser tooltips (default: false)
  * @returns {string}
  */
-export function makePluginCommandButton(buttonText: string, pluginName: string, commandName: string, commandArgs: string, tooltipText: string = ''): string {
+export function makePluginCommandButton(buttonText: string, pluginName: string, commandName: string, commandArgs: string, tooltipText: string = '', nativeTooltips: boolean = false): string {
   const output = tooltipText
-    ? `<button class="PCButton tooltip" data-tooltip="${tooltipText}" data-plugin-id="${pluginName}" data-command="${commandName}" data-command-args="${String(
+    ? (nativeTooltips ?
+      `<button class="PCButton" title="${tooltipText}" data-plugin-id="${pluginName}" data-command="${commandName}" data-command-args="${String(
         commandArgs,
       )}">${buttonText}</button>`
+      : `<button class="PCButton tooltip" data-tooltip="${tooltipText}" data-plugin-id="${pluginName}" data-command="${commandName}" data-command-args="${String(
+        commandArgs,
+      )}">${buttonText}</button>`)
     : `<button class="PCButton" data-plugin-id="${pluginName}" data-command="${commandName}" data-command-args="${commandArgs}" >${buttonText}</button>`
   return output
 }

jgclark.Dashboard/src/react/components/Header/Header.css

@@ -4,7 +4,7 @@
 
 /* Settings for flex-based layout */
 .header {
-	font-size: 0.92rem;
+	font-size: 0.9rem;
 	/* Define grid-template-areas for better control */
 	/* display: grid; */
 	display: flex;
@@ -104,7 +104,7 @@
 /* For buttons in header area */
 /* TODO: Ideally rationalise this with the addButton icon-buttons in the sectionInfo area */
 .HAButton {
-	font-size: 0.92rem;
+	font-size: 0.9rem;
 	font-weight: 500;
 	border-style: solid;
 	border-width: 1px;

jgclark.Dashboard/src/react/components/RefreshControl.jsx

@@ -11,7 +11,7 @@ import { logDebug, logInfo } from '@helpers/dev'
 
 type Props = {
   refreshing: boolean,
-  firstRun: boolean,
+  firstRun?: boolean,
   handleRefreshClick: () => void,
 }
 
@@ -32,11 +32,11 @@ const RefreshControl = (props: Props): React$Node => {
         <>
           <i className={refreshing ? 'fa-regular fa-arrow-rotate-right fa-spin' : 'fa-regular fa-arrow-rotate-right'}></i>
           {/* <span className="pad-left">{refreshing ? 'Refreshing' : 'Refresh'}</span> */}
-          <span className={refreshing || firstRun ? "pad-left greyedText" : "pad-left"}>{firstRun ? 'Generating' : 'Refresh'}</span>
+          <span className={refreshing || firstRun ? 'pad-left greyedText' : 'pad-left'}>{firstRun ? 'Generating' : 'Refresh'}</span>
         </>
       }
       clickHandler={handleRefreshClick}
-      disabled={refreshing || firstRun}
+      disabled={Boolean(refreshing || firstRun)}
       className="HAButton refreshButton"
     />
   )

jgclark.Dashboard/src/refreshClickHandlers.js

@@ -96,13 +96,11 @@ export async function incrementallyRefreshSomeSections(
     await refreshSomeSections({ ...data, sectionCodes: [sectionCode] }, calledByTrigger)
     logTimer(`clickHandlers`, start, `incrementallyRefreshSomeSections getting ${sectionCode})`)
   }
-  const updates: any = { refreshing: false }
+  const updates: any = { refreshing: false, firstRun: false }
   if (setFullRefreshDate) updates.lastFullRefresh = new Date()
   await setPluginData(updates, `Ending incremental refresh for sections ${String(sectionCodes)} (after ${timer(incrementalStart)})`)
   logTimer('incrementallyRefreshSomeSections', incrementalStart, `for ${sectionCodes.length} sections`, 2000)
 
-  await setPluginData({ firstRun: false, refreshing: false }, `End of incremental refresh, so setting firstRun + refreshing to false`)
-
   // re-calculate done task counts (if the appropriate setting is on)
   const NPSettings = await getNotePlanSettings()
   if (NPSettings.doneDatesAvailable) {

jgclark.NoteHelpers/README.md

@@ -26,7 +26,7 @@ This plugin (now a Core Plugin bundled with NotePlan 3.16.1 onwards) provides co
 - **open note new window** (alias **onw**): open a user-selected note in a new window (and places the cursor at what it judges to be the start of the main content)
 - **open note new split** (alias **ons**): open a user-selected note in a new split of the main window (and places the cursor at what it judges to be the start of the main content)
 - **open url from a note**: asks for a note, and then presents a list of URLs found in that note. The selected one is then opened in your default browser. (There's a setting to ignore URLs in closed tasks.)
-- **rename note filename**: renames the currently open note to one you specify. Note: this changes the underlying _filename_ not the visible _title_.
+- **rename note filename**: renames the currently open note to one you specify. Note: this changes the underlying _filename_ not the visible _title_. This has proved very helpful for people renaming notes who have imported them from other systems, including Obsidian.
 - **rename filename to title**: renames the current filename to the title of the note
 - **rename inconsistent note filenames**: renames the files of notes whose filenames are inconsistent with their titles. When run it offers to rename all in one go, or to go one by one so you can choose which ones to rename.
 - **reset title to match filename**: resets the current note title to match its filename.

jgclark.Reviews/CHANGELOG.md

@@ -1,6 +1,19 @@
 # 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.
 
+## [1.1.0] - 2025-02-03
+### New
+- Supports 'Perspectives' from Dashboard plugin. (If you turn the feature on in settings), the Project List will automatically use the current 'Perspective' definition from the Dashboard plugin to determine which folders are included and excluded.
+- where you have more than one project tag, each tag is shown in a section that can be collapsed or expanded using the triangle icons ▼ or ▶.
+
+### Changed
+- changed the top-middle box of controls to be a top bar, with only the controls that can't live in the popup 'edit dialog' boxes.
+- top bar now shows the current Perspective name (if used).
+- other improvements of the 'rich' style Project List, to bring more in line with the Dashboard plugin. Including a simpler style of tooltips that aren't clipped.
+- now supports multiple next action tags, and shows all of them in the Project List. (requested by @matt.)
+- when you run '/cancel project' it now asks for a progress comment (like happens when you pause a project).
+- the heading of the edit dialog box now shows the note title (not filename), and the current review interval
+
 ## [1.0.2] - 2024-12-28 (unreleased)
 - now uses the user's 'Editor Font Size' setting to determine the base font size for the rich view of the Project List -- and so can be changed up and down quite easily -- rather than using what the Theme defines.
 - small layout tweaks

jgclark.Reviews/README.md

@@ -13,7 +13,7 @@ After each project name (the title of the note) is an edit icon, which when clic
 
 ![Edit dialog](edit-dialog-1.0.png)
 
-User George (@george65) has recorded two video walkthroughs that show most of what the plugin does (recorded using an earlier version of the plugin):
+User George (@george65) has recorded two video walkthroughs that show most of what the plugin does (recorded using an earlier version of the plugin, so the UI is different):
 
 - [Inside Look: How George, CMO of Verge.io, Uses NotePlan for Effective Project Management](https://www.youtube.com/watch?v=J-FlyffE9iA) featuring this and my Dashboard plugin.
     [![thumbnail](effective-PM-with-George-thumbnail.jpg)](https://www.youtube.com/watch?v=J-FlyffE9iA)
@@ -90,12 +90,12 @@ Other notes:
 - If there are multiple copies of a metadata field, only the first one is used.
 - I'm sometimes asked why I use `@reviewed(2021-06-25)` rather than `@reviewed/2021-06-25`. The answer is that while the latter form is displayed in a neater way in the sidebar, the date part isn't available in the NotePlan API as the part after the slash is not a valid @tag as it doesn't contain an alphabetic character.
 
-## Reviewing Projects and/or Areas
-Use the '**Hashtags to review**' setting to control which notes are included in the review lists:
-- If this setting is empty, then it will include all notes for review that include a `@review(...)` string.
-- if it is set (e.g. `#project, #area, #goal`), then it will include just those notes which also have one or more of those tags.
-- Particularly if you have a large collection of notes in NP, you can also specify a 'Folders to include for reviews' setting (which includes any sub-folders).
-- You can specify folders to ignore using the 'Folders to Ignore for reviews' setting; I have this set to `Summaries, Reviews, Saved Searches`. Any sub-folders of these will also be ignored. (Note that the special Templates, Archive and Trash are always excluded.)
+## Selecting notes to include
+There are 2 parts of this:
+1. Use the '**Hashtags to review**' setting to control which notes are included in the review lists. If it is set (e.g. `#project, #area, #goal`), then it will include just those notes which also have one or more of those tags. If this setting is empty, then it will include all notes for review that include a `@review(...)` string.
+2. Then specifiy which folders you want to include and/or exclude notes from. There are 2 ways to do this:
+   1. From v1.1 you can use the '**Use Perspectives**' setting to control which folders are included. This requires the [Dashboard plugin](https://github.com/NotePlan/plugins/blob/main/jgclark.Dashboard/) to be installed, and if set then it uses the current Perspective's settings instead of the  following 2 settings.
+   2. Or Use the 'Folders to Include' and 'Folders to Exclude' settings to put a comma-separated list of folders to include and exclude. I have this set to `Summaries, Reviews, Saved Searches`. Any sub-folders of these will also be ignored. (Note that the special Templates, Archive and Trash are always excluded.)
 
 When you have [configured the plugin](#configuration), and added suitable metadata to notes, you're then ready to use some or all of the following commands:
 
@@ -107,16 +107,16 @@ You can set the '**Output style to use**'. This is either a '**Rich**' (HTML, sh
 ![Example of 'Markdown' style of Project Lists](review-list-markdown-0.11@2x.png)
 
 Notes about the displays:
-- the **Rich style** _isn't a normal NotePlan note that is saved and can be accessed again later_. You will need to re-run the command to see the list again once you close the window.  This 'Rich' style mimics the NotePlan Theme you use (though see below on how to override this).  In this style this heading row deliberately 'sticks' to the top of the window as you scroll the list:
+- the **Rich style** is a temporary HTML window that picks up the NotePlan Theme you use (though see below on how to override this).  In this style there's a heading row deliberately 'sticks' to the top of the window as you scroll the list:
 ![Buttons in 'Rich' style](top-controls-1.0.png)
-- in the Rich style, all #tags to review get shown one after the other in a single window.
+- in the Rich style, all #tags to review get shown one after the other in a single window. These can be collapsed and expanded as a group using the triangle icons ▼ or ▶.
 - if you can make the window wide enough it will display in 2 (or even 3!) columns
-- the **Markdown style** list _is_ stored in summary note(s) in the 'Reviews' folder (or whatever you set the 'Folder to store' setting to be).
+- the **Markdown style** list _is_ stored as a summary note(s) in the 'Reviews' folder (or whatever you set the 'Folder to store' setting to be).
 - the button 'Start reviews' / 'Start reviewing notes ready for review' is a shortcut to the '/start reviews' command (described below).
 - each project title is also an active link which can be clicked to take you to that project note. (Or Option-click to open that in a new split window, which keeps the review list open.)
 
 Other settings:
-- Next action tag: #hashtag to include in a task or checklist to indicate its the next action in this project (optional; default '#next').
+- Next action tag(s): optiona list of #hashtags to include in a task or checklist to indicate its the next action in this project (comma-separated; default '#next').
 - Display next actions in output? Whether to display the next action in the output? This requires the previous setting to be set. Note: If there are multiple items with the next action tag, only the first is shown.
 - Folders to Include (optional): Specify which folders to include (which includes any of their sub-folders) as a comma-separated list. This match is done anywhere in the folder name, so you could simply say `Project` which would match for `Client A/Projects` as well as `Client B/Projects`. Note also: 
   - if you specify the root folder `/` this only includes the root folder itself, and not all its sub-folders. 
@@ -146,7 +146,7 @@ This kicks off the most overdue review by opening that project's note in the edi
 
 ### "/finish project review" command
 This updates the current open project's `@reviewed(date)`, and if a Rich style project list is open, it is refreshed.
-If the 'Next action tag' setting is set, then it will warn if it finds no example of that tag on all open tasks/checklists.
+If the 'Next action tag(s)' setting is set, then it will warn if it finds no example of those tags on all open tasks/checklists.
 
 ### "/next project review" command
 This updates this project's `@reviewed(date)`, and jumps to the next project to review. If there are none left ready for review it will show a congratulations message.