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

Author: jgclark

helpers/headings.js

@@ -11,7 +11,7 @@ import { clo, clof, JSP, logDebug, logError, logInfo, logTimer, logWarn } from '
 export function getHeadingHierarchyForThisPara(para) {
   let lineIndex = para.lineIndex
   const noteFilename = para.note?.filename ?? '?'
-  logDebug('getHeadingHierarchyForThisPara', `Finding headings for line #${String(lineIndex)} in note ${noteFilename}:`)
+  // logDebug('getHeadingHierarchyForThisPara', `Finding headings for line #${String(lineIndex)} in note ${noteFilename}:`)
   const thisNote = para.note
   const noteParas = thisNote?.paragraphs
   if (!noteParas || noteParas.length === 0) {
@@ -31,6 +31,6 @@ export function getHeadingHierarchyForThisPara(para) {
     }
     lineIndex--
   }
-  logDebug('getHeadingHierarchyForThisPara', `-> ${String(theseHeadings.length)} headings found: [${String(theseHeadings)}]`)
+  // logDebug('getHeadingHierarchyForThisPara', `-> ${String(theseHeadings.length)} headings found: [${String(theseHeadings)}]`)
   return theseHeadings
 }

jgclark.Dashboard/CHANGELOG.md

@@ -1,6 +1,12 @@
 # What's changed in 🎛 Dashboard plugin?
 For more details see the [plugin's documentation](https://github.com/NotePlan/plugins/tree/main/jgclark.Dashboard/).
 
+## [2.1.8] 2025-01-31 (unreleased)
+### Changed
+- When clicking on a Section Title or note link, the note will be opened in the Editor window, and that will now be brought to the front.
+- The Edit All Perspectives table now has subtly shaded alternate rows
+- The window starts saying 'Generating' not 'Refreshing'
+
 ## [2.1.7] 2025-01-30
 ### Changed
 - Perspectives: if you have 'Apply to sections under headings in Calendar notes?' turned on, this now applies to all the preceding headings up the H5->H1 hierarchy for that line.

jgclark.Dashboard/plugin.json

@@ -5,9 +5,9 @@
   "plugin.name": "🎛 Dashboard",
   "plugin.description": "A Dashboard for NotePlan, that in one place shows\n- a compact list of open tasks and checklists from today's note\n- scheduled open tasks and checklists from other notes.\n- Similarly for yesterday's note, tomorrow's note, and the weekly, monthly and quarterly notes too (if used)\n- all overdue tasks\n- all open tasks and checklists that contain particular @tags or #mentions of your choosing\n- the next notes ready to review (if you use the 'Projects and Reviews' plugin).",
   "plugin.author": "@jgclark",
-  "plugin.version": "2.1.7",
+  "plugin.version": "2.1.8",
   "plugin.hidden": false,
-  "plugin.lastUpdateInfo": "2.1.7: various fixes and small improvements.\n2.1.6: allow all current timeblocks to be shown, not just the first. Add new @repeat()s if using the extended syntax from the Repeat Extensions plugin. Bug fixes.\n2.1.5: fixes to time blocks and scheduling items.\n2.1.4: fix to Interactive Processing, and Edit All Perspectives dialog now shows unsaved changes.\n2.1.3: fixes to display of timeblocks, and checklist counts being wrong. Slightly smarter task dialog.\n2.1.2: fix bug - Today section not showing up; fix settings description for max items to show.\n2.1.1: fix bug - Tomorrow section not showing up.\n2.1.0: Add Perspectives; new 'Current Time Block' section; new 'Last Week' section; and many other improvements and fixes.\n2.0.6: tweak to rescheduling items, and other small bug fixes and tweaks.\n2.0.5: fix bug in 'Move all overdue to Today' command.\n2.0.4: add new 'Priority' section.\n2.0.3: layout improvements\n2.0.2: small improvements.\n2.0.1: removal of older settings system: it now only uses the quick-access menu.\n2.0.0: major new release -- see documentation for all the new features",
+  "plugin.lastUpdateInfo": "2.1.8: various fixes and small improvements.\n2.1.7: various fixes and small improvements.\n2.1.6: allow all current timeblocks to be shown, not just the first. Add new @repeat()s if using the extended syntax from the Repeat Extensions plugin. Bug fixes.\n2.1.5: fixes to time blocks and scheduling items.\n2.1.4: fix to Interactive Processing, and Edit All Perspectives dialog now shows unsaved changes.\n2.1.3: fixes to display of timeblocks, and checklist counts being wrong. Slightly smarter task dialog.\n2.1.2: fix bug - Today section not showing up; fix settings description for max items to show.\n2.1.1: fix bug - Tomorrow section not showing up.\n2.1.0: Add Perspectives; new 'Current Time Block' section; new 'Last Week' section; and many other improvements and fixes.\n2.0.6: tweak to rescheduling items, and other small bug fixes and tweaks.\n2.0.5: fix bug in 'Move all overdue to Today' command.\n2.0.4: add new 'Priority' section.\n2.0.3: layout improvements\n2.0.2: small improvements.\n2.0.1: removal of older settings system: it now only uses the quick-access menu.\n2.0.0: major new release -- see documentation for all the new features",
   "plugin.dependencies": [],
   "plugin.requiredFiles": [
     "react.c.WebView.bundle.dev.js"

jgclark.Dashboard/src/clickHandlers.js

@@ -380,6 +380,7 @@ export async function doShowNoteInEditorFromFilename(data: MessageDataObject): P
   const { filename, modifierKey } = data
   if (!filename) throw 'doShowNoteInEditorFromFilename: No filename: stopping'
   const note = await openNoteByFilename(filename, { newWindow: modifierKey === 'meta', splitView: modifierKey === 'alt' })
+  Editor.focus()
   return handlerResult(note ? true : false)
 }
 
@@ -391,6 +392,7 @@ export async function doShowNoteInEditorFromTitle(data: MessageDataObject): Prom
   const wantedTitle = filename
   const note = await Editor.openNoteByTitle(wantedTitle)
   if (note) {
+    Editor.focus()
     logDebug('bridgeClickDashboardItem', `-> successful call to open title ${wantedTitle} in Editor`)
     return handlerResult(true)
   } else {

jgclark.Dashboard/src/countDoneTasks.js

@@ -178,7 +178,7 @@ export function updateDoneCountsFromChangedNotes(reason: string = ''): number {
 
     // Read current list from todaysChangedNoteList.json, and get time of it.
     // Note: can't get a timestamp from plugin files, so need to use a separate preference
-    logInfo('updateDoneCountsFromChangedNotes', `Starting: ${reason}`)
+    logDebug('updateDoneCountsFromChangedNotes', `Starting: ${reason}`)
     // logDebug('updateDoneCountsFromChangedNotes', `About to read ${changedNoteFile} ...`)
     if (DataStore.fileExists(changedNoteFile)) {
       const data = DataStore.loadData(changedNoteFile, true) ?? ''

jgclark.Dashboard/src/dataGeneration.js

@@ -24,7 +24,7 @@ import {
   isLineDisallowedByExcludedTerms,
   makeDashboardParas,
 } from './dashboardHelpers'
-import { getTimeBlockSectionData, getTodaySectionData, getYesterdaySectionData, getTomorrowSectionData } from './dataGenerationDays'
+import { getTodaySectionData, getYesterdaySectionData, getTomorrowSectionData } from './dataGenerationDays'
 import { getLastWeekSectionData, getThisWeekSectionData } from './dataGenerationWeeks'
 import { openMonthParas, refMonthParas, tagParasFromNote, nextProjectNoteItems } from './demoData'
 import { getTagSectionDetails } from './react/components/Section/sectionHelpers'
@@ -56,10 +56,10 @@ export async function getAllSectionsData(useDemoData: boolean = false, forceLoad
     // V2
     // Work out which sections to show
     const sectionsToShow: Array<TSectionCode> = forceLoadAll ? allSectionCodes : getListOfEnabledSections(config)
-    logInfo('getAllSectionsData', `${String(sectionsToShow.length)} sections to show: ${String(sectionsToShow)}`)
+    logDebug('getAllSectionsData', `>>>>> Starting with ${String(sectionsToShow.length)} sections to show: ${String(sectionsToShow)}`)
     const sections: Array<TSection> = await getSomeSectionsData(sectionsToShow, useDemoData, useEditorWherePossible)
-
     // logDebug('getAllSectionsData', `=> sections ${getDisplayListOfSectionCodes(sections)} (unfiltered)`)
+    logDebug('getAllSectionsData', `<<<<< Finished`)
 
     return sections.filter((s) => s) //get rid of any nulls b/c some of the sections above could return null
   } catch (error) {
@@ -294,12 +294,6 @@ export function getThisMonthSectionData(config: TDashboardSettings, useDemoData:
       } else {
         // Get list of open tasks/checklists from current monthly note (if it exists)
         if (sortedRefParas.length > 0) {
-          // // make a sectionItem for each item, and then make a section too.
-          // sortedRefParas.map((p) => {
-          //   const thisID = `${sectionNumStr}-${itemCount}`
-          //   items.push(createSectionItemObject(thisID, p))
-          //   itemCount++
-          // })
           // Iterate and write items for first (or combined) section
           items = createSectionOpenItemsFromParas(sortedRefParas, sectionNumStr)
           itemCount += items.length
@@ -497,12 +491,6 @@ export function getThisQuarterSectionData(config: TDashboardSettings, useDemoDat
       } else {
         // Get list of open tasks/checklists from current quarterly note (if it exists)
         if (sortedRefParas.length > 0) {
-          // // make a sectionItem for each item, and then make a section too.
-          // sortedRefParas.map((p) => {
-          //   const thisID = `${sectionNumStr}-${itemCount}`
-          //   items.push(createSectionItemObject(thisID, p))
-          //   itemCount++
-          // })
           // Iterate and write items for this section
           items = createSectionOpenItemsFromParas(sortedRefParas, sectionNumStr)
           itemCount += items.length
@@ -691,8 +679,6 @@ export function getTaggedSectionData(config: TDashboardSettings, useDemoData: bo
   }
 
   // Return section details, even if no items found
-  // const tagSectionDescription =
-  // totalCount > itemCount ? `first {count} from ${String(totalCount)} items ordered by ${config.overdueSortOrder}` : `{count} item{s} ordered by ${config.overdueSortOrder}`
   const tagSectionDescription = `{count} item{s} ordered by ${config.overdueSortOrder}`
   const section: TSection = {
     ID: sectionNumStr,

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

@@ -164,7 +164,7 @@ const Header = ({ lastFullRefresh }: Props): React$Node => {
   // ----------------------------------------------------------------------
   // Constants
   // ----------------------------------------------------------------------
-  const { sections, logSettings } = pluginData
+  const { sections, logSettings, firstRun } = pluginData
 
   const visibleSectionCodes = getVisibleSectionCodes(dashboardSettings, sections)
 
@@ -195,7 +195,7 @@ const Header = ({ lastFullRefresh }: Props): React$Node => {
 
       {showRefreshButton && (
         <div className="refreshButtons">
-          <RefreshControl refreshing={pluginData.refreshing === true} handleRefreshClick={handleRefreshClick(false)} />
+          <RefreshControl refreshing={pluginData.refreshing === true} firstRun={firstRun} handleRefreshClick={handleRefreshClick(false)} />
           {showHardRefreshButton && (
             <button onClick={handleRefreshClick(true)} className="HAButton hardRefreshButton">
               <i className={'fa-regular fa-arrows-retweet'}></i>

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

@@ -2,14 +2,16 @@
 //----------------------------------------------------------------------
 // RefreshControl.jsx
 // renders a refresh button or a refreshing spinner depending on refreshing state
-// Last updated 2024-09-18 for v2.1.0.a11 by @jgclark
+// Last updated 2025-01-31 for v2.1.8 by @jgclark
 //----------------------------------------------------------------------
 
 import React from 'react'
 import Button from './Button.jsx'
+import { logDebug, logInfo } from '@helpers/dev'
 
 type Props = {
   refreshing: boolean,
+  firstRun: boolean,
   handleRefreshClick: () => void,
 }
 
@@ -22,19 +24,19 @@ type Props = {
  * @returns {React$Node} - The spinner or button component based on the refreshing state.
  */
 const RefreshControl = (props: Props): React$Node => {
-  const { refreshing, handleRefreshClick } = props
+  const { refreshing, firstRun, handleRefreshClick } = props
+  logInfo('RefreshControl', `refreshing = ${String(refreshing)}, firstRun = ${String(firstRun)}`)
   return (
     <Button
       text={
         <>
-          {/* <i className={refreshing ? "fa-spinner fa-spin" : "fa-regular fa-arrow-rotate-right"}></i> */}
           <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 ? "pad-left greyedText" : "pad-left"}>Refresh</span>
+          <span className={refreshing || firstRun ? "pad-left greyedText" : "pad-left"}>{firstRun ? 'Generating' : 'Refresh'}</span>
         </>
       }
       clickHandler={handleRefreshClick}
-      disabled={refreshing}
+      disabled={refreshing || firstRun}
       className="HAButton refreshButton"
     />
   )

jgclark.Dashboard/src/react/css/PerspectivesTable.css

@@ -54,6 +54,11 @@
     border-right: none;
   }
 
+  /* Use slightly different style for every other row */
+  tr:nth-child(even) {
+    background-color: var(--bg-alt-color);
+  }
+
   /* Sticky header for perspective names */
   .sticky-header {
     position: sticky;

jgclark.Dashboard/src/reactMain.js

@@ -360,19 +360,19 @@ async function getDashboardSettingsFromPerspective(perspectiveSettings: TPerspec
  */
 export async function getInitialDataForReactWindow(perspectiveName: string = '', useDemoData: boolean = false): Promise<PassedData> {
   try {
+    logDebug('getInitialDataForReactWindow', `>>>>> Starting`)
     const startTime = new Date()
     let perspectiveSettings = await getPerspectiveSettings()
     // If a perspective is specified, then update the setting to point to it before opening the React Window
     let dashboardSettings: TDashboardSettings = await getDashboardSettings()
     if (perspectiveName) {
-      logInfo('getInitialDataForReactWindow', `switching to perspective '${perspectiveName}'`)
-      // perspectiveSettings = setActivePerspective(perspectiveName, perspectiveSettings)
+      logDebug('getInitialDataForReactWindow', `will use perspective '${perspectiveName}'`)
       perspectiveSettings = (await switchToPerspective(perspectiveName, perspectiveSettings)) || perspectiveSettings
       dashboardSettings = await getDashboardSettingsFromPerspective(perspectiveSettings)
     }
     // clo(dashboardSettings, `getInitialDataForReactWindow: dashboardSettings=`)
     // get whatever pluginData you want the React window to start with and include it in the object below. This all gets passed to the React window
-    const pluginData = await getPluginData(dashboardSettings, perspectiveSettings, useDemoData)
+    const pluginData = await getPluginData(dashboardSettings, perspectiveSettings, useDemoData) // Note: the only time this is called.
     logDebug('getInitialDataForReactWindow', `lastFullRefresh = ${String(pluginData.lastFullRefresh)}`)
     clo(pluginData.dashboardSettings, `getInitialData pluginData.dashboardData`)
     const ENV_MODE = 'development' /* 'development' helps during development. set to 'production' when ready to release */
@@ -386,6 +386,7 @@ export async function getInitialDataForReactWindow(perspectiveName: string = '',
       startTime,
       windowID: WEBVIEW_WINDOW_ID,
     }
+    logDebug('getInitialDataForReactWindow', `<<<<< Finished`)
     return dataToPass
   } catch (error) {
     logError(pluginJson, error.message)
@@ -497,14 +498,12 @@ export async function getPluginData(dashboardSettings: TDashboardSettings, persp
       perspectiveSettings: true,
     },
     totalDoneCount: 0,
+    firstRun: true,
   }
+  logDebug('getPluginData', `After forming initial pluginData, firstRun = false`)
 
   // Calculate all done task counts (if the appropriate setting is on)
   if (NPSettings.doneDatesAvailable) {
-    // V1 method
-    // const totalDoneCounts = rollUpDoneCounts([getTotalDoneCountsFromSections(sections)], buildListOfDoneTasksToday())
-    // pluginData.totalDoneCounts = totalDoneCounts
-    // V2 method
     const totalDoneCount = updateDoneCountsFromChangedNotes('end of getPluginData')
     pluginData.totalDoneCount = totalDoneCount
   }