Merge pull request #5186 from dfe-analytical-services/ees-5456

ntsim · web-flow · commit d3e48251018c · 2024-09-02T10:45:42.000+01:00
EES-5456 Fix broken changelog link in API data set version history
diff --git a/src/explore-education-statistics-admin/src/pages/release/data/ReleaseApiDataSetChangelogPage.tsx b/src/explore-education-statistics-admin/src/pages/release/data/ReleaseApiDataSetChangelogPage.tsx
@@ -11,6 +11,7 @@ import apiDataSetQueries from '@admin/queries/apiDataSetQueries';
 import apiDataSetVersionQueries from '@admin/queries/apiDataSetVersionQueries';
 import apiDataSetVersionService from '@admin/services/apiDataSetVersionService';
 import LoadingSpinner from '@common/components/LoadingSpinner';
+import TagGroup from '@common/components/TagGroup';
 import useToggle from '@common/hooks/useToggle';
 import Button from '@common/components/Button';
 import ApiDataSetChangelog from '@common/modules/data-catalogue/components/ApiDataSetChangelog';
@@ -80,16 +81,15 @@ export default function ReleaseApiDataSetChangelogPage() {
             <h2>{dataSet?.title}</h2>
           </div>
         </div>
-        <p>
+
+        <TagGroup className="govuk-!-margin-bottom-7">
           <Tag colour={isDraft ? 'green' : 'blue'}>{`${
             isDraft ? 'Draft' : 'Published'
           } v${dataSetVersion?.version}`}</Tag>
-        </p>
-        <p>
           <Tag
             colour={dataSetVersion?.type === 'Major' ? 'blue' : 'grey'}
           >{`${dataSetVersion?.type} update`}</Tag>
-        </p>
+        </TagGroup>
 
         {isDraft && showForm ? (
           <ApiDataSetGuidanceNotesForm
diff --git a/src/explore-education-statistics-admin/src/pages/release/data/ReleaseApiDataSetVersionHistoryPage.tsx b/src/explore-education-statistics-admin/src/pages/release/data/ReleaseApiDataSetVersionHistoryPage.tsx
@@ -1,7 +1,9 @@
 import Link from '@admin/components/Link';
 import { useConfig } from '@admin/contexts/ConfigContext';
 import {
+  releaseApiDataSetChangelogRoute,
   releaseApiDataSetDetailsRoute,
+  ReleaseDataSetChangelogRouteParams,
   ReleaseDataSetPreviewTokenRouteParams,
   ReleaseDataSetRouteParams,
   ReleaseRouteParams,
@@ -92,8 +94,8 @@ export default function ReleaseApiDataSetVersionHistoryPage() {
                           to={generatePath<ReleaseRouteParams>(
                             releaseSummaryRoute.path,
                             {
-                              releaseId: dataSetVersion.releaseVersion.id,
                               publicationId,
+                              releaseId: dataSetVersion.releaseVersion.id,
                             },
                           )}
                         >
@@ -112,7 +114,17 @@ export default function ReleaseApiDataSetVersionHistoryPage() {
 
                       <td className="govuk-!-text-align-right">
                         {dataSetVersion.version !== '1.0' && (
-                          <Link to="/todo">
+                          <Link
+                            to={generatePath<ReleaseDataSetChangelogRouteParams>(
+                              releaseApiDataSetChangelogRoute.path,
+                              {
+                                publicationId,
+                                releaseId: dataSetVersion.releaseVersion.id,
+                                dataSetId,
+                                dataSetVersionId: dataSetVersion.id,
+                              },
+                            )}
+                          >
                             View changelog
                             <VisuallyHidden>
                               {' '}
diff --git a/src/explore-education-statistics-admin/src/pages/release/data/__tests__/ReleaseApiDataSetVersionHistoryPage.test.tsx b/src/explore-education-statistics-admin/src/pages/release/data/__tests__/ReleaseApiDataSetVersionHistoryPage.test.tsx
@@ -40,7 +40,7 @@ describe('ReleaseApiDataSetVersionHistoryPage', () => {
       },
       published: '2024-04-01',
       releaseVersion: {
-        id: 'release-version-3-1-id',
+        id: 'release-v3-1-id',
         title: 'Release version 3.1',
       },
       status: 'Published',
@@ -55,7 +55,7 @@ describe('ReleaseApiDataSetVersionHistoryPage', () => {
       },
       published: '2024-03-01',
       releaseVersion: {
-        id: 'release-version-3-id',
+        id: 'release-v3-id',
         title: 'Release version 3',
       },
       status: 'Published',
@@ -70,7 +70,7 @@ describe('ReleaseApiDataSetVersionHistoryPage', () => {
       },
       published: '2024-02-01',
       releaseVersion: {
-        id: 'release-version-2-id',
+        id: 'release-v2-id',
         title: 'Release version 2',
       },
       status: 'Published',
@@ -85,7 +85,7 @@ describe('ReleaseApiDataSetVersionHistoryPage', () => {
       },
       published: '2024-01-01',
       releaseVersion: {
-        id: 'release-version-1-id',
+        id: 'release-v1-id',
         title: 'Release version 1',
       },
       status: 'Published',
@@ -109,6 +109,8 @@ describe('ReleaseApiDataSetVersionHistoryPage', () => {
 
     expect(await screen.findByText('Data set title')).toBeInTheDocument();
 
+    const { publicationId } = testRelease;
+
     const rows = within(screen.getByRole('table')).getAllByRole('row');
     expect(rows).toHaveLength(5);
 
@@ -118,68 +120,86 @@ describe('ReleaseApiDataSetVersionHistoryPage', () => {
       within(row1Cells[1]).getByRole('link', { name: 'Release version 3.1' }),
     ).toHaveAttribute(
       'href',
-      `/publication/${testRelease.publicationId}/release/release-version-3-1-id/summary`,
+      `/publication/${publicationId}/release/release-v3-1-id/summary`,
     );
     expect(row1Cells[2]).toHaveTextContent('Published');
     expect(row1Cells[2]).toHaveTextContent('Latest version');
     expect(
       within(row1Cells[3]).getByRole('link', {
         name: 'View changelog for version 3.1',
       }),
-    ).toBeInTheDocument();
+    ).toHaveAttribute(
+      'href',
+      `/publication/${publicationId}/release/release-v3-1-id/api-data-sets/data-set-id/changelog/version-3-1-id`,
+    );
     expect(
       within(row1Cells[3]).getByRole('link', {
-        name: 'View live data set for version 3.1 (opens in new tab)',
+        name: /View live data set for version 3.1/,
       }),
-    ).toBeInTheDocument();
+    ).toHaveAttribute(
+      'href',
+      'http://localhost/data-catalogue/data-set/version-3-1-file-id',
+    );
 
     const row2Cells = within(rows[2]).getAllByRole('cell');
     expect(row2Cells[0]).toHaveTextContent('3.0');
     expect(
       within(row2Cells[1]).getByRole('link', { name: 'Release version 3' }),
     ).toHaveAttribute(
       'href',
-      `/publication/${testRelease.publicationId}/release/release-version-3-id/summary`,
+      `/publication/${publicationId}/release/release-v3-id/summary`,
     );
     expect(row2Cells[2]).toHaveTextContent('Published');
     expect(
       within(row2Cells[3]).getByRole('link', {
         name: 'View changelog for version 3.0',
       }),
-    ).toBeInTheDocument();
+    ).toHaveAttribute(
+      'href',
+      `/publication/${publicationId}/release/release-v3-id/api-data-sets/data-set-id/changelog/version-3-id`,
+    );
     expect(
       within(row2Cells[3]).getByRole('link', {
-        name: 'View live data set for version 3.0 (opens in new tab)',
+        name: /View live data set for version 3.0/,
       }),
-    ).toBeInTheDocument();
+    ).toHaveAttribute(
+      'href',
+      'http://localhost/data-catalogue/data-set/version-3-file-id',
+    );
 
     const row3Cells = within(rows[3]).getAllByRole('cell');
     expect(row3Cells[0]).toHaveTextContent('2.0');
     expect(
       within(row3Cells[1]).getByRole('link', { name: 'Release version 2' }),
     ).toHaveAttribute(
       'href',
-      `/publication/${testRelease.publicationId}/release/release-version-2-id/summary`,
+      `/publication/${publicationId}/release/release-v2-id/summary`,
     );
     expect(row3Cells[2]).toHaveTextContent('Published');
     expect(
       within(row3Cells[3]).getByRole('link', {
         name: 'View changelog for version 2.0',
       }),
-    ).toBeInTheDocument();
+    ).toHaveAttribute(
+      'href',
+      `/publication/${publicationId}/release/release-v2-id/api-data-sets/data-set-id/changelog/version-2-id`,
+    );
     expect(
       within(row3Cells[3]).getByRole('link', {
-        name: 'View live data set for version 2.0 (opens in new tab)',
+        name: /View live data set for version 2.0/,
       }),
-    ).toBeInTheDocument();
+    ).toHaveAttribute(
+      'href',
+      'http://localhost/data-catalogue/data-set/version-2-file-id',
+    );
 
     const row4Cells = within(rows[4]).getAllByRole('cell');
     expect(row4Cells[0]).toHaveTextContent('1.0');
     expect(
       within(row4Cells[1]).getByRole('link', { name: 'Release version 1' }),
     ).toHaveAttribute(
       'href',
-      `/publication/${testRelease.publicationId}/release/release-version-1-id/summary`,
+      `/publication/${publicationId}/release/release-v1-id/summary`,
     );
     expect(row4Cells[2]).toHaveTextContent('Published');
     expect(
@@ -189,12 +209,15 @@ describe('ReleaseApiDataSetVersionHistoryPage', () => {
     ).not.toBeInTheDocument();
     expect(
       within(row4Cells[3]).getByRole('link', {
-        name: 'View live data set for version 1.0 (opens in new tab)',
+        name: /View live data set for version 1.0/,
       }),
-    ).toBeInTheDocument();
+    ).toHaveAttribute(
+      'href',
+      'http://localhost/data-catalogue/data-set/version-1-file-id',
+    );
   });
 
-  test('pagination', async () => {
+  test('pagination works correctly', async () => {
     apiDataSetService.getDataSet.mockResolvedValue(testDataSet);
     apiDataSetVersionService.listVersions.mockResolvedValueOnce({
       results: [testVersions[0], testVersions[1]],
