COR-1128 Restructure collection schemas #4506

hasan-ozaynaci · 2022-11-21T14:20:18Z

Summary

Restructuring the vaccine_coverage_per_age jsons for the following levels: VR | GM | COLLECTION.
Changed the vaccination page parts to the new structure of the jsons.
Simplified some overcomplicated and redundant logic in the codebase for the choropleth / -tooltip
Nothing new visually, only code.

) * feat(sewer-choropleth): Implement tooltip notification for outdated data * feat(sewer-choropleth): Implement yellow color on map when data for that area is outdated * feat(sewer-choropleth): Implements new legend item for outdated data, exports font-sizes. * feat(sewer-choropleth): Cleanup and finalize outdated data tooltip addition. * feat(sewer-choropleth): Adjust tooltip to account for different data in VR and GM datapoints. * feat(sewer-choropleth): Adds new outdated data property to schema for GM and VR collections. * feat(sewer-choropleth): New sanity keys and data types. * feat(sewer-choropleth): PR feedback round 1, and a few other fixes/refactoring. * feat(sewer-choropleth): PR feedback round 2 - Add content for assistive technologies (screenreaders). * feat(sewer-choropleth): PR feedback - Change condition for assigning outdated data variables. * feat(sewer-choropleth): Based on new info from backend, adding data_is_outdated property to sewer.json each GM and VR area * feat(sewer-choropleth): generate data types for new properties

…covid19-data-dashboard into feature/cor-1228-json-changes

APW26 · 2022-11-23T09:22:43Z

I know this is a draft, but can you please mention the ticket number in the name of the PR.

hasan-ozaynaci · 2022-11-23T09:26:55Z

I know this is a draft, but can you please mention the ticket number in the name of the PR.

The ticket number is in the name of the branch, but added it in the title aswell.

…aned up files

…hub.com:minvws/nl-covid19-data-dashboard into feature/COR-1128-restructure-collection-schemas

VWSCoronaDashboard26

Quite the big and comprehensive pull request. I did not really see anything that's too much out of the ordinary, but things could be elaborated on some more. I have left a few questions accordingly.

packages/app/schema/gm_collection/__index.json

packages/app/schema/vr_collection/__index.json

packages/app/src/components/choropleth/logic/thresholds.ts

packages/app/src/domain/vaccine/vaccine-coverage-choropleth.tsx

packages/app/src/domain/vaccine/vaccine-coverage-choropleth_vr_and_gm.tsx

packages/app/src/components/choropleth/tooltips/tooltip-subject.tsx

packages/app/src/domain/vaccine/vaccine-coverage-choropleth_vr_and_gm.tsx

packages/app/src/domain/vaccine/vaccine-coverage-choropleth.tsx

packages/app/src/domain/vaccine/vaccine-coverage-choropleth_vr_and_gm.tsx

packages/app/src/pages/gemeente/[code]/vaccinaties.tsx

packages/app/src/pages/veiligheidsregio/[code]/vaccinaties.tsx

Jorrik-Klijnsma-Work

Looks good and covered all current feedback

VWSCoronaDashboard26

Left a single non-blocking comment and thus pre-approving.

packages/app/src/components/choropleth/tooltips/tooltip-subject.tsx

VWSCoronaDashboard25

Some minor comments to look at in a new PR, but as it is I think it's fine (assuming it still works of course).

packages/app/src/components/choropleth/tooltips/tooltip-subject.tsx

packages/app/src/domain/vaccine/common.ts

packages/app/src/components/choropleth/tooltips/tooltip-subject.tsx

packages/app/src/domain/vaccine/vaccine-coverage-choropleth.tsx

* feat(booster): remove and remame booster data from existing schemas (#4499) * Feature/COR-1170-rioolwaterpagina-verbetering-choropletenkaart-nl (#4493) * feat(sewer-choropleth): Implement tooltip notification for outdated data * feat(sewer-choropleth): Implement yellow color on map when data for that area is outdated * feat(sewer-choropleth): Implements new legend item for outdated data, exports font-sizes. * feat(sewer-choropleth): Cleanup and finalize outdated data tooltip addition. * feat(sewer-choropleth): Adjust tooltip to account for different data in VR and GM datapoints. * feat(sewer-choropleth): Adds new outdated data property to schema for GM and VR collections. * feat(sewer-choropleth): New sanity keys and data types. * feat(sewer-choropleth): PR feedback round 1, and a few other fixes/refactoring. * feat(sewer-choropleth): PR feedback round 2 - Add content for assistive technologies (screenreaders). * feat(sewer-choropleth): PR feedback - Change condition for assigning outdated data variables. * feat(sewer-choropleth): Based on new info from backend, adding data_is_outdated property to sewer.json each GM and VR area * feat(sewer-choropleth): generate data types for new properties * feat(booster): remove and remame booster data from existing schemas (#4499) * Feature/COR-1170-rioolwaterpagina-verbetering-choropletenkaart-nl (#4493) * feat(sewer-choropleth): Implement tooltip notification for outdated data * feat(sewer-choropleth): Implement yellow color on map when data for that area is outdated * feat(sewer-choropleth): Implements new legend item for outdated data, exports font-sizes. * feat(sewer-choropleth): Cleanup and finalize outdated data tooltip addition. * feat(sewer-choropleth): Adjust tooltip to account for different data in VR and GM datapoints. * feat(sewer-choropleth): Adds new outdated data property to schema for GM and VR collections. * feat(sewer-choropleth): New sanity keys and data types. * feat(sewer-choropleth): PR feedback round 1, and a few other fixes/refactoring. * feat(sewer-choropleth): PR feedback round 2 - Add content for assistive technologies (screenreaders). * feat(sewer-choropleth): PR feedback - Change condition for assigning outdated data variables. * feat(sewer-choropleth): Based on new info from backend, adding data_is_outdated property to sewer.json each GM and VR area * feat(sewer-choropleth): generate data types for new properties * COR-1128 Restructure collection schemas (#4506) Co-authored-by: AP <[email protected]> Co-authored-by: VWSCoronaDashboard21 <[email protected]> Co-authored-by: VWSCoronaDashboard18 <[email protected]> Co-authored-by: AP <[email protected]> Co-authored-by: VWSCoronaDashboard21 <[email protected]> Co-authored-by: VWSCoronaDashboard18 <[email protected]>

hasan-ozaynaci marked this pull request as draft November 21, 2022 14:20

feat(booster): remove and remame booster data from existing schemas (#…

6038a67

…4499)

Jorrik-Klijnsma-Work force-pushed the feature/COR-1128-restructure-collection-schemas branch from c378667 to ee94d25 Compare November 22, 2022 09:01

hasan-ozaynaci force-pushed the feature/COR-1128-restructure-collection-schemas branch from b5aa5c0 to da05360 Compare November 23, 2022 08:51

hasan-ozaynaci and others added 7 commits November 23, 2022 09:54

Merge branch 'feature/cor-1228-json-changes' of github.com:minvws/nl-…

22f05de

…covid19-data-dashboard into feature/cor-1228-json-changes

feat: changed collection schemas

399baba

feat: update schema's and space typo

a31168e

feat: adjusted the choropleth to accept new structure

2c68bfa

feat: update typing for vaccine coverage

e2b4a44

feat: update coverage data with new structure

1aaac6a

feat: update vr and gm schemas

b4f33c1

hasan-ozaynaci force-pushed the feature/COR-1128-restructure-collection-schemas branch from da05360 to b4f33c1 Compare November 23, 2022 09:04

hasan-ozaynaci changed the title ~~Restructure collection schemas~~ COR-1128 Restructure collection schemas Nov 23, 2022

Jorrik-Klijnsma-Work added 3 commits November 23, 2022 13:30

Update basisserie name added Gm and VR support for Choropleth and Cle…

0f470f3

…aned up files

Fix threshold mismatch

0cd8b2e

60 years can be null in schemas

6322b1f

Jorrik-Klijnsma-Work requested review from VWSCoronaDashboard26 and APW26 November 23, 2022 12:56

fix: remove redundant file with old data in it

d4ee9e1

hasan-ozaynaci marked this pull request as ready for review November 23, 2022 13:01

fix: changes some magic numbers to indexed spaces

9c69f73

Jorrik-Klijnsma-Work force-pushed the feature/cor-1228-json-changes branch from f19a5b2 to 052c743 Compare November 23, 2022 14:04

VWSCoronaDashboard21 and others added 5 commits November 23, 2022 15:04

feat: changed collection schemas

e39a829

feat: update schema's and space typo

c5dd36d

feat: adjusted the choropleth to accept new structure

31ba5cb

feat: update typing for vaccine coverage

486541f

feat: update coverage data with new structure

7bdec11

hasan-ozaynaci and others added 4 commits November 23, 2022 15:04

feat: update vr and gm schemas

62a681b

Update basisserie name added Gm and VR support for Choropleth and Cle…

bdee7a0

…aned up files

Fix threshold mismatch

488cb9f

60 years can be null in schemas

dbfde98

Jorrik-Klijnsma-Work force-pushed the feature/COR-1128-restructure-collection-schemas branch from 9c69f73 to dbfde98 Compare November 23, 2022 14:04

Jorrik-Klijnsma-Work and others added 3 commits November 23, 2022 15:15

Update the file to comply with Coding Standards

ddd0286

replaced one to many

1835d3c

Merge branch 'feature/COR-1128-restructure-collection-schemas' of git…

b306360

…hub.com:minvws/nl-covid19-data-dashboard into feature/COR-1128-restructure-collection-schemas

VWSCoronaDashboard26 reviewed Nov 23, 2022

View reviewed changes

Jorrik-Klijnsma-Work added 2 commits November 23, 2022 16:03

Made AgeGroup types more failsafe and updated data types

2718c64

fix type issues

f8207cf

APW26 reviewed Nov 23, 2022

View reviewed changes

hasan-ozaynaci and others added 4 commits November 23, 2022 17:10

fix: remove redundant thresholds

23fb5b7

fix: made some changes regarding code quality

0d43cda

better filter naming

89c0534

Added PR feedback by extruding coverage data out of JSX.

1b89635

Jorrik-Klijnsma-Work approved these changes Nov 24, 2022

View reviewed changes

Removed extra nested if

7232ecb

Jorrik-Klijnsma-Work force-pushed the feature/COR-1128-restructure-collection-schemas branch from 1cca3bd to 7232ecb Compare November 24, 2022 08:44

VWSCoronaDashboard26 approved these changes Nov 24, 2022

View reviewed changes

packages/app/src/components/choropleth/tooltips/tooltip-subject.tsx Outdated Show resolved Hide resolved

Singel quotes

8fa0f9e

VWSCoronaDashboard25 approved these changes Nov 24, 2022

View reviewed changes

VWSCoronaDashboard25 merged commit 4650d38 into feature/cor-1228-json-changes Nov 24, 2022

VWSCoronaDashboard25 deleted the feature/COR-1128-restructure-collection-schemas branch November 24, 2022 09:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

COR-1128 Restructure collection schemas #4506

COR-1128 Restructure collection schemas #4506

hasan-ozaynaci commented Nov 21, 2022 •

edited

Loading

APW26 commented Nov 23, 2022

hasan-ozaynaci commented Nov 23, 2022

VWSCoronaDashboard26 left a comment

Jorrik-Klijnsma-Work left a comment

VWSCoronaDashboard26 left a comment

VWSCoronaDashboard25 left a comment

COR-1128 Restructure collection schemas #4506

COR-1128 Restructure collection schemas #4506

Conversation

hasan-ozaynaci commented Nov 21, 2022 • edited Loading

Summary

APW26 commented Nov 23, 2022

hasan-ozaynaci commented Nov 23, 2022

VWSCoronaDashboard26 left a comment

Choose a reason for hiding this comment

Jorrik-Klijnsma-Work left a comment

Choose a reason for hiding this comment

VWSCoronaDashboard26 left a comment

Choose a reason for hiding this comment

VWSCoronaDashboard25 left a comment

Choose a reason for hiding this comment

hasan-ozaynaci commented Nov 21, 2022 •

edited

Loading