Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions src/controllers/issueDetailsController.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { MiddlewareError } from '../utils/errors.js'
import { isFeatureEnabled } from '../utils/features.js'
import logger from '../utils/logger.js'
import { types } from '../utils/logging.js'
import { fetchOne } from '../middleware/middleware.builders.js'

const validateParams = validateQueryParams({
schema: v.object({
Expand Down Expand Up @@ -74,12 +75,47 @@ async function setDetailsOptions (req, res, next) {
next()
}

const fetchSpecification = fetchOne({
query: ({ req }) => `select * from specification WHERE specification = '${req.sessionModel.get('data-subject')}'`,
result: 'specification'
})
Comment thread
DilwoarH marked this conversation as resolved.

const fetchDatasetInfo = fetchOne({
query: ({ req }) => {
return `SELECT name, dataset, collection FROM dataset WHERE dataset = '${req.sessionModel.get('data-subject')}'`
},
result: 'datasetDetails'
})
Comment thread
DilwoarH marked this conversation as resolved.

async function getIssueSpecification (req, res, next) {
const {
specification,
datasetDetails,
params: {
field: issueField
}
} = req

if (!specification) return next()

const datasetSpecification = JSON.parse(specification.json).find((spec) => spec.dataset === req.sessionModel.get('dataset'))
const fieldSpecification = datasetSpecification.fields.find(f => f.field === issueField)

req.locals.issueSpecification = fieldSpecification
req.locals.datasetDetails = datasetDetails

next()
}
Comment thread
DilwoarH marked this conversation as resolved.

const middlewares = [
isFeatureEnabled('checkIssueDetailsPage')
? validateParams
: (req, res, next) => { return next(new MiddlewareError('Not found', 404)) },
results.getRequestDataMiddleware,
setDetailsOptions,
fetchDatasetInfo,
fetchSpecification,
getIssueSpecification,
results.fetchResponseDetails,
results.checkForErroredResponse,
results.setupTableParams,
Expand Down
5 changes: 5 additions & 0 deletions src/views/check/results/issueDetails.html
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,11 @@
</div>
</div>

{% set issueSpecification = options.issueSpecification %}
{% set datasetDetails = options.datasetDetails %}

{% include "includes/_issue-guidance.html" %}

<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
<h3 class="govuk-heading-m">
Expand Down