From f158a0c6a6ffb580fba005f03c3f8f388b1a9f6e Mon Sep 17 00:00:00 2001 From: David Wertheimer Date: Tue, 24 Oct 2023 18:10:45 -0700 Subject: [PATCH] Metadata clean-ups --- .../src/NPEventBlocks.js | 2 ++ np.MeetingNotes/CHANGELOG.md | 4 +++ np.MeetingNotes/plugin.json | 4 +-- np.Templating/CHANGELOG.md | 4 +++ np.Templating/plugin.json | 6 ++--- np.plugin-test/src/commandListGenerator.js | 6 ++--- .../src/react/PluginListingPage.jsx | 26 ++++++++++++++----- 7 files changed, 38 insertions(+), 14 deletions(-) diff --git a/dwertheimer.EventAutomations/src/NPEventBlocks.js b/dwertheimer.EventAutomations/src/NPEventBlocks.js index 4dbdd64a1..e494531bb 100644 --- a/dwertheimer.EventAutomations/src/NPEventBlocks.js +++ b/dwertheimer.EventAutomations/src/NPEventBlocks.js @@ -242,11 +242,13 @@ export async function processTimeLines(paragraphBlock: Array, config try { // First, we need to get all the data necessary to create this event, including user input // before we can show a status bar + clo(paragraphBlock, `processTimeLines: paragraphBlock contains ${paragraphBlock.length} lines`) const eventsToCreate = (await confirmEventTiming(paragraphBlock, config)) || [] // Now that we have all the info we need, we can create the events with a status bar config.calendar = (await checkOrGetCalendar(calendar, true)) || calendar || '' CommandBar.showLoading(true, `Creating Events:\n(${0}/${eventsToCreate.length})`) await CommandBar.onAsyncThread() + logDebug(pluginJson, `eventsToCreate.length=${eventsToCreate.length}`) for (let j = 0; j < eventsToCreate.length; j++) { const item = eventsToCreate[j] clo(config, `processTimeLines: config`) diff --git a/np.MeetingNotes/CHANGELOG.md b/np.MeetingNotes/CHANGELOG.md index c6b5f821a..5677d2ba5 100644 --- a/np.MeetingNotes/CHANGELOG.md +++ b/np.MeetingNotes/CHANGELOG.md @@ -4,6 +4,10 @@ See Plugin [README](https://github.com/NotePlan/plugins/blob/main/np.MeetingNotes/README.md) for details on available commands and use case. +## [1.2.1] - 2023-10-24 @dwertheimer + +- hiding plugin from directory + ## [1.2.0] - 2023-09-25 (@dwertheimer) - Adding some intelligence to try to pick up existing meeting notes so as to not create them again diff --git a/np.MeetingNotes/plugin.json b/np.MeetingNotes/plugin.json index baabe3df9..3d8db72e8 100644 --- a/np.MeetingNotes/plugin.json +++ b/np.MeetingNotes/plugin.json @@ -3,13 +3,13 @@ "noteplan.minAppVersion": "3.5.0", "plugin.id": "np.MeetingNotes", "plugin.name": "✍️ Meeting Notes", - "plugin.version": "1.2.0", + "plugin.version": "1.2.1", "plugin.description": "Create Meeting Notes from events using templates.", "plugin.author": "NotePlan", "plugin.dependencies": [], "plugin.script": "script.js", "plugin.url": "CorePlugins", - "plugin.hidden": false, + "plugin.hidden": true, "plugin.commands": [ { "name": "newMeetingNote", diff --git a/np.Templating/CHANGELOG.md b/np.Templating/CHANGELOG.md index 9dac82e00..b33a93094 100644 --- a/np.Templating/CHANGELOG.md +++ b/np.Templating/CHANGELOG.md @@ -4,6 +4,10 @@ See Plugin [README](https://github.com/NotePlan/plugins/blob/main/np.Templating/README.md) for details on available commands and use case. +## [1.9.12] 2023-10-24 @dwertheimer + +- Changed title to just 'Templating'] + ## [1.9.11] 2023-10-12 @jgclark - add 'todayProgressFromTemplate' template command (from Habits & Summaries v0.20) diff --git a/np.Templating/plugin.json b/np.Templating/plugin.json index 6ce4da14f..0c41a9465 100644 --- a/np.Templating/plugin.json +++ b/np.Templating/plugin.json @@ -2,9 +2,9 @@ "macOS.minVersion": "10.13.0", "noteplan.minAppVersion": "3.5.0", "plugin.id": "np.Templating", - "plugin.name": "📒 np.Templating", - "plugin.version": "1.9.11", - "plugin.lastUpdateInfo": "1.9.11: add 'todayProgressFromTemplate' template command.\n1.9.10: add folder attribute to np:new for xcallback creation inside a specific folder", + "plugin.name": "📒 Templating", + "plugin.version": "1.9.12", + "plugin.lastUpdateInfo": "1.9.12: Changed title to just 'Templating'.\n1.9.11: add 'todayProgressFromTemplate' template command.\n1.9.10: add folder attribute to np:new for xcallback creation inside a specific folder", "plugin.description": "Templating Plugin for NotePlan", "plugin.author": "Mike Erickson (@codedungeon)", "plugin.dependencies": [], diff --git a/np.plugin-test/src/commandListGenerator.js b/np.plugin-test/src/commandListGenerator.js index b0b531aff..8b359004a 100644 --- a/np.plugin-test/src/commandListGenerator.js +++ b/np.plugin-test/src/commandListGenerator.js @@ -132,7 +132,7 @@ export async function getFilteredPluginData(showInstalledOnly: boolean): Promise plugin.updateIsAvailable = isInstalled && plugin.version !== installedVersion?.version plugin.isInstalled = installedVersion != null plugin.installedVersion = installedVersion?.version || '' - plugin.installLink = createRunPluginCallbackUrl(pluginJson['plugin.id'], 'Install Plugin and Re-Generate Listing', ['false']) + plugin.installLink = createRunPluginCallbackUrl(pluginJson['plugin.id'], 'Install Plugin and Re-Generate Plugin Listing Page', ['false']) plugin.documentation = plugin.repoUrl || '' const commands = plugin?.commands?.reduce((acc, c) => { @@ -188,10 +188,10 @@ export async function generatePluginCommandList(pluginID: string = '', listExten let installLink = '' if (isInstalled) { if (updateIsAvailable) { - installLink = ` ${createPrettyRunPluginLink(`update to latest version`, pluginJson['plugin.id'], 'Install Plugin and Re-Generate Listing', [plugin.name])}` + installLink = ` ${createPrettyRunPluginLink(`update to latest version`, pluginJson['plugin.id'], 'Install Plugin and Re-Generate Plugin Listing Page', [plugin.name])}` } } else { - installLink = ` ${createPrettyRunPluginLink(`install it`, pluginJson['plugin.id'], 'Install Plugin and Re-Generate Listing', [plugin.name])}` + installLink = ` ${createPrettyRunPluginLink(`install it`, pluginJson['plugin.id'], 'Install Plugin and Re-Generate Plugin Listing Page', [plugin.name])}` } output.push(`---\n## ${plugin.name} v${plugin.version}${installLink}`) output.push(`> ${plugin.desc}`) diff --git a/np.plugin-test/src/react/PluginListingPage.jsx b/np.plugin-test/src/react/PluginListingPage.jsx index 0af52d267..b648dbd4c 100644 --- a/np.plugin-test/src/react/PluginListingPage.jsx +++ b/np.plugin-test/src/react/PluginListingPage.jsx @@ -90,7 +90,7 @@ function CommandTable({ commands, viewOption }: CommandTableProps): React$Node { {viewOption !== 'commandsOnly' && ( - Command + Command Description @@ -117,7 +117,22 @@ type PluginSectionProps = { * HTML OUTPUT FOR EACH PLUGIN */ function PluginSection({ plugin, viewOption, index }: PluginSectionProps): React$Node { - const installedDisplayString = plugin.isInstalled ? 'installed' : 'install' + const installedDisplayString = plugin.isInstalled ? ( + '(installed)' + ) : ( + + Install + + ) + + const docsString = plugin.documentation ? ( + + Documentation + + ) : ( + '' + ) + const updateIsAvailableString = plugin.updateIsAvailable ? '(update available)' : '' const pluginSectionStyle = { @@ -131,9 +146,8 @@ function PluginSection({ plugin, viewOption, index }: PluginSectionProps): React {updateIsAvailableString && {updateIsAvailableString}} by: {plugin.author} - {installedDisplayString} - {false && {plugin.installLink}} - {false && {plugin.documentation}} + {docsString} + {installedDisplayString} {viewOption === 'all' && ( <> @@ -206,10 +220,10 @@ function PluginListingPage(props: Props): React$Node { return ( <>
+ setFilter(e.target.value)} /> - setFilter(e.target.value)} />
{filteredPluginsAndCommands?.length ? (