Feature/COR-1170-rioolwaterpagina-verbetering-choropletenkaart-nl #4493

APW26 · 2022-11-11T12:09:58Z

Summary

This PR addresses the changes described in COR-1170.
TLDR: This PR implements a solution that highlights areas within a choropleth with outdated data scoped to waste water.

Changes:

Added a notification to the tooltip of a given area when its data is outdated
Added a new item to the legend for the choropleth for waste water
Added a new color which is used for an area with outdated data
Added new data_is_outdated property to the schemas for GM and VR collections
Added some new sanity keys for text

NOTE: I am unsure weather this PR should receive the label Hold. Maybe it should as the data is not added in the backend yet (AFAIK).

BEFORE (Production)

GM

VR

AFTER (Local)

GM

VR

…hat area is outdated

… exports font-sizes.

…dition.

…in VR and GM datapoints.

… GM and VR collections.

…ring-choropletenkaart-NL

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

packages/app/src/pages/landelijk/rioolwater.tsx

packages/cms/src/schemas/schema.ts

packages/cms/src/schemas/topical/measure-tile-collection.ts

packages/cms/src/schemas/topical/measure-tile.ts

packages/cms/src/schemas/topical/thermometer.ts

packages/cms/src/validation/index.ts

packages/app/src/components/choropleth-legenda.tsx

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

VWSCoronaDashboard26

Decided to leave this as a generic comment as I do not want to clutter this pull request with repetitive comments, but have a look at files with abbreviated props such as pr, m, etc.

packages/app/src/components/choropleth-legenda.tsx

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

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

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

…factoring.

…ve technologies (screenreaders).

…outdated data variables.

packages/cms/src/lokalize/key-mutations.csv

…ring-choropletenkaart-NL

packages/cms/src/lokalize/key-mutations.csv

VWSCoronaDashboard26

Approved, but let's not merge this until all schemas can be validated.

…s_outdated property to sewer.json each GM and VR area

APW26 · 2022-11-21T15:52:05Z

@VWSCoronaDashboard26 and @VWSCoronaDashboard19 I've pushed some new changes in the latest commit. Apparently backend needs the datapoint to be present for sewers on all VR and GM areas, so I've added it there as well.

hasan-ozaynaci · 2022-11-21T16:02:19Z

@VWSCoronaDashboard26 and @VWSCoronaDashboard19 I've pushed some new changes in the latest commit. Apparently backend needs the datapoint to be present for sewers on all VR and GM areas, so I've added it there as well.

Can you also generate the data types for your schema changes?

APW26 · 2022-11-21T16:41:23Z

@VWSCoronaDashboard26 and @VWSCoronaDashboard19 I've pushed some new changes in the latest commit. Apparently backend needs the datapoint to be present for sewers on all VR and GM areas, so I've added it there as well.

Can you also generate the data types for your schema changes?

@VWSCoronaDashboard19 Done! However, I do believe that this command runs when deploying to any environment, so technically it's not needed right? But i do understand that it helps other devs when pulling in the code.

hasan-ozaynaci · 2022-11-21T16:45:13Z

@VWSCoronaDashboard19 Done! However, I do believe that this command runs when deploying to any environment, so technically it's not needed right? But i do understand that it helps other devs when pulling in the code.

Not sure, but I believe it is a manual task to generate types. If types were incorrect, this branch was not mergable due to failing checks on this PR (or a failing pipeline).

APW26 · 2022-11-21T16:46:13Z

Not sure, but I believe it is a manual task to generate types. If types were incorrect, this branch was not mergable due to failing checks on this PR (or a failing pipeline).

Aha, thats good to know. Thanks!

…oolwaterpagina-verbetering-choropletenkaart-NL

) * 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 * 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]>

APW26 added 9 commits November 4, 2022 12:13

WIP

726ee16

feat(sewer-choropleth): Implement tooltip notification for outdated data

7ad030d

feat(sewer-choropleth): Implement yellow color on map when data for t…

676b0fa

…hat area is outdated

feat(sewer-choropleth): Implements new legend item for outdated data,…

ae770be

… exports font-sizes.

feat(sewer-choropleth): Cleanup and finalize outdated data tooltip ad…

ae8ae4b

…dition.

feat(sewer-choropleth): Adjust tooltip to account for different data …

997ddd1

…in VR and GM datapoints.

feat(sewer-choropleth): Adds new outdated data property to schema for…

8ea2b15

… GM and VR collections.

feat(sewer-choropleth): New sanity keys and data types.

fcaa220

Merge branch 'develop' into feature/COR-1147-Rioolwaterpagina-verbete…

5a5249d

…ring-choropletenkaart-NL

APW26 requested review from hasan-ozaynaci, VWSCoronaDashboard25 and VWSCoronaDashboard26 November 11, 2022 12:09

APW26 self-assigned this Nov 11, 2022

APW26 commented Nov 11, 2022

View reviewed changes

hasan-ozaynaci reviewed Nov 14, 2022

View reviewed changes

packages/app/src/components/choropleth-legenda.tsx Outdated Show resolved Hide resolved

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

hasan-ozaynaci reviewed Nov 14, 2022

View reviewed changes

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

APW26 added the Hold This should not be merged (yet) label Nov 14, 2022

VWSCoronaDashboard26 reviewed Nov 14, 2022

View reviewed changes

APW26 added 3 commits November 14, 2022 14:44

feat(sewer-choropleth): PR feedback round 1, and a few other fixes/re…

6dc9de4

…factoring.

feat(sewer-choropleth): PR feedback round 2 - Add content for assisti…

6709e8b

…ve technologies (screenreaders).

feat(sewer-choropleth): PR feedback - Change condition for assigning …

9fda34d

…outdated data variables.

APW26 commented Nov 16, 2022

View reviewed changes

packages/cms/src/lokalize/key-mutations.csv Outdated Show resolved Hide resolved

Merge branch 'develop' into feature/COR-1147-Rioolwaterpagina-verbete…

33af3e7

…ring-choropletenkaart-NL

APW26 commented Nov 16, 2022

View reviewed changes

packages/cms/src/lokalize/key-mutations.csv Show resolved Hide resolved

APW26 requested review from Amber-Taal-Work and DariaKwork November 16, 2022 09:21

VWSCoronaDashboard26 approved these changes Nov 16, 2022

View reviewed changes

APW26 requested a review from hasan-ozaynaci November 21, 2022 13:47

feat(sewer-choropleth): Based on new info from backend, adding data_i…

d405f1a

…s_outdated property to sewer.json each GM and VR area

feat(sewer-choropleth): generate data types for new properties

04427e2

APW26 changed the base branch from develop to feature/cor-1228-json-changes November 22, 2022 15:33

Merge branch 'feature/cor-1228-json-changes' into feature/COR-1147-Ri…

3478a67

…oolwaterpagina-verbetering-choropletenkaart-NL

APW26 merged commit f19a5b2 into feature/cor-1228-json-changes Nov 22, 2022

APW26 deleted the feature/COR-1147-Rioolwaterpagina-verbetering-choropletenkaart-NL branch November 22, 2022 15:56

APW26 removed the Hold This should not be merged (yet) label Nov 23, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/COR-1170-rioolwaterpagina-verbetering-choropletenkaart-nl #4493

Feature/COR-1170-rioolwaterpagina-verbetering-choropletenkaart-nl #4493

APW26 commented Nov 11, 2022 •

edited

Loading

VWSCoronaDashboard26 left a comment

VWSCoronaDashboard26 left a comment

APW26 commented Nov 21, 2022

hasan-ozaynaci commented Nov 21, 2022 •

edited

Loading

APW26 commented Nov 21, 2022

hasan-ozaynaci commented Nov 21, 2022 •

edited

Loading

APW26 commented Nov 21, 2022

Feature/COR-1170-rioolwaterpagina-verbetering-choropletenkaart-nl #4493

Feature/COR-1170-rioolwaterpagina-verbetering-choropletenkaart-nl #4493

Conversation

APW26 commented Nov 11, 2022 • edited Loading

Summary

BEFORE (Production)

AFTER (Local)

VWSCoronaDashboard26 left a comment

Choose a reason for hiding this comment

VWSCoronaDashboard26 left a comment

Choose a reason for hiding this comment

APW26 commented Nov 21, 2022

hasan-ozaynaci commented Nov 21, 2022 • edited Loading

APW26 commented Nov 21, 2022

hasan-ozaynaci commented Nov 21, 2022 • edited Loading

APW26 commented Nov 21, 2022

APW26 commented Nov 11, 2022 •

edited

Loading

hasan-ozaynaci commented Nov 21, 2022 •

edited

Loading

hasan-ozaynaci commented Nov 21, 2022 •

edited

Loading