EES-5656 Remove ManageContentPageViewModel.PublicationViewModel.Releases

dfe-analytical-services · Dec 19, 2024 · e6a4d96 · e6a4d96
1 parent 5adfaca
commit e6a4d96
Show file tree

Hide file tree

Showing 11 changed files with 5 additions and 62 deletions.
diff --git a/src/GovUk.Education.ExploreEducationStatistics.Admin/Mappings/MappingProfiles.cs b/src/GovUk.Education.ExploreEducationStatistics.Admin/Mappings/MappingProfiles.cs
@@ -128,18 +128,6 @@ public MappingProfiles()
                         Title = rv.Publication.Title,
                         Slug = rv.Publication.Slug,
                         Contact = rv.Publication.Contact,
-                        Releases = rv.Publication.ReleaseVersions
-                            .FindAll(otherReleaseVersion => rv.Id != otherReleaseVersion.Id &&
-                                                     IsLatestVersionOfRelease(rv.Publication.ReleaseVersions, otherReleaseVersion.Id))
-                            .OrderByDescending(otherReleaseVersion => otherReleaseVersion.Year)
-                            .ThenByDescending(otherReleaseVersion => otherReleaseVersion.TimePeriodCoverage)
-                            .Select(otherReleaseVersion => new PreviousReleaseViewModel
-                            {
-                                Id = otherReleaseVersion.Id,
-                                Slug = otherReleaseVersion.Slug,
-                                Title = otherReleaseVersion.Title,
-                            })
-                            .ToList(),
                         ReleaseSeries = new List<ReleaseSeriesItemViewModel>(), // Must be hydrated after mapping
                         ExternalMethodology = rv.Publication.ExternalMethodology != null
                             ? new ExternalMethodology

diff --git a/...n.ExploreEducationStatistics.Admin/ViewModels/ManageContent/ManageContentPageViewModel.cs b/...n.ExploreEducationStatistics.Admin/ViewModels/ManageContent/ManageContentPageViewModel.cs
@@ -80,8 +80,6 @@ public class PublicationViewModel
 
             public string Slug { get; set; }
 
-            public List<PreviousReleaseViewModel> Releases { get; set; }
-
             public List<ReleaseSeriesItemViewModel> ReleaseSeries { get; set; }
 
             public Contact Contact { get; set; }
@@ -100,13 +98,4 @@ public class ReleaseNoteViewModel
 
         public DateTime On { get; set; }
     }
-
-    public class PreviousReleaseViewModel
-    {
-        public Guid Id { get; set; }
-
-        public string Slug { get; set; }
-
-        public string Title { get; set; }
-    }
 }
diff --git a/...ducation-statistics-admin/src/pages/release/content/__tests__/ReleaseContentPage.test.tsx b/...ducation-statistics-admin/src/pages/release/content/__tests__/ReleaseContentPage.test.tsx
@@ -129,7 +129,6 @@ describe('ReleaseContentPage', () => {
       id: 'publication-id',
       title: 'Publication 1',
       slug: 'publication-1',
-      releases: [],
       releaseSeries: [],
       theme: { id: 'theme-1', title: 'Theme 1' },
       contact: {

diff --git a/...n-statistics-admin/src/pages/release/pre-release/__tests__/PreReleaseContentPage.test.tsx b/...n-statistics-admin/src/pages/release/pre-release/__tests__/PreReleaseContentPage.test.tsx
@@ -91,7 +91,6 @@ describe('PreReleaseContentPage', () => {
       id: 'publication-id',
       title: 'Publication 1',
       slug: 'publication-1',
-      releases: [],
       releaseSeries: [],
       theme: { id: 'theme-1', title: 'Theme 1' },
       contact: {

diff --git a/src/explore-education-statistics-admin/src/prototypes/data/releaseContentData.ts b/src/explore-education-statistics-admin/src/prototypes/data/releaseContentData.ts
@@ -128,13 +128,6 @@ const prototypeReleaseContent: ReleaseContent = {
           slug: 'methodology-slug',
         },
       ],
-      releases: [
-        {
-          id: 'previous-release-id',
-          slug: 'previous-release-slug',
-          title: 'Previous release title',
-        },
-      ],
       releaseSeries: [],
       slug: 'publication-slug',
       title: 'Initial Teacher Training Census',

diff --git a/src/explore-education-statistics-admin/test/generators/releaseContentGenerators.ts b/src/explore-education-statistics-admin/test/generators/releaseContentGenerators.ts
@@ -92,7 +92,6 @@ const defaultPublication: Publication = {
       slug: 'methodology-slug',
     },
   ],
-  releases: [],
   releaseSeries: [
     {
       isLegacyLink: true,

diff --git a/src/explore-education-statistics-common/src/services/publicationService.ts b/src/explore-education-statistics-common/src/services/publicationService.ts
@@ -20,11 +20,6 @@ export interface Publication {
   id: string;
   slug: string;
   title: string;
-  releases: {
-    id: string;
-    slug: string;
-    title: string;
-  }[];
   releaseSeries: ReleaseSeriesItem[];
   theme: {
     id: string;

diff --git a/...lore-education-statistics-frontend/src/modules/find-statistics/PublicationReleasePage.tsx b/...lore-education-statistics-frontend/src/modules/find-statistics/PublicationReleasePage.tsx
@@ -130,7 +130,11 @@ const PublicationReleasePage: NextPage<Props> = ({ release }) => {
                     >
                       View latest data:{' '}
                       <span className="govuk-!-font-weight-bold">
-                        {release.publication.releases[0].title}
+                        {
+                          release.publication.releaseSeries.find(
+                            rsi => !rsi.isLegacyLink,
+                          )?.description
+                        }
                       </span>
                     </Link>
                   )}

diff --git a/...statistics-frontend/src/modules/find-statistics/__tests__/PublicationReleasePage.test.tsx b/...statistics-frontend/src/modules/find-statistics/__tests__/PublicationReleasePage.test.tsx
@@ -342,16 +342,6 @@ describe('PublicationReleasePage', () => {
             month: 2,
             year: 2022,
           },
-          publication: {
-            ...testRelease.publication,
-            releases: [
-              {
-                id: 'latest-release',
-                title: 'Latest Release Title',
-                slug: 'latest-release-slug',
-              },
-            ],
-          },
         }}
       />,
     );

diff --git a/...ion-statistics-frontend/src/modules/find-statistics/__tests__/__data__/testReleaseData.ts b/...ion-statistics-frontend/src/modules/find-statistics/__tests__/__data__/testReleaseData.ts
@@ -4,18 +4,6 @@ export const testPublication: Publication = {
   id: 'publication-1',
   title: 'Pupil absence in schools in England',
   slug: 'pupil-absence-in-schools-in-england',
-  releases: [
-    {
-      id: 'release-2',
-      slug: '2018-19',
-      title: 'Academic year 2018/19',
-    },
-    {
-      id: 'release-1',
-      slug: '2017-18',
-      title: 'Academic year 2017/18',
-    },
-  ],
   releaseSeries: [
     {
       isLegacyLink: false,

diff --git a/...ion-statistics-frontend/src/modules/table-tool/components/__tests__/__data__/tableData.ts b/...ion-statistics-frontend/src/modules/table-tool/components/__tests__/__data__/tableData.ts
@@ -273,7 +273,6 @@ export const testPublicationRelease: Release = {
     id: '',
     slug: '',
     title: '',
-    releases: [],
     releaseSeries: [],
     theme: {
       title: '',