-
Notifications
You must be signed in to change notification settings - Fork 5
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
EES-5542 Maps fetching/rendering boundaries for datasets #5423
base: dev
Are you sure you want to change the base?
Conversation
src/explore-education-statistics-common/src/modules/charts/components/MapBlock.tsx
Outdated
Show resolved
Hide resolved
src/explore-education-statistics-common/src/modules/charts/components/MapBlock.tsx
Outdated
Show resolved
Hide resolved
src/explore-education-statistics-common/src/modules/charts/components/MapBlock.tsx
Show resolved
Hide resolved
src/explore-education-statistics-common/src/modules/charts/components/MapBlock.tsx
Outdated
Show resolved
Hide resolved
src/explore-education-statistics-common/src/modules/charts/components/MapGeoJSON.tsx
Outdated
Show resolved
Hide resolved
src/explore-education-statistics-common/src/modules/table-tool/utils/mapFullTableMeta.ts
Outdated
Show resolved
Hide resolved
...xplore-education-statistics-common/src/modules/charts/components/__tests__/MapBlock.test.tsx
Show resolved
Hide resolved
...xplore-education-statistics-common/src/modules/charts/components/__tests__/MapBlock.test.tsx
Outdated
Show resolved
Hide resolved
...xplore-education-statistics-common/src/modules/charts/components/__tests__/MapBlock.test.tsx
Outdated
Show resolved
Hide resolved
...xplore-education-statistics-common/src/modules/charts/components/__tests__/MapBlock.test.tsx
Outdated
Show resolved
Hide resolved
src/explore-education-statistics-common/src/modules/charts/components/ChartRenderer.tsx
Outdated
Show resolved
Hide resolved
3122129
to
c0c6c08
Compare
8255bad
to
8cd2437
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like some of your tests are failing as well. Seems like there's some errors around a missing intersection observer.
I've added the intersection-observer
polyfill to fix this in the #5502 PR (which fixes the react-leaflet
problem) that is targeting your branch.
...re-education-statistics-admin/src/pages/release/datablocks/components/chart/ChartBuilder.tsx
Outdated
Show resolved
Hide resolved
@@ -361,6 +361,7 @@ describe('ChartBuilder', () => { | |||
|
|||
test('calls `onTableQueryUpdate` when change boundary level', async () => { | |||
const testInitialChart: Chart = { | |||
onBoundaryLevelChange: jest.fn(), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
onBoundaryLevelChange
shouldn't be on the Chart
type as it's just supposed to be the chart's JSON configuration from the API.
We should omit this from Chart
using Omit
(not OmitStrict
) and remove this from all relevant places in this PR where it's been added so far.
src/explore-education-statistics-common/src/modules/charts/components/MapBlock.tsx
Outdated
Show resolved
Hide resolved
src/explore-education-statistics-common/src/modules/charts/components/MapBlock.tsx
Outdated
Show resolved
Hide resolved
src/explore-education-statistics-common/src/modules/charts/components/MapBlock.tsx
Outdated
Show resolved
Hide resolved
...on-statistics-common/src/modules/find-statistics/components/__tests__/DataBlockTabs.test.tsx
Outdated
Show resolved
Hide resolved
...on-statistics-common/src/modules/find-statistics/components/__tests__/DataBlockTabs.test.tsx
Outdated
Show resolved
Hide resolved
...on-statistics-common/src/modules/find-statistics/components/__tests__/DataBlockTabs.test.tsx
Outdated
Show resolved
Hide resolved
...on-statistics-common/src/modules/find-statistics/components/__tests__/DataBlockTabs.test.tsx
Outdated
Show resolved
Hide resolved
...on-statistics-common/src/modules/find-statistics/components/__tests__/DataBlockTabs.test.tsx
Outdated
Show resolved
Hide resolved
a426f0f
to
8a047c0
Compare
…onents with callbacks
…ove map component
…red map data set options
…ucation-statistics-common'
bfaf7ae
to
402eed3
Compare
5292182
to
19506c4
Compare
19506c4
to
57708ca
Compare
Setting map charts to fetch location geo JSON for data sets with boundary levels set.
This has been setup by:
releaseId
&dataBlockParentId
props into MapBlockuseQuery
to handle fetching location geo JSON based on data set input selectionuseQuery
cache is initialised with existing subject meta location data to avoid duplicate callsuseQuery
as it stands and is set to not refetch on alt-tab or stale data, as the response is extremely unlikely to change