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

Author: jgclark

helpers/__tests__/dateTime.test.js

@@ -14,7 +14,7 @@ beforeAll(() => {
   global.DataStore = DataStore
   global.Editor = Editor
   global.NotePlan = new NotePlan()
-  DataStore.settings['_logLevel'] = 'DEBUG' // change this to DEBUG to get more logging, or 'none' for quiet
+  DataStore.settings['_logLevel'] = 'none' // change this to DEBUG to get more logging, or 'none' for quiet
 })
 
 const PLUGIN_NAME = `📙 ${colors.yellow('helpers/dateTime')}`
@@ -98,8 +98,8 @@ describe(`${PLUGIN_NAME}`, () => {
   })
 
   /*
-    * findOverdueDatesInString()
-    */
+   * findOverdueDatesInString()
+   */
   describe('findOverdueDatesInString()' /* function */, () => {
     test('should find no date in line with no overdue', () => {
       const result = dt.findOverdueDatesInString('>2922-01-01')
@@ -189,8 +189,8 @@ describe(`${PLUGIN_NAME}`, () => {
   })
 
   /*
- * isDailyDateStr()
- */
+   * isDailyDateStr()
+   */
   describe('isDailyDateStr()', () => {
     test('false for empty string', () => {
       const result = dt.isDailyDateStr('')
@@ -219,8 +219,8 @@ describe(`${PLUGIN_NAME}`, () => {
   })
 
   /*
- * isYearlyDateStr()
- */
+   * isYearlyDateStr()
+   */
   describe('isYearlyDateStr()', () => {
     test('should find a bare Year', () => {
       const result = dt.isYearlyDateStr('2022')

helpers/__tests__/paragraph.test.js

@@ -10,7 +10,7 @@ beforeAll(() => {
   global.DataStore = DataStore
   global.Editor = Editor
   global.NotePlan = NotePlan
-  DataStore.settings['_logLevel'] = 'DEBUG' //change this to DEBUG to get more logging. Or 'none' to get none.
+  DataStore.settings['_logLevel'] = 'none' //change this to DEBUG to get more logging. Or 'none' to get none.
 })
 
 beforeEach(() => {
@@ -42,7 +42,9 @@ describe('paragraph.js', () => {
       expect(result).toEqual('Something about  and')
     })
     test('should remove all types', () => {
-      const result = p.stripAllURIsAndNoteLinks('Something about http://www.tennis.org/ and [Wimbledon](https://www.wimbledon.org/) and [[link with#tag]] and [[link without that tag]]')
+      const result = p.stripAllURIsAndNoteLinks(
+        'Something about http://www.tennis.org/ and [Wimbledon](https://www.wimbledon.org/) and [[link with#tag]] and [[link without that tag]]',
+      )
       expect(result).toEqual('Something about  and Wimbledon and  and')
     })
     test('should remove all URIs and note links', () => {
@@ -195,7 +197,10 @@ describe('paragraph.js', () => {
       expect(result).toEqual(false)
     })
     test('should return false when term is not in any part of input string', () => {
-      const result = p.isTermInEventLinkHiddenPart('Home', 'This is a work event: ![📅](2022-05-06 07:15:::6qr6nbulhd7k3aakvf61atfsrd@google.com:::NA:::Work event with @Bob:::#1BADF8)')
+      const result = p.isTermInEventLinkHiddenPart(
+        'Home',
+        'This is a work event: ![📅](2022-05-06 07:15:::6qr6nbulhd7k3aakvf61atfsrd@google.com:::NA:::Work event with @Bob:::#1BADF8)',
+      )
       expect(result).toEqual(false)
     })
     test('should return false when term is within datetime part of an event link', () => {

helpers/userInput.js

@@ -133,15 +133,22 @@ export async function chooseOptionWithModifiers<T, TDefault = T>(
  * @param {Array<TCommandBarOptionObject>} options - array of options to display
  * @param {boolean} allowCreate - add an option to create a new item (default: false)
  * @returns {Promise<{value: T, label: string, index: number, keyModifiers: Array<string>}>} - Promise resolving to the result
- * see CommandBar.showOptions for more info
+ * Sends back the object that was chosen, plus an index of the chosen option and keyModifiers array
  */
 export async function chooseOptionWithModifiersV2(
   message: string,
-  options: Array<TCommandBarOptionObject>,
+  options: Array<{ ...TCommandBarOptionObject, label?: string }>,
   additionalCreateNewOption?: TCommandBarOptionObject,
-): Promise<{ index: number, keyModifiers: Array<string>, label: string, value: string }> {
+): Promise<{ index: number, keyModifiers: Array<string>, label?: string, ...TCommandBarOptionObject, text?: string, value?: string }> {
   logDebug('userInput / chooseOptionWithModifiersV2()', `About to showOptions with ${options.length} options & prompt: "${message}"`)
 
+  // label field is used elsewhere, but @eduardme made showOptions use text instead, so we map it back to label
+  if (Array.isArray(options) && options.length > 0 && options[0].label && !options[0].text) {
+    options.forEach((option, i) => {
+      options[i] = { ...option, text: option.label ?? option.text } // $FlowFixMe[incompatible-type]
+    })
+  }
+
   // Add the "Add new item" option at the start, if given
   const displayOptions = options.slice()
   if (additionalCreateNewOption) {
@@ -150,7 +157,9 @@ export async function chooseOptionWithModifiersV2(
   logDebug('userInput / chooseOptionWithModifiersV2()', `displayOptions: ${displayOptions.length} options`)
 
   // Use newer CommandBar.showOptions() from v3.18
-  const { index, keyModifiers } = await CommandBar.showOptions(displayOptions, message)
+  const result = await CommandBar.showOptions(displayOptions, message)
+  const { index, keyModifiers } = result
+  clo(result, `chooseOptionWithModifiersV2 chosen result (${typeof result})`)
 
   // Check if the user selected "Add new item"
   if (additionalCreateNewOption && index === 0) {
@@ -160,13 +169,14 @@ export async function chooseOptionWithModifiersV2(
       return {
         value: result,
         label: result,
+        text: result,
         index: -1, // -1 indicates a custom entry
         keyModifiers: keyModifiers || [],
       }
     }
   }
 
-  return { value: displayOptions[index].text ?? '', label: displayOptions[index].text ?? '', index, keyModifiers }
+  return { ...displayOptions[index], index, keyModifiers }
 }
 
 /**

np.CallbackURLs/CHANGELOG.md

@@ -4,6 +4,10 @@
 
 See Plugin [README](https://github.com/NotePlan/plugins/blob/main/np.CallbackURLs/README.md) for details on available commands and use cases.
 
+## [1.9.1] - 2025-08-19 @dwertheimer
+
+- Fix bug in wizard when using showOptions()
+
 ## [1.9.0] - 2025-08-18 @dwertheimer
 
 - Fix template runner wizard bug

np.CallbackURLs/plugin.json

@@ -5,8 +5,8 @@
   "noteplan.minAppVersion-NOTE": "Includes folder view picker",
   "plugin.id": "np.CallbackURLs",
   "plugin.name": "🔗 Link Creator",
-  "plugin.version": "1.9.0",
-  "plugin.lastUpdateInfo": "1.9.0: Added folder view picker to wizard",
+  "plugin.version": "1.9.1",
+  "plugin.lastUpdateInfo": "1.9.1: Added folder view picker to wizard",
   "plugin.description": "Interactively helps you form links/x-callback-urls (and also Template Tags with runPlugin commands) to perform actions from within NotePlan or between other applications and NotePlan.",
   "plugin.author": "dwertheimer",
   "plugin.dependencies": [],

np.CallbackURLs/src/NPOpenFolders.js

@@ -95,20 +95,20 @@ async function selectFolder(folderOptions: Array<Object>): Promise<Object | null
  * @param {Array<Object>} views - Array of named views for the folder
  * @returns {Array<Object>} Array of view option objects
  */
-function createViewOptions(views: Array<Object>): Array<TCommandBarOptionObject> {
-  let viewOptions: Array<TCommandBarOptionObject> = []
+function createViewOptions(views: Array<Object>): Array<Object> {
+  let viewOptions: Array<Object> = []
 
   // If there are named views, add them as options
   if (views && views.length > 0) {
     viewOptions = views.map((view: Object) => ({
-      label: `${view.name}`,
+      text: `${view.name}`,
       value: view.name,
       shortDescription: `(${view.layout})`,
     }))
   }
 
   // Always add option to open folder view default
-  viewOptions.unshift({ label: '< Open the folder view default >', value: '_folder_', shortDescription: 'Default folder view' })
+  viewOptions.unshift({ text: '< Open the folder view default >', value: '_folder_', shortDescription: 'Default folder view' })
 
   clo(viewOptions, `createViewOptions: viewOptions`)
   return viewOptions
@@ -127,8 +127,13 @@ async function selectView(viewOptions: Array<Object>, selectedFolder: string): P
   if (viewOptions.length === 1) {
     return viewOptions[0].value
   }
-
-  return await chooseOption(`Choose a view for '${selectedFolder}'`, viewOptions, '')
+  clo(viewOptions, `selectView viewOptions`)
+  const responseObj = await chooseOptionWithModifiersV2(`Choose a view for '${selectedFolder}'`, viewOptions)
+  if (responseObj) {
+    clo(responseObj, `selectView responseObj`)
+    return responseObj.value
+  }
+  return ''
 }
 
 /**

np.Templating/__tests__/web-api-tests.test.js

@@ -43,7 +43,7 @@ describe(`${PLUGIN_NAME} - ${section('Web API Tests')}`, () => {
     global.console = new CustomConsole(process.stdout, process.stderr, simpleFormatter)
     global.NotePlan = new NotePlan()
     global.DataStore = DataStore
-    DataStore.settings['_logLevel'] = 'DEBUG'
+    DataStore.settings['_logLevel'] = 'none'
     global.Editor = Editor
 
     // Set up global fetch to use node-fetch