EES-5401 clean up tests & types

Author: bennettstuart

src/explore-education-statistics-admin/src/pages/release/datablocks/components/chart/__tests__/ChartBuilderPreview.test.tsx

@@ -4,7 +4,6 @@ import { ChartRendererProps } from '@common/modules/charts/components/ChartRende
 import { AxisConfiguration } from '@common/modules/charts/types/chart';
 import { DataSet } from '@common/modules/charts/types/dataSet';
 import mapFullTable from '@common/modules/table-tool/utils/mapFullTable';
-import { Chart } from '@common/services/types/blocks';
 import { render, screen } from '@testing-library/react';
 import { produce } from 'immer';
 
@@ -184,8 +183,7 @@ describe('ChartBuilderPreview', () => {
     render(
       <ChartBuilderPreview
         chart={produce(testMapChartRenderer, draft => {
-          (draft as Chart & { boundaryLevel?: number }).boundaryLevel =
-            undefined;
+          draft.boundaryLevel = undefined;
         })}
         loading={false}
       />,

src/explore-education-statistics-common/src/modules/charts/components/MapBlock.tsx

@@ -120,7 +120,7 @@ export default function MapBlock({
   width,
   height,
   axes,
-}: Omit<MapBlockProps, 'releaseId' | 'dataBlockParentId' | 'boundaryLevel'>) {
+}: MapBlockProps) {
   const axisMajor = useMemo<AxisConfiguration>(
     () => ({
       ...axes.major,

src/explore-education-statistics-common/src/modules/find-statistics/components/__tests__/DataBlockTabs.test.tsx

@@ -370,8 +370,7 @@ describe('DataBlockTabs', () => {
       expect(tableBuilderService.getLocationGeoJson).toBeCalledWith(
         'release-1',
         'block-1-parent',
-        testMapConfiguration.type === 'map' &&
-          testMapConfiguration.boundaryLevel,
+        1,
       );
 
       expect(container.querySelector('.leaflet-container')).toBeInTheDocument();