EES-4781 remove data catalogue feature flag

dfe-analytical-services · Jun 24, 2024 · b714512 · b714512
1 parent 382520f
commit b714512
Show file tree

Hide file tree

Showing 46 changed files with 2,066 additions and 3,723 deletions.
diff --git a/src/explore-education-statistics-admin/src/pages/release/ReleaseDataGuidancePage.tsx b/src/explore-education-statistics-admin/src/pages/release/ReleaseDataGuidancePage.tsx
@@ -60,7 +60,7 @@ const ReleaseDataGuidancePage = ({
               renderDataCatalogueLink={
                 model.release.published ? (
                   <Link
-                    to={`${publicAppUrl}/data-catalogue/${model.release.publicationSlug}/${model.release.slug}`}
+                    to={`${publicAppUrl}/data-catalogue?publicationId=${model.release.publicationId}&releaseId=${model.release.id}`}
                   >
                     data catalogue
                   </Link>

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
@@ -131,7 +131,7 @@ describe('ReleaseContentPage', () => {
       slug: 'publication-1',
       releases: [],
       releaseSeries: [],
-      topic: { theme: { title: 'Theme 1' } },
+      topic: { theme: { id: 'theme-1', title: 'Theme 1' } },
       contact: {
         contactName: 'John Smith',
         contactTelNo: '0777777777',

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
@@ -93,7 +93,7 @@ describe('PreReleaseContentPage', () => {
       slug: 'publication-1',
       releases: [],
       releaseSeries: [],
-      topic: { theme: { title: 'Theme 1' } },
+      topic: { theme: { id: 'theme-1', title: 'Theme 1' } },
       contact: {
         contactName: 'John Smith',
         contactTelNo: '0777777777',

diff --git a/src/explore-education-statistics-admin/src/prototypes/data/releaseContentData.ts b/src/explore-education-statistics-admin/src/prototypes/data/releaseContentData.ts
@@ -140,6 +140,7 @@ const prototypeReleaseContent: ReleaseContent = {
       title: 'Initial Teacher Training Census',
       topic: {
         theme: {
+          id: 'test-theme',
           title: 'Test theme',
         },
       },

diff --git a/src/explore-education-statistics-admin/test/generators/releaseContentGenerators.ts b/src/explore-education-statistics-admin/test/generators/releaseContentGenerators.ts
@@ -103,7 +103,7 @@ const defaultPublication: Publication = {
   ],
   slug: 'publication-slug',
   title: 'Publication title',
-  topic: { theme: { title: 'Test theme' } },
+  topic: { theme: { id: 'test-theme', title: 'Test theme' } },
 };
 
 const defaultKeyStatistics: KeyStatistic[] = [

diff --git a/...explore-education-statistics-common/src/modules/table-tool/components/TableToolWizard.tsx b/...explore-education-statistics-common/src/modules/table-tool/components/TableToolWizard.tsx
@@ -38,13 +38,7 @@ import tableBuilderService, {
   Subject,
   SubjectMeta,
 } from '@common/services/tableBuilderService';
-import React, {
-  ReactElement,
-  ReactNode,
-  useEffect,
-  useMemo,
-  useState,
-} from 'react';
+import React, { ReactElement, ReactNode, useMemo, useState } from 'react';
 import { useImmer } from 'use-immer';
 import { Dictionary } from 'lodash';
 

diff --git a/src/explore-education-statistics-common/src/services/publicationService.ts b/src/explore-education-statistics-common/src/services/publicationService.ts
@@ -28,6 +28,7 @@ export interface Publication {
   releaseSeries: ReleaseSeriesItem[];
   topic: {
     theme: {
+      id: string;
       title: string;
     };
   };
@@ -131,21 +132,8 @@ export interface ContentSection<BlockType> {
   content: BlockType[];
 }
 
-export const publicationSortOptions = [
-  'newest',
-  'oldest',
-  'relevance',
-  'title',
-] as const;
-
-export type PublicationSortOption = (typeof publicationSortOptions)[number];
-
 export type PublicationSortParam = 'published' | 'title' | 'relevance';
 
-export const publicationFilters = ['releaseType', 'search', 'themeId'] as const;
-
-export type PublicationFilter = (typeof publicationFilters)[number];
-
 export interface PublicationListRequest {
   page?: number;
   pageSize?: number;

diff --git a/src/explore-education-statistics-frontend/src/components/SortControls.tsx b/src/explore-education-statistics-frontend/src/components/SortControls.tsx
@@ -1,9 +1,9 @@
 import Button from '@common/components/Button';
 import { FormRadioGroup, FormSelect } from '@common/components/form';
 import { useMobileMedia } from '@common/hooks/useMedia';
-import { PublicationSortOption } from '@common/services/publicationService';
 import styles from '@frontend/components/SortControls.module.scss';
-import { DataSetFileSortOption } from '@frontend/services/dataSetFileService';
+import { DataSetFileSortOption } from '@frontend/modules/data-catalogue/utils/dataSetFileSortOptions';
+import { PublicationSortOption } from '@frontend/modules/find-statistics/utils/publicationSortOptions';
 import classNames from 'classnames';
 import React from 'react';