Improve display of Teamspace part of note links in displayed tasks

Author: jgclark

jgclark.Dashboard/CHANGELOG.md

@@ -11,6 +11,7 @@ For more details see the [plugin's documentation](https://github.com/NotePlan/pl
 
 ## [2.4.0.b1] 2025-12-05
 - new "Spaces to Include" setting which controls which (Team)Spaces you wish to include, plus whether or not to include the Private "Space" (all notes not in a Space). This is applied per Perspective.
+- Improved display of Teamspace part of note links in displayed items
 
 ## [2.3.3] 2025-12-04
 - new 'Year' section available

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

@@ -438,6 +438,7 @@ const DialogForTaskItems = ({ details: detailsMessageObject, onClose, positionDi
                   item={item}
                   thisSection={sectionCodes}
                   alwaysShowNoteTitle={true}
+                suppressTeamspaceName={false}
                 />
             </div>
           </TooltipOnKeyPress>

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

@@ -78,12 +78,15 @@ function ItemContent({ item /*, children */, thisSection }: Props): React$Node {
     })
   }
 
-  // Note: This how to remove tag/mention, if they match the item's sectionCode. Decided not to keep this, as it is doesn't suit some use cases for tags/mentions.
+  // Note: This is how to remove tag/mention, if they match the item's sectionCode. Decided not to keep this, as it is doesn't suit some use cases for tags/mentions.
   // if (thisSection.sectionCode === 'TAG') {
   //   const sectionTagOrMention = thisSection.name
   //   mainContent = mainContent.replace(sectionTagOrMention, '')
   // }
 
+  // If dashboardSettings reveals that we only have 1 teamspace active, and it is not the private space, then suppress the Teamspace name in the note link
+  const suppressTeamspaceName = dashboardSettings.includedTeamspaces.length === 1 && dashboardSettings.includedTeamspaces[0] !== 'private'
+
   // If hasChild, then set suitable display indicator
   // (Earlier options had used 'fa-arrow-down-from-line' and 'fa-block-quote' icons. But switched to ellipsis to match what main Editor added in 3.15.2)
   const possParentIcon = dashboardSettings.parentChildMarkersEnabled && item.para?.hasChild ? <i className="fa-solid fa-ellipsis parentMarkerIcon"></i> : ''
@@ -132,6 +135,7 @@ function ItemContent({ item /*, children */, thisSection }: Props): React$Node {
         item={item}
         thisSection={thisSection}
         alwaysShowNoteTitle={false}
+        suppressTeamspaceName={suppressTeamspaceName}
       />}
     </div>
   )

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

@@ -1,31 +1,32 @@
 // @flow
 //--------------------------------------------------------------------------
 // Dashboard React component to show Note Links after main item content
-// Last updated 2025-11-16 for v2.3.0 by @jgclark
+// Last updated 2025-12-05 for v2.4.0 by @jgclark
 //--------------------------------------------------------------------------
 import React from 'react'
 import type { TSection, TSectionItem } from '../../types.js'
 import { useAppContext } from './AppContext.jsx'
 import TooltipOnKeyPress from './ToolTipOnModifierPress.jsx'
 import { isDailyDateStr, isWeeklyDateStr, isMonthlyDateStr, isQuarterlyDateStr } from '@helpers/dateTime'
 import { parseTeamspaceFilename, TEAMSPACE_FA_ICON } from '@helpers/teamspace'
-import { logDebug, clo } from '@helpers/react/reactDev'
+import { clo, logDebug, logError, logInfo, logWarn } from '@helpers/react/reactDev'
 import { extractModifierKeys } from '@helpers/react/reactMouseKeyboard.js'
 
 //-----------------------------------------------------------
 
 type Props = {
   item: TSectionItem,
   thisSection: TSection,
-  alwaysShowNoteTitle: boolean
+  alwaysShowNoteTitle: boolean,
+  suppressTeamspaceName?: boolean
 }
 
 //-----------------------------------------------------------
 
 /**
  * Represents the main content for a single item within a section
  */
-function ItemNoteLink({ item, thisSection, alwaysShowNoteTitle = false }: Props): React$Node {
+function ItemNoteLink({ item, thisSection, alwaysShowNoteTitle = false, suppressTeamspaceName = false }: Props): React$Node {
 
   // ------ COMPUTED VALUES --------------------------------
 
@@ -48,20 +49,24 @@ function ItemNoteLink({ item, thisSection, alwaysShowNoteTitle = false }: Props)
   const parsedTeamspace = parseTeamspaceFilename(filename)
   const isFromTeamspace = parsedTeamspace.isTeamspace
   const filenameWithoutTeamspacePrefix = parsedTeamspace.filename
-  // FIXME: this is still returning '/' for Teamspace calendar notes
-  const folderNamePart = (parsedTeamspace.filepath !== '/') ? `${parsedTeamspace.filepath} /` : ''
-  // logDebug(`ItemNoteLink`, `noteIconToUse:${noteIconToUse} with filenameWithoutTeamspacePrefix:${filenameWithoutTeamspacePrefix}`)
+  const trimmedFilePath = parsedTeamspace.filepath.trim()
+  // For Teamspace calendar notes, filepath can be '/', so we need to check for both empty and '/'
+  let folderNamePart = (trimmedFilePath !== '/' && trimmedFilePath !== '') ? `${trimmedFilePath} /` : ''
+  // logDebug(`ItemNoteLink`, `initial filePath:${parsedTeamspace.filepath} with folderNamePart:${folderNamePart}`)
   const showNoteTitle = alwaysShowNoteTitle || item.para?.noteType === 'Notes' || filenameWithoutTeamspacePrefix !== thisSection.sectionFilename
 
   // Show Teamspace indicator and name, if this is a Teamspace note
-  let teamspaceIndicator = null
-  if (isFromTeamspace) {
+  let teamspaceName = null
+  if (isFromTeamspace && !suppressTeamspaceName) {
     const teamspaceTitle = item.teamspaceTitle && item.teamspaceTitle !== 'Unknown Teamspace' ? item.teamspaceTitle : ''
-    teamspaceIndicator = (
-      <span className='pad-left teamspaceName pad-right-larger'>
+    teamspaceName = (
+      <span className='pad-left teamspaceName pad-right'>
         <i className={`${TEAMSPACE_FA_ICON} pad-right`}></i>{teamspaceTitle}
       </span>
     )
+    if (folderNamePart !== '' && !folderNamePart.endsWith('/')) {
+      folderNamePart = `/ ${folderNamePart}`
+    }
   }
 
   // ------ HANDLERS ---------------------------------------
@@ -85,10 +90,10 @@ function ItemNoteLink({ item, thisSection, alwaysShowNoteTitle = false }: Props)
       metaKey={{ text: 'Open in Floating Window' }}
       label={`${item.itemType}_${item.ID}_Open Note Link`}
       enabled={!reactSettings?.dialogData?.isOpen}>
-      {folderNamePart && <span className={`folderName pad-right`}>{folderNamePart}</span>}
+      {/* If it's a teamspace note prepend that icon + title */}
+      {isFromTeamspace && teamspaceName}
+      {folderNamePart && <span className={`folderName`}>{folderNamePart}</span>}
       <a className={`noteTitle`} onClick={handleLinkClick}>
-        {/* If it's a teamspace note prepend that icon + title */}
-        {isFromTeamspace && teamspaceIndicator}
         {/* Show note title if wanted */}
         {showNoteTitle && (
           <>