Merge pull request #1131 from digital-land/1122-design-implementation-2a-update-dataset-actions-for-get-started

1122 design implementation 2a update dataset actions for get started

Author: pooleycodes

src/serverSetup/nunjucks.js

@@ -61,6 +61,7 @@ export function setupNunjucks (opts) {
     dataDesignUrl: config.dataDesignUrl,
     mainWebsiteUrl: config.mainWebsiteUrl,
     govukRebrand: true,
+    env: config.environment,
     ...config.templateContent
   }
 

src/views/organisations/dataset-overview.html

@@ -202,6 +202,9 @@ <h2 class="govuk-heading-m">Dataset details</h2>
     <section>
       <h2 class="govuk-heading-m">Dataset actions</h2>
       <ul class="govuk-list">
+        <li>
+          <a class="govuk-link" href="/organisations/{{ organisation.organisation }}/{{ dataset.dataset }}/get-started">How to prepare and provide your {{ dataset.name }} data</a>
+        </li>
         <li>
           <a class="govuk-link" href="{{ organisation | checkToolDeepLink(dataset) }}">Check {{ dataset.name }} dataset</a>
         </li>

src/views/organisations/get-started.html

@@ -76,6 +76,12 @@ <h2 class="gem-c-step-nav__title">
               data is required</a>. Start with
               the fields you already have, you can update and
               improve your data over time.</p>
+            {% if env !== 'production' %}
+            <p class="gem-c-step-nav__paragraph">
+              If we have data from alternative sources, you can download this from your <a
+                href="/organisations/{{ organisation.organisation }}/{{ dataset.dataset }}/overview">dataset details</a> page to help you get started.
+            </p>
+            {% endif %}
           </div>
 
         </li>

test/acceptance/dataset_overview.test.js

@@ -45,7 +45,7 @@ test.describe('Dataset overview', () => {
 
     expect(await page.getByRole('h2', { name: 'Dataset actions' })).toBeDefined()
     expect(await page.locator('.govuk-grid-column-one-third .govuk-list').count()).toEqual(1)
-    expect(await page.locator('.govuk-grid-column-one-third .govuk-list li').count()).toEqual(2)
+    expect(await page.locator('.govuk-grid-column-one-third .govuk-list li').count()).toEqual(3)
   })
 
   test('Can view dataset tables', async ({ page, context }) => {

test/unit/views/organisations/dataset-overview.test.js

@@ -180,10 +180,13 @@ describe('Dataset Overview Page', () => {
 
     expect(header.textContent.trim()).toEqual('Dataset actions')
 
-    expect(links[0].textContent.trim()).toEqual('Check Article 4 direction area dataset')
-    expect(links[0].querySelector('.govuk-link').href).toEqual('/check/link?dataset=article-4-direction-area&orgName=Mock%20org&orgId=mock-org')
+    expect(links[0].textContent.trim()).toEqual('How to prepare and provide your Article 4 direction area data')
+    expect(links[0].querySelector('.govuk-link').href).toEqual('/organisations/mock-org/article-4-direction-area/get-started')
 
-    expect(links[1].textContent.trim()).toEqual('Article 4 direction area guidance')
-    expect(links[1].querySelector('.govuk-link').href).toEqual('/guidance/specifications/article-4-direction')
+    expect(links[1].textContent.trim()).toEqual('Check Article 4 direction area dataset')
+    expect(links[1].querySelector('.govuk-link').href).toEqual('/check/link?dataset=article-4-direction-area&orgName=Mock%20org&orgId=mock-org')
+
+    expect(links[2].textContent.trim()).toEqual('Article 4 direction area guidance')
+    expect(links[2].querySelector('.govuk-link').href).toEqual('/guidance/specifications/article-4-direction')
   })
 })

test/unit/views/organisations/lpaOverviewPage.test.js

@@ -73,16 +73,12 @@ describe(`LPA Overview Page (seed: ${seed})`, () => {
     }
   })
 
-  it('The correct number of dataset cards are rendered with the correct titles in group "expected"', () => {
-    if (params.datasets.expected && params.datasets.expected.length > 0) {
-      datasetGroup({ expect }, 'expected', params.datasets.expected, document)
-    }
+  it.skipIf(!params.datasets.expected || params.datasets.expected.length === 0)('The correct number of dataset cards are rendered with the correct titles in group "expected"', () => {
+    datasetGroup({ expect }, 'expected', params.datasets.expected, document)
   })
 
-  it('The correct number of dataset cards are rendered with the correct titles in group "prospective"', () => {
-    if (params.datasets.prospective && params.datasets.prospective.length > 0) {
-      datasetGroup({ expect }, 'prospective', params.datasets.prospective, document)
-    }
+  it.skipIf(!params.datasets.prospective || params.datasets.prospective.length === 0)('The correct number of dataset cards are rendered with the correct titles in group "prospective"', () => {
+    datasetGroup({ expect }, 'prospective', params.datasets.prospective, document)
   })
 
   const allDatasets = [
@@ -136,29 +132,38 @@ describe(`LPA Overview Page (seed: ${seed})`, () => {
     })
   })
 
-  const datasetCards = document.querySelectorAll('li[data-dataset]:not(:empty)')
-  allDatasets.forEach((dataset, i) => {
+  allDatasets.forEach((dataset) => {
     it(`Renders the correct status on each dataset card for dataset='${dataset.dataset}'`, () => {
+      const datasetCard = document.querySelector(`li[data-dataset="${dataset.dataset}"]`)
+      if (!datasetCard) {
+        throw new Error(`Dataset card for "${dataset.dataset}" not found in rendered HTML`)
+      }
+
       if (!(dataset.status in datasetStatusEnum)) {
         throw new Error(`Unknown dataset status: ${dataset.status}`)
       }
 
       const expectedStatus = datasetStatusEnum[dataset.status]
 
-      const statusIndicator = datasetCards[i].querySelector('.govuk-task-list__status')
+      const statusIndicator = datasetCard.querySelector('.govuk-task-list__status')
       expect(statusIndicator.textContent.trim()).toContain(expectedStatus)
     })
 
     it(`Renders the correct link on each dataset card for dataset='${dataset.dataset}'`, () => {
-      const expectedLink = datasetCards[i].querySelector('.govuk-task-list__link').href
+      const datasetCard = document.querySelector(`li[data-dataset="${dataset.dataset}"]`)
+      if (!datasetCard) {
+        throw new Error(`Dataset card for "${dataset.dataset}" not found in rendered HTML`)
+      }
+
+      const expectedLink = datasetCard.querySelector('.govuk-task-list__link').href
 
       if (dataset.status === 'Not submitted') {
         expect(expectedLink).toEqual(`/organisations/${params.organisation.organisation}/${dataset.dataset}/get-started`)
       } else {
         expect(expectedLink).toEqual(`/organisations/${params.organisation.organisation}/${dataset.dataset}/overview`)
       }
 
-      const link = datasetCards[i].querySelector('.govuk-link')
+      const link = datasetCard.querySelector('.govuk-link')
       expect(link.href).toContain(expectedLink)
     })
   })