Revert "Merge pull request #265 from digital-land/rosado/content-chan…

…ges"

This reverts commit 2d55d32, reversing
changes made to f00bbb0.

src/controllers/OrganisationsController.js

@@ -3,7 +3,6 @@ import performanceDbApi from '../services/performanceDbApi.js' // Assume you hav
 import logger from '../utils/logger.js'
 import { types } from '../utils/logging.js'
 import { dataSubjects } from '../utils/utils.js'
-import { statusToTagClass } from '../filters/filters.js'
 
 // get a list of available datasets
 const availableDatasets = Object.values(dataSubjects)
@@ -20,10 +19,17 @@ const availableDatasets = Object.values(dataSubjects)
  * @returns {object} - An object with a `tag` property containing the text label and CSS class.
  */
 function getStatusTag (status) {
+  const statusToTagClass = {
+    Error: 'govuk-tag--red',
+    'Needs fixing': 'govuk-tag--yellow',
+    Warning: 'govuk-tag--blue',
+    Issue: 'govuk-tag--blue'
+  }
+
   return {
     tag: {
       text: status,
-      classes: statusToTagClass(status)
+      classes: statusToTagClass[status]
     }
   }
 }
@@ -70,17 +76,16 @@ const organisationsController = {
         if (!keys.includes(dataset)) {
           datasets.push({
             slug: dataset,
-            endpoint: null,
-            status: 'Not submitted'
+            endpoint: null
           })
         }
       })
 
       const totalDatasets = datasets.length
       const [datasetsWithEndpoints, datasetsWithIssues, datasetsWithErrors] = datasets.reduce((accumulator, dataset) => {
-        if (dataset.endpoint) accumulator[0]++
-        if (dataset.status === 'Needs fixing') accumulator[1]++
-        if (dataset.status === 'Error') accumulator[2]++
+        if (dataset.endpoint !== null) accumulator[0]++
+        if (dataset.issue) accumulator[1]++
+        if (dataset.error) accumulator[2]++
         return accumulator
       }, [0, 0, 0])
 
@@ -95,7 +100,7 @@ const organisationsController = {
 
       res.render('organisations/overview.html', params)
     } catch (error) {
-      logger.warn('organisationsController.getOverview(): ' + error.message ?? error.errorMessage, { type: types.App })
+      logger.error(error)
       next(error)
     }
   },
@@ -125,7 +130,7 @@ const organisationsController = {
 
       res.render('organisations/find.html', { alphabetisedOrgs })
     } catch (err) {
-      logger.warn('organisationsController.getOrganisations(): ' + err.message ?? err.errorMessage, { type: types.App })
+      logger.warn(err)
       next(err)
     }
   },

src/filters/filters.js

@@ -6,23 +6,6 @@ import prettifyColumnName from './prettifyColumnName.js'
 import getFullServiceName from './getFullServiceName.js'
 import { makeDatasetSlugToReadableNameFilter } from './makeDatasetSlugToReadableNameFilter.js'
 
-/** maps dataset status (as returned by performanceDbApi/getLpaOverview()) to a
- * CSS class used by the govuk-tag component
- */
-const statusToTagClassMapping = {
-  Error: 'govuk-tag--red',
-  'Not submitted': 'govuk-tag--red',
-  'Needs fixing': 'govuk-tag--yellow',
-  Warning: 'govuk-tag--blue',
-  Issue: 'govuk-tag--blue', // deprecated
-  Live: 'govuk-tag--green'
-}
-
-export function statusToTagClass (status) {
-  console.assert(status in statusToTagClassMapping, `statusToTagClass: unknown status ${status}`)
-  return statusToTagClassMapping[status]
-}
-
 const { govukMarkdown, govukDateTime } = xGovFilters
 
 const addFilters = (nunjucksEnv, { datasetNameMapping }) => {
@@ -37,7 +20,6 @@ const addFilters = (nunjucksEnv, { datasetNameMapping }) => {
   nunjucksEnv.addFilter('toErrorList', toErrorList)
   nunjucksEnv.addFilter('prettifyColumnName', prettifyColumnName)
   nunjucksEnv.addFilter('getFullServiceName', getFullServiceName)
-  nunjucksEnv.addFilter('statusToTagClass', statusToTagClass)
 }
 
 export default addFilters

src/services/datasette.js

@@ -8,7 +8,7 @@ export default {
  * Executes a SQL query on the Datasette instance and returns the results.
  *
  * @param {string} query - The SQL query to execute.
- * @returns {Promise<{data: object, formattedData: object[]}>} - A promise that resolves to an object with the following properties:
+ * @returns {Promise<{data: object, formattedData: object}>} - A promise that resolves to an object with the following properties:
  *   - `data`: The raw data returned by Datasette.
  *   - `formattedData`: The formatted data, with columns and rows parsed into a usable format.
  * @throws {Error} If the query fails or there is an error communicating with Datasette.

src/services/performanceDbApi.js

@@ -41,9 +41,9 @@ fs.createReadStream('src/content/entityIssueMessages.csv')
 
 /**
  * @typedef {object} Dataset
- * @property {'Not submitted' | 'Error' | 'Needs fixing' | 'Warning' | 'Live' } status
  * @property {string} endpoint
  * @property {?string} error
+ * @property {?string} issue
  */
 
 /**
@@ -80,32 +80,27 @@ export default {
     rle.resource,
     rle.exception,
     rle.status as http_status,
-  case
-      when (rle.status is null) then 'Not Submitted'
-      when (rle.status != '200') then 'Error'
-      when (it.severity = 'error') then 'Needs fixing'
-      when (it.severity = 'warning') then 'Warning'
-      else 'Live'
-  end as status,
+    case 
+           when (rle.status != '200') then 'Error'
+           when (it.severity = 'error') then 'Issue'
+           when (it.severity = 'warning') then 'Warning'
+           else 'No issues'
+           end as status,
     case
-        when ((cast(rle.status as integer) > 200)) then format('There was a %s error accessing the data URL', rle.status)
-        else null
-  end as error,
-  case
-      when (it.severity = 'info') then ''
-      else i.issue_type
-  end as issue_type,
-  case
-      when (it.severity = 'info') then ''
-      else it.severity
-  end as severity,
-  it.responsibility,
-  COUNT(
-      case
-      when it.severity != 'info' then 1
-      else null
-      end
-  ) as issue_count
+            when (it.severity = 'info') then ''
+            else i.issue_type
+        end as issue_type,
+        case
+            when (it.severity = 'info') then ''
+            else it.severity
+        end as severity,
+        it.responsibility,
+        COUNT(
+            case
+            when it.severity != 'info' then 1
+            else null
+            end
+        ) as issue_count
 FROM
     provision p
 LEFT JOIN
@@ -135,17 +130,24 @@ ORDER BY
     const result = await datasette.runQuery(query)
 
     const datasets = result.formattedData.reduce((accumulator, row) => {
+      let error
+      if (row.http_status !== '200' || row.exception) {
+        error = row.exception ? row.exception : `endpoint returned with a status of ${row.http_status}`
+      }
+
+      let issue
+      if (row.issue_count > 0) {
+        issue = `There are ${row.issue_count} issues in this dataset`
+      }
+
       accumulator[row.dataset] = {
         endpoint: row.endpoint,
-        status: row.status
+        error,
+        issue
       }
       return accumulator
     }, {})
 
-    if (result.formattedData.length === 0) {
-      throw new Error(`No records found for LPA=${lpa}`)
-    }
-
     return {
       datasets
     }
@@ -202,9 +204,13 @@ ORDER BY
       ORDER BY it.severity`
 
     const result = await datasette.runQuery(sql)
-    /* eslint camelcase: "off" */
-    return result.formattedData.map(({ num_issues, issue_type, resource, status }) => {
-      return { num_issues, issue_type, resource, status }
+    return result.formattedData.map((row) => {
+      return {
+        num_issues: row.num_issues,
+        issue_type: row.issue_type,
+        resource: row.resource,
+        status: row.status
+      }
     })
   },
 

src/views/organisations/overview.html

@@ -43,17 +43,17 @@ <h1 class="govuk-heading-xl">
     <div class="dataset-status">
       <div class="dataset-status--item">
         <span class="big-number">{{datasetsWithEndpoints}}/{{totalDatasets}}</span>
-        datasets submitted
+        datasets provided
       </div>
 
       <div class="dataset-status--item">
         <span class="big-number">{{datasetsWithErrors}}</span>
-        data URL with errors
+        datasets with errors
       </div>
 
       <div class="dataset-status--item">
         <span class="big-number">{{datasetsWithIssues}}</span>
-        datasets need fixing
+        datasets with issues
       </div>
     </div>
   </div>
@@ -69,34 +69,69 @@ <h2 class="govuk-heading-m">Datasets</h2>
         <li class="govuk-task-list__item govuk-task-list__item--with-link">
           <div class="govuk-task-list__name-and-hint">
             <h2 class="govuk-heading-m">
-              {% if dataset.endpoint %}
-                <a class="govuk-link govuk-task-list__link"
-                  href="/organisations/{{ organisation.organisation }}/{{dataset.slug}}">
-                  {{dataset.slug | datasetSlugToReadableName}}
-                </a>
-              {% else %}
+              <a class="govuk-link govuk-task-list__link"
+                href="/organisations/{{ organisation.organisation }}/{{dataset.slug}}">
                 {{dataset.slug | datasetSlugToReadableName}}
-              {% endif %}
+              </a>
             </h2>
             <div class="govuk-task-list__hint">
               {% if dataset.endpoint is null %}
-                <p>Data URL not submitted</p>
+                <p>Endpoint not provided</p>
               {% elif dataset.error %}
                 <p>{{dataset.error}}</p>
-              {% elif dataset.issue_count > 0 %}
-                <p>There are {{ dataset.issue_count }} issues in this dataset</p>
+              {% elif dataset.issue %}
+                <p>{{dataset.issue}}</p>
               {% else %}
-                <p>Data URL submitted</p>
+                <p>Endpoint provided</p>
               {% endif %}
 
+              <ul class="planning-data-actions">
+                {% if dataset.endpoint is null %}
+                <li class="planning-data-actions--item">
+                  <a href="/taskLists/taskChecklist">Add endpoint</a>
+                </li>
+                {% endif %}
+                {% if dataset.error %}
+                <li class="planning-data-actions--item">
+                  <a href="/taskLists/taskChecklist">Fix errors</a>
+                </li>
+                {% elseif dataset.issue %}
+                <li class="planning-data-actions--item">
+                  <a href="/taskLists/taskChecklist">Fix issues</a>
+                </li>
+                {% endif %}
+                {% if dataset.endpoint %}
+                <li class="planning-data-actions--item">
+                  <a href="/taskLists/taskChecklist">View data</a>
+                </li>
+                {% endif %}
+              </ul>
+
             </div>
           </div>
 
           <div class="govuk-task-list__status">
-            {{govukTag({
-              text: dataset.status,
-              classes: dataset.status | statusToTagClass
-            })}}
+            {% if dataset.endpoint is null %}
+              {{govukTag({
+                text: "Not provided",
+                classes: "govuk-tag--grey"
+              })}}
+            {% elif dataset.error %}
+              {{govukTag({
+                text: "Error",
+                classes: "govuk-tag--red"
+              })}}
+            {% elif dataset.issue %}
+              {{govukTag({
+                text: "Issues",
+                classes: "govuk-tag--yellow"
+              })}}
+            {% else %}
+              {{govukTag({
+                text: "No issues",
+                classes: "govuk-tag--green"
+              })}}
+            {% endif %}
           </div>
         </li>
       {% endfor %}
@@ -105,4 +140,10 @@ <h2 class="govuk-heading-m">
   </div>
 </div>
 
+<div class="govuk-grid-row">
+  <div class="govuk-grid-column-two-thirds">
+    <p>View your <a href="/taskLists/taskChecklist">task list</a> to fix and improve your datasets</p>
+  </div>
+</div>
+
 {% endblock %}