add more breadcrumbs

digital-land · Aug 13, 2024 · 4985517 · 4985517
1 parent 39077da
commit 4985517
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 8 deletions.
diff --git a/src/controllers/OrganisationsController.js b/src/controllers/OrganisationsController.js
@@ -46,6 +46,9 @@ const organisationsController = {
     try {
       const lpa = req.params.lpa
 
+      const organisationResult = await datasette.runQuery(`SELECT name, organisation FROM organisation WHERE organisation = '${lpa}'`)
+      const organisation = organisationResult.formattedData[0]
+
       const datasetsFilter = ['article-4-direction',
         'article-4-direction-area',
         'conservation-area',
@@ -87,10 +90,7 @@ const organisationsController = {
       }, [0, 0, 0])
 
       const params = {
-        organisation: {
-          name: lpaOverview.name,
-          organisation: lpaOverview.organisation
-        },
+        organisation,
         datasets,
         totalDatasets,
         datasetsWithEndpoints,
@@ -183,7 +183,7 @@ const organisationsController = {
     const datasetId = req.params.dataset
 
     try {
-      const organisationResult = await datasette.runQuery(`SELECT name FROM organisation WHERE organisation = '${lpa}'`)
+      const organisationResult = await datasette.runQuery(`SELECT name, organisation FROM organisation WHERE organisation = '${lpa}'`)
       const organisation = organisationResult.formattedData[0]
 
       const datasetResult = await datasette.runQuery(`SELECT name FROM dataset WHERE dataset = '${datasetId}'`)
@@ -377,7 +377,8 @@ const organisationsController = {
         dataset,
         errorHeading,
         issueItems,
-        entry
+        entry,
+        issueType
       }
 
       res.render('organisations/issueDetails.html', params)

diff --git a/src/services/performanceDbApi.js b/src/services/performanceDbApi.js
@@ -149,8 +149,6 @@ ORDER BY
     }, {})
 
     return {
-      name: result.formattedData[0].name,
-      organisation: result.formattedData[0].organisation,
       datasets
     }
   },

diff --git a/src/views/organisations/datasetTaskList.html b/src/views/organisations/datasetTaskList.html
@@ -1,3 +1,5 @@
+{% from "govuk/components/breadcrumbs/macro.njk" import govukBreadcrumbs %}
+
 {% extends "layouts/main.html" %}
 
 {% from 'govuk/components/task-list/macro.njk' import govukTaskList %}
@@ -10,6 +12,26 @@
 
 {{ super() }}
 
+{{ govukBreadcrumbs({
+  items: [
+    {
+      text: "Home",
+      href: "/manage"
+    },
+    {
+      text: "Organisations",
+      href: '/organisations'
+    },
+    {
+      text: organisation.name,
+      href: '/organisations/' + organisation.organisation
+    },
+    {
+      text: dataset.name
+    }
+  ]
+}) }}
+
 {% endblock %}
 
 {% block content %}

diff --git a/src/views/organisations/issueDetails.html b/src/views/organisations/issueDetails.html
@@ -3,6 +3,7 @@
 {% from 'govuk/components/error-summary/macro.njk' import govukErrorSummary %}
 {% from "govuk/components/summary-list/macro.njk" import govukSummaryList %}
 {% from "govuk/components/pagination/macro.njk" import govukPagination %}
+{% from "govuk/components/breadcrumbs/macro.njk" import govukBreadcrumbs %}
 
 {% set serviceType = 'Submit'%}
 
@@ -12,7 +13,39 @@
   {% set pageName %}{{organisation.name}} - {{dataset.name}} - Issues{% endset %}
 {%endif%}
 
+{% block beforeContent %}
+
+{{ super() }}
+
+{{ govukBreadcrumbs({
+  items: [
+    {
+      text: "Home",
+      href: "/manage"
+    },
+    {
+      text: "Organisations",
+      href: '/organisations'
+    },
+    {
+      text: organisation.name,
+      href: '/organisations/' + organisation.organisation
+    },
+    {
+      text: dataset.name,
+      href: '/organisations/' + organisation.organisation + '/' + dataset.dataset
+    },
+    {
+      text: issueType
+    }
+  ]
+}) }}
+
+{% endblock %}
+
 {% block content %}
+
+
 <div class="govuk-grid-row">
   {% include "includes/_dataset-page-header.html" %}
 </div>