Fixing page highlights (including Plugins which was broken before).

alphagov · Apr 5, 2023 · 5b86ccb · 5b86ccb
1 parent f53e57b
commit 5b86ccb
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git a/lib/manage-prototype-handlers.js b/lib/manage-prototype-handlers.js
@@ -277,7 +277,8 @@ function getTemplatesInstallHandler (req, res) {
 
   if (templateConfig) {
     res.render(getManagementView('template-install.njk'), {
-      currentPage: `Create new ${templateConfig.name}`,
+      currentPage: 'Templates',
+      pageName: `Create new ${templateConfig.name}`,
       currentUrl: req.originalUrl,
       links: managementLinks,
       templateName: templateConfig.name,
@@ -365,7 +366,8 @@ function getTemplatesPostInstallHandler (req, res) {
   const chosenUrl = req.query['chosen-url']
 
   res.render(getManagementView('template-post-install.njk'), {
-    currentPage: pageName,
+    currentPage: 'Templates',
+    pageName,
     links: managementLinks,
     url: chosenUrl,
     filePath: path.join('app', 'views', `${chosenUrl}.${getFileExtensionForNunjucksFiles()}`)
@@ -542,7 +544,8 @@ async function getPluginsModeHandler (req, res) {
   const returnLink = req.query.returnTo === 'templates' ? templatesReturnLink : pluginsReturnLink
 
   res.render(getManagementView('plugin-install-or-uninstall.njk'), {
-    currentPage: pageName,
+    currentPage: 'Plugins',
+    pageName,
     currentUrl: req.originalUrl,
     links: managementLinks,
     chosenPlugin,

diff --git a/lib/manage-prototype-handlers.test.js b/lib/manage-prototype-handlers.test.js
@@ -252,7 +252,8 @@ describe('manage-prototype-handlers', () => {
           expect(res.render).toHaveBeenCalledWith(
             'views/manage-prototype/template-install.njk',
             expect.objectContaining({
-              currentPage: 'Create new A page with everything',
+              currentPage: 'Templates',
+              pageName: 'Create new A page with everything',
               chosenUrl,
               currentUrl: req.originalUrl,
               error,
@@ -344,7 +345,8 @@ describe('manage-prototype-handlers', () => {
       expect(res.render).toHaveBeenCalledWith(
         'views/manage-prototype/template-post-install.njk',
         expect.objectContaining({
-          currentPage: 'Page created',
+          currentPage: 'Templates',
+          pageName: 'Page created',
           filePath: path.join(`app/views${chosenUrl}.html`)
         })
       )
@@ -410,7 +412,8 @@ describe('manage-prototype-handlers', () => {
           chosenPlugin: availablePlugin,
           command: `npm install ${packageName}`,
           csrfToken,
-          currentPage: `Install ${pluginDisplayName.name}`,
+          currentPage: 'Plugins',
+          pageName: `Install ${pluginDisplayName.name}`,
           currentUrl: req.originalUrl,
           isSameOrigin: false,
           returnLink: {

diff --git a/lib/nunjucks/views/manage-prototype/layout.njk b/lib/nunjucks/views/manage-prototype/layout.njk
@@ -1,6 +1,9 @@
 {% extends "govuk-prototype-kit/layouts/govuk-branded.njk" %}
 
 {% block pageTitle %}
+  {% if pageName %}
+    {{ pageName }} - 
+  {% endif %}
   {% if currentPage !== "Home" %}{{ currentPage }}
     - {% endif %}Manage your prototype
   - {{ serviceName }}

diff --git a/lib/nunjucks/views/manage-prototype/template-install.njk b/lib/nunjucks/views/manage-prototype/template-install.njk
@@ -24,7 +24,7 @@
         }) }}
       {% endif %}
 
-      <h1 class="govuk-heading-l">{{ currentPage }}</h1>
+      <h1 class="govuk-heading-l">{{ pageName }}</h1>
 
       <form action="{{ currentUrl }}" method="post">
 

diff --git a/lib/nunjucks/views/manage-prototype/template-post-install.njk b/lib/nunjucks/views/manage-prototype/template-post-install.njk
@@ -4,7 +4,7 @@
 
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
-      <h1 class="govuk-heading-l">{{ currentPage }}</h1>
+      <h1 class="govuk-heading-l">{{ pageName }}</h1>
 
       <p class="govuk-body">View your page at
         <a class="govuk-link" href="{{ url }}">{{ url }}</a></p>