Merge pull request #4104 from dfe-analytical-services/EES-4259

EES-4259 switchover to permalink snapshots and FE tidy up
dfe-analytical-services · Aug 8, 2023 · d669639 · d669639
2 parents 32028c8 + 969920b
commit d669639
Show file tree

Hide file tree

Showing 21 changed files with 182 additions and 1,487 deletions.
diff --git a/...tatistics-common/src/modules/table-tool/components/__tests__/TimePeriodDataTable.test.tsx b/...tatistics-common/src/modules/table-tool/components/__tests__/TimePeriodDataTable.test.tsx
@@ -10,7 +10,7 @@ import {
   testDataNoFiltersTableHeadersConfig,
 } from '@common/modules/table-tool/components/__tests__/__data__/timePeriodDataTable.data';
 import TimePeriodDataTable from '@common/modules/table-tool/components/TimePeriodDataTable';
-import { UnmappedTableHeadersConfig } from '@common/services/permalinkService';
+import { UnmappedTableHeadersConfig } from '@common/services/permalinkSnapshotService';
 import {
   ReleaseTableDataQuery,
   TableDataResponse,

diff --git a/...-common/src/modules/table-tool/components/__tests__/__data__/timePeriodDataTable.data.tsx b/...-common/src/modules/table-tool/components/__tests__/__data__/timePeriodDataTable.data.tsx
@@ -1,4 +1,4 @@
-import { UnmappedTableHeadersConfig } from '@common/services/permalinkService';
+import { UnmappedTableHeadersConfig } from '@common/services/permalinkSnapshotService';
 import { TableDataResponse } from '@common/services/tableBuilderService';
 
 export const testData1Table: TableDataResponse = {

diff --git a/...on-statistics-common/src/modules/table-tool/utils/__tests__/mapTableHeadersConfig.test.ts b/...on-statistics-common/src/modules/table-tool/utils/__tests__/mapTableHeadersConfig.test.ts
@@ -1,4 +1,4 @@
-import { UnmappedTableHeadersConfig } from '@common/services/permalinkService';
+import { UnmappedTableHeadersConfig } from '@common/services/permalinkSnapshotService';
 import {
   CategoryFilter,
   Indicator,

diff --git a/...explore-education-statistics-common/src/modules/table-tool/utils/mapTableHeadersConfig.ts b/...explore-education-statistics-common/src/modules/table-tool/utils/mapTableHeadersConfig.ts
@@ -4,7 +4,7 @@ import { TableHeadersConfig } from '@common/modules/table-tool/types/tableHeader
 import {
   TableHeader,
   UnmappedTableHeadersConfig,
-} from '@common/services/permalinkService';
+} from '@common/services/permalinkSnapshotService';
 
 /**
  * This function remaps the config filters into

diff --git a/...plore-education-statistics-common/src/modules/table-tool/utils/mapUnmappedTableHeaders.ts b/...plore-education-statistics-common/src/modules/table-tool/utils/mapUnmappedTableHeaders.ts
@@ -9,7 +9,7 @@ import { TableHeadersConfig } from '@common/modules/table-tool/types/tableHeader
 import {
   TableHeader,
   UnmappedTableHeadersConfig,
-} from '@common/services/permalinkService';
+} from '@common/services/permalinkSnapshotService';
 
 const mapToTableHeaders = (filters: Filter[]): TableHeader[] => {
   return filters.map<TableHeader>(filter => {

diff --git a/src/explore-education-statistics-common/src/services/__tests__/permalinkService.test.ts b/src/explore-education-statistics-common/src/services/__tests__/permalinkService.test.ts
diff --git a/src/explore-education-statistics-common/src/services/permalinkService.ts b/src/explore-education-statistics-common/src/services/permalinkService.ts
diff --git a/src/explore-education-statistics-common/src/services/permalinkSnapshotService.ts b/src/explore-education-statistics-common/src/services/permalinkSnapshotService.ts
@@ -2,7 +2,24 @@ import { TableJson } from '@common/modules/table-tool/utils/mapTableToJson';
 import { dataApi } from '@common/services/api';
 import { TableDataQuery } from '@common/services/tableBuilderService';
 import { Footnote } from '@common/services/types/footnotes';
-import { UnmappedTableHeadersConfig } from '@common/services/permalinkService';
+
+export type TableHeader =
+  | {
+      type: 'TimePeriod' | 'Indicator' | 'Filter';
+      value: string;
+    }
+  | {
+      type: 'Location';
+      value: string;
+      level: string;
+    };
+
+export interface UnmappedTableHeadersConfig {
+  columnGroups: TableHeader[][];
+  columns: TableHeader[];
+  rowGroups: TableHeader[][];
+  rows: TableHeader[];
+}
 
 export interface PermalinkSnapshot {
   created: string;

diff --git a/src/explore-education-statistics-common/src/services/types/blocks.ts b/src/explore-education-statistics-common/src/services/types/blocks.ts
@@ -4,7 +4,7 @@ import {
   AxisType,
 } from '@common/modules/charts/types/chart';
 import { DataSet } from '@common/modules/charts/types/dataSet';
-import { UnmappedTableHeadersConfig } from '@common/services/permalinkService';
+import { UnmappedTableHeadersConfig } from '@common/services/permalinkSnapshotService';
 import { TableDataQuery } from '@common/services/tableBuilderService';
 import { OmitStrict } from '@common/types';
 

diff --git a/src/explore-education-statistics-common/src/services/types/table.ts b/src/explore-education-statistics-common/src/services/types/table.ts
@@ -1,4 +1,4 @@
-import { UnmappedTableHeadersConfig } from '@common/services/permalinkService';
+import { UnmappedTableHeadersConfig } from '@common/services/permalinkSnapshotService';
 import { TableDataResponse } from '@common/services/tableBuilderService';
 
 export interface ConfiguredTable {