diff --git a/CHANGELOG.md b/CHANGELOG.md index 010160dc06..61d22f2f55 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,14 @@ ## Unreleased +### New features + +- [#2351: Build the basic plugin details page](https://github.com/alphagov/govuk-prototype-kit/pull/2351) + ## 13.16.0 ### New features - +- - [#2384: Add format items filter to core filters](https://github.com/alphagov/govuk-prototype-kit/pull/2384) - [#2382: Make any npm module a plugin via a proxy plugin config](https://github.com/alphagov/govuk-prototype-kit/pull/2382) diff --git a/cypress/e2e/plugins/plugin-utils.js b/cypress/e2e/plugins/plugin-utils.js index 8a8416ab16..0ab6d16406 100644 --- a/cypress/e2e/plugins/plugin-utils.js +++ b/cypress/e2e/plugins/plugin-utils.js @@ -42,22 +42,26 @@ function provePluginTemplatesUninstalled (plugin) { } function initiatePluginAction (action, plugin, pluginName, options = {}) { - if (action === 'install') { - cy.visit(managePluginsPagePath) - } else { - cy.visit(manageInstalledPluginsPagePath) - } + cy.visit(managePluginsPagePath) if (pluginName) { cy.get(`[data-plugin-package-name="${plugin}"]`) .scrollIntoView() - .find('h4') + .find('a') .contains(pluginName) } cy.get(`[data-plugin-package-name="${plugin}"]`) .scrollIntoView() - .find('button') + .find('a') + .click() + + if (action === 'update') { + cy.get('a') + .contains('Latest version:').click() + } + + cy.get('button') .contains(capitalize(action)) .click() @@ -73,7 +77,7 @@ function provePluginInstalled (plugin, pluginName) { if (pluginName) { cy.get(`[data-plugin-package-name="${plugin}"]`) .scrollIntoView() - .find('h4') + .find('a') .contains(pluginName) } @@ -91,7 +95,7 @@ function provePluginUninstalled (plugin, pluginName) { if (pluginName) { cy.get(`[data-plugin-package-name="${plugin}"]`) .scrollIntoView() - .find('h4') + .find('a') .contains(pluginName) } @@ -108,7 +112,13 @@ function provePluginUpdated (plugin, pluginName) { provePluginInstalled(plugin, pluginName) cy.get(`[data-plugin-package-name="${plugin}"]`) .scrollIntoView() - .find('button') + .find('a') + .click() + + cy.get('a') + .contains('Latest version:').should('not.exist') + + cy.get('button') .contains(capitalize('update')).should('not.exist') } @@ -117,10 +127,13 @@ function provePluginInstalledOldVersion (plugin, pluginName) { if (pluginName) { cy.get(`[data-plugin-package-name="${plugin}"]`) .scrollIntoView() - .find('h4') + .find('a') .contains(pluginName) } + cy.get(`[data-plugin-package-name="${plugin}"] strong.govuk-tag`) + .contains('Update available') + cy.get('#installed-plugins-link').click() cy.get(`[data-plugin-package-name="${plugin}"]`) diff --git a/lib/assets/sass/manage-prototype.scss b/lib/assets/sass/manage-prototype.scss index 977587e8a3..855e33017f 100644 --- a/lib/assets/sass/manage-prototype.scss +++ b/lib/assets/sass/manage-prototype.scss @@ -440,6 +440,15 @@ body .govuk-prototype-kit-manage-prototype-govuk-tag { padding-left: 0 !important; } +.govuk-prototype-kit-manage-prototype-plugin-heading { + margin-bottom: 0; +} + +.govuk-prototype-kit-manage-prototype-plugin-sub-heading { + color: #505a5f; + margin-bottom: 15px; +} + .govuk-prototype-kit-manage-prototype-plugin-list-plugin-list { border-top: 1px solid #b1b4b6; margin-bottom: 2em; @@ -524,6 +533,9 @@ body .govuk-prototype-kit-manage-prototype-govuk-tag { @media(min-width: 40.0525em) { .govuk-prototype-kit-manage-prototype-plugin-list-plugin-list__item-buttons { + .govuk-button-group { + margin-bottom: 0; + } .govuk-button, .govuk-link--no-visited-state { margin: 0 15px 0 0; } @@ -574,3 +586,10 @@ body .govuk-prototype-kit-manage-prototype-govuk-tag { } } } + +.govuk-prototype-kit-manage-prototype-plugin-details-links { + padding-top: 20px; + margin-bottom: 20px; + border-top: 2px solid #b1b4b6; + border-bottom: 2px solid #b1b4b6; +} diff --git a/lib/manage-prototype-handlers.js b/lib/manage-prototype-handlers.js index bfd51f90fd..0126235bb4 100644 --- a/lib/manage-prototype-handlers.js +++ b/lib/manage-prototype-handlers.js @@ -404,7 +404,7 @@ function getTemplatesPostInstallHandler (req, res) { })) } -function buildPluginData (pluginData) { +function buildPluginData (pluginData, isLatest) { if (pluginData === undefined) { return } @@ -417,22 +417,25 @@ function buildPluginData (pluginData) { installedVersion, required, localVersion, - pluginConfig = {} + pluginConfig = {}, + latestPluginConfig } = pluginData + const meta = isLatest ? latestPluginConfig?.meta || pluginConfig?.meta : pluginConfig?.meta const preparedPackageNameForDisplay = plugins.preparePackageNameForDisplay(packageName) return { ...preparedPackageNameForDisplay, - ...pluginConfig.meta, + ...meta, packageName, latestVersion, installedLocally, - installLink: `${contextPath}/plugins/install?package=${encodeURIComponent(packageName)}`, + installLink: installedVersion ? undefined : `${contextPath}/plugins/install?package=${encodeURIComponent(packageName)}`, installCommand: `npm install ${packageName}`, updateLink: updateAvailable ? `${contextPath}/plugins/update?package=${encodeURIComponent(packageName)}` : undefined, updateCommand: latestVersion && `npm install ${packageName}@${latestVersion}`, uninstallLink: installed && !required ? `${contextPath}/plugins/uninstall?package=${encodeURIComponent(packageName)}${installedLocally ? `&version=${encodeURIComponent(localVersion)}` : ''}` : undefined, uninstallCommand: `npm uninstall ${packageName}`, - installedVersion + installedVersion, + inThisPlugin: getInThisPluginDetails(isLatest ? latestPluginConfig || pluginConfig : pluginConfig) } } @@ -457,7 +460,7 @@ async function prepareForPluginPage (isInstalledPage, search) { status: isInstalledPage ? 'installed' : 'search', plugins: plugins.map(buildPluginData), found: plugins.length, - updates: installedPlugins.filter(plugin => plugin.updateAvailable).length + updates: installedPlugins.filter(plugin => !plugin.installedLocally && plugin.updateAvailable).length } } @@ -589,6 +592,24 @@ async function getPluginForRequest (req) { return chosenPlugin } +function getInThisPluginDetails (pluginConfig) { + const { nunjucksMacros = [], templates = [] } = pluginConfig || {} + const list = [] + if (nunjucksMacros?.length) { + list.push({ + title: 'Components', + items: nunjucksMacros.map(({ macroName }) => macroName) + }) + } + if (templates?.length) { + list.push({ + title: 'Templates', + items: templates.map(({ name }) => name) + }) + } + return list +} + function modeIsComplete (mode, { installedVersion, latestVersion, version, installedLocally }) { switch (mode) { case 'update': @@ -749,6 +770,24 @@ async function postPluginsModeHandler (req, res) { res.json({ status }) } +async function getPluginDetailsHandler (req, res) { + const packageName = req.query.package + const isLatest = req.route.path.split('/').pop() === 'latest' + const latestLink = isLatest ? '' : req.originalUrl.replace('?', '/latest?') + const installedLink = isLatest ? req.originalUrl.replace('/latest?', '?') : '' + const plugin = await lookupPackageInfo(packageName) + const { name, scope, installedVersion, latestVersion, ...pluginData } = buildPluginData(plugin, isLatest) + const viewData = { + ...pluginData, + installedVersion, + latestVersion, + latestLink, + installedLink, + plugin: { name, scope, version: latestLink ? installedVersion || latestVersion : latestVersion } + } + res.send(nunjucksManagementEnv.render(getManagementView('plugin-details.njk'), viewData)) +} + module.exports = { contextPath, setKitRestarted, @@ -772,5 +811,6 @@ module.exports = { getPluginsModeHandler, postPluginsStatusHandler, postPluginsModeMiddleware, - postPluginsModeHandler + postPluginsModeHandler, + getPluginDetailsHandler } diff --git a/lib/manage-prototype-handlers.test.js b/lib/manage-prototype-handlers.test.js index a0d0b57385..a532ba11f0 100644 --- a/lib/manage-prototype-handlers.test.js +++ b/lib/manage-prototype-handlers.test.js @@ -40,6 +40,7 @@ const { postTemplatesInstallHandler, getTemplatesPostInstallHandler, getPluginsHandler, + getPluginDetailsHandler, postPluginsStatusHandler, postPluginsModeMiddleware, getPluginsModeHandler, @@ -453,7 +454,8 @@ describe('manage-prototype-handlers', () => { name: pluginDisplayName.name, packageName, uninstallCommand: `npm uninstall ${packageName}`, - updateCommand: `npm install ${packageName}@${latestVersion}` + updateCommand: `npm install ${packageName}@${latestVersion}`, + inThisPlugin: [] } beforeEach(() => { @@ -521,6 +523,32 @@ describe('manage-prototype-handlers', () => { expect(res.redirect).toHaveBeenCalledWith(fullPath + '?search=' + search) }) + describe('getPluginDetailsHandler', () => { + it('plugins installed', async () => { + fse.readJsonSync.mockReturnValue(undefined) + req.route.path = 'plugins-installed' + await getPluginDetailsHandler(req, res) + expect(mockNunjucksRender).toHaveBeenCalledWith( + 'views/manage-prototype/plugin-details.njk', + expect.objectContaining({ + packageName: 'test-package', + installLink: '/manage-prototype/plugins/install?package=test-package', + installCommand: 'npm install test-package', + updateCommand: 'npm install test-package@2.0.0', + uninstallCommand: 'npm uninstall test-package', + inThisPlugin: [], + latestVersion: '2.0.0', + latestLink: '/current-url', + installedLink: '', + plugin: { + name: 'Test Package', + version: '2.0.0' + } + }) + ) + }) + }) + it('getPluginsModeHandler', async () => { req.params.mode = 'install' req.query.package = packageName diff --git a/lib/manage-prototype-routes.js b/lib/manage-prototype-routes.js index 42c824c03e..5841933aee 100644 --- a/lib/manage-prototype-routes.js +++ b/lib/manage-prototype-routes.js @@ -24,7 +24,8 @@ const { postPluginsModeHandler, postPluginsStatusHandler, pluginCacheMiddleware, - postPluginsHandler + postPluginsHandler, + getPluginDetailsHandler } = require('./manage-prototype-handlers') const { packageDir, projectDir } = require('./utils/paths') const { govukFrontendPaths } = require('./govukFrontendPaths') @@ -79,6 +80,9 @@ router.post('/plugins/:mode', postPluginsModeMiddleware) router.post('/plugins/:mode', csrfProtection, postPluginsModeHandler) +router.get('/plugin-details/latest', getPluginDetailsHandler) +router.get('/plugin-details', getPluginDetailsHandler) + // Find GOV.UK Frontend (via internal package, project fallback) router.use('/dependencies/govuk-frontend', express.static( govukFrontendPaths([packageDir, projectDir]).baseDir) diff --git a/lib/nunjucks/views/manage-prototype/index.njk b/lib/nunjucks/views/manage-prototype/index.njk index ece33f1f15..5ff43596d9 100644 --- a/lib/nunjucks/views/manage-prototype/index.njk +++ b/lib/nunjucks/views/manage-prototype/index.njk @@ -13,7 +13,7 @@

{% if kitUpdateAvailable %}

- + New version available: {{ latestAvailableKit }}

diff --git a/lib/nunjucks/views/manage-prototype/plugin-details.njk b/lib/nunjucks/views/manage-prototype/plugin-details.njk new file mode 100644 index 0000000000..c9cad76965 --- /dev/null +++ b/lib/nunjucks/views/manage-prototype/plugin-details.njk @@ -0,0 +1,89 @@ +{% extends "views/manage-prototype/layout.njk" %} +{% from "govuk/components/button/macro.njk" import govukButton %} + +{% block beforeContent %} + {{ super() }} + Back to plugins +{% endblock %} + +{% block content %} +
+ {% include "views/manage-prototype/plugin-header.njk" %} + +
+
+ + {% if updateLink %} + {% if latestLink %} +

Latest version: {{ latestVersion }}

+ {% endif %} + {% if installedLink %} +

Installed version: {{ installedVersion }}

+ {% endif %} + {% endif %} + +
+
+ {% if installLink %} + {{ govukButton({ + html: 'Install ' + plugin.name + '', + attributes: { id: "install-" + packageName, formaction: installLink } + }) }} + {% endif %} + {% if updateLink %} + {{ govukButton({ + html: 'Update ' + plugin.name + '', + attributes: { id: "update-" + packageName, formaction: updateLink } + }) }} + {% endif %} + {% if uninstallLink %} + {{ govukButton({ + html: 'Uninstall ' + plugin.name + '', + classes: "govuk-button--secondary", + attributes: { id: "uninstall-" + packageName, formaction: uninstallLink } + }) }} + {% endif %} +
+
+ + {% if plugin.releaseDateTime or preparedPluginLinks.releaseNotes or preparedPluginLinks.versionHistory %} +
+ {% if plugin.releaseDateTime %} +

Released

+ {% endif %} + {% if preparedPluginLinks.releaseNotes %} +

Release notes

+ {% endif %} + {% if preparedPluginLinks.versionHistory %} +

Version history

+ {% endif %} +
+ {% endif %} +
+

Report

+
+ +
+

About this plugin

+ +

{{ description | default('No description has been provided.') }}

+ + {% if preparedPluginLinks.documentation %} +

How to use this plugin

+ {% endif %} + + {% if inThisPlugin.length %} +

Included in this plugin

+ {% for section in inThisPlugin %} +

{{ section.title }}

+
    + {% for item in section.items %} +
  • {{ item }}
    • + {% endfor %} +
+ {% endfor %} + {% endif %} +
+
+
+{% endblock %} diff --git a/lib/nunjucks/views/manage-prototype/plugin-header.njk b/lib/nunjucks/views/manage-prototype/plugin-header.njk new file mode 100644 index 0000000000..89466e5701 --- /dev/null +++ b/lib/nunjucks/views/manage-prototype/plugin-header.njk @@ -0,0 +1,9 @@ +
+
+

{{ plugin.name }}

+

v{{ plugin.version }}

+ {% if plugin.scope %} +

By {{ plugin.scope }}

+ {% endif %} +
+
diff --git a/lib/nunjucks/views/manage-prototype/plugins.njk b/lib/nunjucks/views/manage-prototype/plugins.njk index afc0f36d9e..f5ccef1b4f 100644 --- a/lib/nunjucks/views/manage-prototype/plugins.njk +++ b/lib/nunjucks/views/manage-prototype/plugins.njk @@ -5,47 +5,47 @@ {% from "govuk/components/tag/macro.njk" import govukTag %} {% block content %} -
-
-
-

Plugins

-

- Plugins provide you with new components, styles and other features -

-
+
+
+

Plugins

+

+ Plugins provide you with new components, styles and other features +

+
-
-
- {% if isSearchPage %} -
-

Find plugins

-
-
- - Installed plugins - -
- {% else %} -
- - Find plugins - -
-
-

Installed plugins

-
- {% endif %} - {% if updatesMessage %} - {{ govukTag({ - attributes: {id: "plugins-updates-available-message"}, - text: updatesMessage - }) }} - {% endif %} -
+
+
+ {% if isSearchPage %} +
+

Find plugins

+
+
+ + Installed plugins + +
+ {% else %} +
+ + Find plugins + +
+
+

Installed plugins

+
+ {% endif %} + {% if updatesMessage %} + {{ govukTag({ + attributes: {id: "plugins-updates-available-message"},text: updatesMessage + }) }} + {% endif %} +
-
- {% if isSearchPage %} +
+ {% if isSearchPage %}
{{ govukLabel({ @@ -79,31 +79,39 @@ {{ foundMessage }}
- {% endif %} + {% endif %} -
    - {% for plugin in plugins %} -
  • +
      + {% for plugin in plugins %} +
    • -
      -

      - {{ plugin.name }} -

      - {% if plugin.scope %} -
      - By {{ plugin.scope }} -
      - {% endif %} - {% if plugin.installedVersion %} -
      - v{{ plugin.installedVersion }} -
      - {% endif %} -
      -
      - {% if isSearchPage and plugin.installedVersion %} +
      + + {{ plugin.name }} + + {% if plugin.scope %} +
      + By {{ plugin.scope }} +
      + {% endif %} + {% if plugin.installedVersion %} +
      + version {{ plugin.installedVersion }} +
      + {% endif %} +
      +
      +
      + {% if plugin.updateLink %} +

      + {{ govukTag({ + text: "Update available" + }) }} +

      + {% elseif isSearchPage and plugin.installedVersion %}

      {{ govukTag({ text: "Installed", @@ -111,46 +119,16 @@ }) }}

      {% endif %} - {% if plugin.description %} -
      - {{ plugin.description }} -
      - {% endif %} -
      -
      - {% if not plugin.installedVersion %} - {{ govukButton({ - html: 'Install ' + plugin.name + '', - attributes: { id: "install-" + plugin.packageName, formaction: plugin.installLink } - }) }} - {% endif %} - {% if isInstalledPage %} - {% if plugin.updateLink %} - {{ govukButton({ - html: 'Update ' + plugin.name + '', - attributes: { id: "update-" + plugin.packageName, formaction: plugin.updateLink } - }) }} - {% endif %} - {% if plugin.uninstallLink %} - {{ govukButton({ - html: 'Uninstall ' + plugin.name + '', - classes: "govuk-button--secondary", - attributes: { id: "uninstall-" + plugin.packageName, formaction: plugin.uninstallLink } - }) }} - {% endif %} - {% endif %} - {% if plugin.helpLink %} - Help - {{ plugin.name }} - {% endif %} -
      -
      -
      • - {% endfor %} -
    -
+ {% if plugin.description %} +
+ {{ plugin.description }} +
+ {% endif %} +
+ + {% endfor %} +
- +
{% endblock %} diff --git a/lib/plugins/packages.js b/lib/plugins/packages.js index 1a889e8a72..6af0349044 100644 --- a/lib/plugins/packages.js +++ b/lib/plugins/packages.js @@ -89,14 +89,16 @@ async function refreshPackageInfo (packageName, version) { const installedLocally = installedPackageVersion?.startsWith('file:') const installedFromGithub = installedPackageVersion?.startsWith('github:') const installedVersion = installed ? packageJson?.version : undefined + const latestPackageJson = registryInfo?.versions ? registryInfo?.versions[latestVersion] : undefined + const latestPluginConfig = registryInfo ? await getConfigForPackage(packageName) : undefined let localVersion if (!installed) { // Retrieve the packageJson and pluginConfig from the registry if possible if (registryInfo) { - packageJson = registryInfo?.versions ? registryInfo?.versions[latestVersion] : undefined - pluginConfig = await getConfigForPackage(packageName) + packageJson = latestPackageJson + pluginConfig = latestPluginConfig } else if (version) { packageJson = await readJson(path.join(path.relative(projectDir, version), 'package.json')) pluginConfig = await readJson(path.join(path.relative(projectDir, version), 'govuk-prototype-kit.config.json')) @@ -135,6 +137,8 @@ async function refreshPackageInfo (packageName, version) { packageJson, pluginConfig, pluginDependencies, + latestPluginConfig, + latestPackageJson, localVersion, updateAvailable, installedPackageVersion diff --git a/lib/plugins/packages.spec.js b/lib/plugins/packages.spec.js index 87ab98a9a9..f5487c3273 100644 --- a/lib/plugins/packages.spec.js +++ b/lib/plugins/packages.spec.js @@ -190,6 +190,9 @@ describe('packages', () => { local: true, version: '1.0.0' }, + latestPackageJson: { + version: '1.0.1' + }, pluginConfig: { loaded: true }, @@ -216,6 +219,9 @@ describe('packages', () => { packageJson: { version: '1.0.0' }, + latestPackageJson: { + version: '1.0.0' + }, versions: [ '1.0.0' ] @@ -238,6 +244,9 @@ describe('packages', () => { packageJson: { version: '2.0.0' }, + latestPackageJson: { + version: '2.0.0' + }, pluginConfig: { assets: [ '/dist'