Skip to content
This repository has been archived by the owner on Nov 4, 2024. It is now read-only.

Commit

Permalink
task/sync-master-develop-after-release (#4543)
Browse files Browse the repository at this point in the history
* Fix stripping of null values (#3742) (#3743)

Co-authored-by: VWSCoronaDashboard1 <[email protected]>

Co-authored-by: VWSCoronaDashboard1 <[email protected]>

* Timeseries API route null filter fix (#3746) (#3747)

* Fix

* Formatting

* Remove console

Co-authored-by: VWSCoronaDashboard1 <[email protected]>

Co-authored-by: VWSCoronaDashboard1 <[email protected]>

* Fix grey bars (#3739)

* Change colors pie chart vaccination status (#3745)

* Properly sort data before filtering (#3751)

Co-authored-by: VWSCoronaDashboard1 <[email protected]>

* Make gapped-area and set everything to 5 weeks (#3740)

* fix: correct pointer-events property assignment (#3760)

* fix: correct pointer-events property assignment

* remove unused import

* Remove all values that are not needed on homepage (#3757)

* Add percentage bar to minitile selector button (#3728)

* Add a wrapper on the content blocks for the cms (#3781) (#3782)

* Update tile selector to show the correct layout based on the viewport (#3788)

* Change layout based on media query

* Add comment

* Update text

* Get rid of the ids

* Add 4 new measurement icons (#3793)

* Make the total vaccinations in sync with the graph last value (#3794)

* Make the total vaccinations in sync with the graph last value

* Fix typescript error

* Add more rich content wrappers (#3796)

* Disable vaccination status & incidence

* Resolve public folder dynamically (#3808) (#3809)

* Resolve public folder dynamically

* Add to utils

Co-authored-by: VWSCoronaDashboard1 <[email protected]>

Co-authored-by: VWSCoronaDashboard1 <[email protected]>

* Fix data type (#3817)

Co-authored-by: VWSCoronaDashboard1 <[email protected]>

* Add timeline events to a lot of time series (#3812)

* Add timeline events to VR situations over time

* Type elements title utils

* Add missing display titles

* Add timeline events to reproduction

* Find elements on metricProperty as well

* Add timeline events to nursing home positive tests

* Sort metric names & properties in elements script

* Type get elements logic

* Add timeline events to disability care infected

* Add timeline events to deceased

* Add timeline events to IC admission per age

* Add timeline events to hospital admissions per age

* Add timeline events to positive tests per age

* Add timeline events to nursing home deceased

* Add timeline events to VR nursing home deceased

* Add timeline events to elderly tested & deceased

* Fix wrong element metricnames on VR & GM topical

* Add dynamic text for last value to choropleth tile (#3860)

# Conflicts:
#	packages/cms/src/lokalize/key-mutations.csv

* Let menu button link to main area index (#3861)

* Let menu button link to main area index

* Add todo

* Turned on feature flags for confirmed cases (#3878)

* Make metric bigger

* Fix compile errors

* Fix merge errors

* Add null check (#3930)

Co-authored-by: VWSCoronaDashboard1 <[email protected]>

* Revert "Adjust booster shot block and schemas (#3915)" (#3934)

This reverts commit 84d042177e200208494eebaf8aab12326c9fe4c2.

* Rename labels and add them to sanity (#3940)

# Conflicts:
#	packages/app/src/pages/index.tsx
#	packages/app/src/pages/landelijk/vaccinaties.tsx
#	packages/cms/src/lokalize/key-mutations.csv

* release fixes

* Filter docs with no subject (#3943)

* fix double lokalize text (#3942)

* added and removed metadata keys

* update sanity

* removed unused file

* Release/2.36.6 (#3952)

* cleaned the metadata (#3951)

* sanity clean uo

* Implemented fallback when IntersectionObserver (#3957)

* Implemented fallback when IntersectionObserver

* Fixed unit tests

* Booster coverage table update

* UX QA feedback

* fix: correct data for booster shots

* Disable booster shots per age group feature

* Disable booster shots per age group feature

* Bug/touch forwards directly chorpopleth android (#4024)

* Use cursor to define if is touch device

* Fix unit test and remove console log

* Don't do anything on mouse move on touch device

(cherry picked from commit 0aa072622c5bc4876b11485dd546c69a67dcbd71)

* Check if ios to solve bug clicking on choropleth (#4027)

(cherry picked from commit 3b7a932365fd95bcf9cb7a0be0329e96ea521dd2)

* Removed cause message href (#4071)

* Removed cause message href

* Temporarily changed link caused message tile

* Added cause message link href (#4072)

* Renamed cause message link (#4074)

* fix: adjust logic for correct tooltip icon (#4083)

* fix: add a check for old date unix (#4084)

* fix: restore old icons for over-risiconiveaus page (#4086)

Co-authored-by: VWSCoronaDashboard25 <[email protected]>

* feature(webpack): use size optimized chunck ids

* feature(webpack): use named optimized chunck ids (#4095)

Co-authored-by: VWSCoronaDashboard25 <[email protected]>

* Remove (temporarily?) risk level information (#4103)

* Remove (temporarily?) risk level information

* Renamed import to prevent lint warning

* Added data scope and metric name to risk level feature

(cherry picked from commit 0f8d1cca2867a4d71b156613ab4178d5a6b6fbd8)

* feat(vaccinations): add new keys for VR and GM vaccinations (#4094)

* feat(vaccinations): add new keys for VR and GM vaccinations

Add new keys for each metric level on the vaccination toggle so editors can edit them individually

* feat: removed unused prop and updated keys

(cherry picked from commit 2f4325bb672fc2fb1c2bc0da61fb58455d5521f1)

# Conflicts:
#	packages/cms/src/lokalize/key-mutations.csv

* feat(topicalPage): Moved relevant keys for topical page to location (#4098)

* feat(topicalPage): Moved relevant keys for topical page to new key

* fix: removed unused code

* Feature/sanity page keys (#4100)

* feat(positiveTestsPage): moved keys to new location

* feat(sewerPage): moved keys to new location

* feat(elderlyPage): moved keys to new location

* Feature/move sanity keys 2 (#4101)

* feat(vaccinations): move gm and vr to new location

* feat(behaviorPage): moved pagekeys to new location

* feat(variantsPage): move national and international keys

* feat(disabilityPage): moved keys to new location

* feat(intensiveCarePage): moved keys to new location

* feat(intensiveCarePage): updated mutations

* fix: correct paths for ic keys

* feat: moved remaining pages to new location inside Sanity (#4106)

* Added repeating shots section and moved third shots (#4113)

* feat: added new schema for data validation

* feat: added repeating shots section

* feat: updates missing changes

* moved third shots to toggle

* feat: added third shots to vaccination grade

* feat: implemented backend data and added extra props for types

Co-authored-by: VWSCoronaDashboard21 <[email protected]>

* Remove nlRepeatingShotAdministered feature flag (#4120)

* feat: removed nlRepeatingShotAdministered feature flag

* fix: use repeating_shot_administered feature flag only for schema

Co-authored-by: VWSCoronaDashboard24 <[email protected]>

* actions trigger

* removed date interval (#4133)

* Renamed variant description

* Squashed commit of the following:

commit b4cad79f3ab907d99b356fb9f037d48bd210ee1d
Author: HO <[email protected]>
Date:   Thu Apr 7 11:34:29 2022 +0200

    fix: mark incomplete data (#4162)

    * fix: mark incomplete data

    * fix: remove unused vars

commit a1ec9da950dcd58cdd50cf58d52c80e5f40937c9
Author: J <[email protected]>
Date:   Thu Apr 7 11:01:08 2022 +0200

    Set behavior annotations live (#4160)

commit 4d01c5c71de25aac3ba8e2b8e6ed4f7a7d8b8697
Author: MN <[email protected]>
Date:   Thu Apr 7 09:52:46 2022 +0200

    Fix/revert new build setup (#4159)

    * Revert "Dockerfile add WORKDIR (#4158)"

    This reverts commit 7b7da7537c19b9485df1ba32f67e922f6d9102ea.

    * Revert "Fix/dockerfile relative paths (#4157)"

    This reverts commit 3228c1eeb551c81ac65ae02f9910fd2f8afa3400.

    * Revert "fix: use relative paths for build copy steps (#4154)"

    This reverts commit dedf734bbcc5043f8dbb9955ced57657f1e4b6f4.

    * Revert "Feature/docker image optimizations (#4144)"

    This reverts commit 1f844fe1d433cb189a16ca94dc952e164b06bfc1.

    Co-authored-by: VWSCoronaDashboard24 <[email protected]>

commit 1b8eb284ec6bab510f3e93a3c91beb1d9327971e
Author: HO <[email protected]>
Date:   Wed Apr 6 15:16:09 2022 +0200

    feat: aligned timeframe options on all charts (#4155)

    * feat: aligned timeframe options on all charts

    * feat: moved option list to a maintainable location

commit 7b7da7537c19b9485df1ba32f67e922f6d9102ea
Author: MN <[email protected]>
Date:   Wed Apr 6 14:59:13 2022 +0200

    Dockerfile add WORKDIR (#4158)

    * fix: use relative paths for build copy steps

    * fix: attempt to use correct paths for copy steps

    * fix: merge conflict

    * fix: add workdir

    Co-authored-by: VWSCoronaDashboard24 <[email protected]>

commit c867a4294967c7f01a30f2efa0919242e98f54bd
Author: J <[email protected]>
Date:   Wed Apr 6 14:20:27 2022 +0200

    Feature/update actueel sewer with data driven text (#4156)

    * Added sanity text

    * Added sanity text

commit 3228c1eeb551c81ac65ae02f9910fd2f8afa3400
Author: MN <[email protected]>
Date:   Wed Apr 6 13:51:19 2022 +0200

    Fix/dockerfile relative paths (#4157)

    * fix: use relative paths for build copy steps

    * fix: attempt to use correct paths for copy steps

    * fix: merge conflict

    Co-authored-by: VWSCoronaDashboard24 <[email protected]>

commit dedf734bbcc5043f8dbb9955ced57657f1e4b6f4
Author: MN <[email protected]>
Date:   Wed Apr 6 11:15:57 2022 +0200

    fix: use relative paths for build copy steps (#4154)

    Co-authored-by: VWSCoronaDashboard24 <[email protected]>

commit 1f844fe1d433cb189a16ca94dc952e164b06bfc1
Author: MN <[email protected]>
Date:   Wed Apr 6 10:13:23 2022 +0200

    Feature/docker image optimizations (#4144)

    * feat: use standalone build of NextJS and outputFileTracing to reduce image size

    * fix: improve download script

    * wip: file proxy to sanity

    * wip: rewrite headers

    * wip: rewrite middlewares

    * feat: removed helmet, custom next-server.js

    * fix: cleanup todos

    * fix: cleanup Dockerfile

    * fix: cleanup next config

    * fix: copy static folder after build to make it run locally

    * fix: merge conflicts

    Co-authored-by: VWSCoronaDashboard24 <[email protected]>

commit 897aab5e6f9fd5e6ac75176295d0fe56aac91c65
Author: J <[email protected]>
Date:   Wed Apr 6 09:58:38 2022 +0200

    Feature/add sewerdata to actueel (#4146)

    * added feature flag for sewage

    * added sewer to actueel nl

    * Added to VR and GM and set the right order and replace the postive test instead of IC and added redirect to domain page

    * turn feature off

    * added remaining lokalize texts

    * Adjusted according to PR feedback

    * Added key in sanity because of mismatch

commit 852c487cd00250d702731676835feb767a073597
Author: HO <[email protected]>
Date:   Wed Apr 6 09:21:53 2022 +0200

    Revert to old download command (#4153)

    * fix: revert to old download command due to pipeline issues

    * fix: revert data structure change

    Co-authored-by: VWSCoronaDashboard24 <[email protected]>

commit d14979832a8300265106539ec9d123fc4537aba7
Author: J <[email protected]>
Date:   Wed Apr 6 00:15:37 2022 +0200

    Feature/behavior annotations match be (#4150)

    * schema edit for Backend

    * Adjusted naming for backend input and added locale

commit 8627c0050c3d7060054c66032d3f2988f6a6333b
Author: MN <[email protected]>
Date:   Tue Apr 5 17:02:50 2022 +0200

    fix: use generate-date-types instead of generate-typescript (#4151)

    Co-authored-by: VWSCoronaDashboard24 <[email protected]>

commit ea97fc3c6f831fb6c7d0110280aee5aaa7f20c4e
Author: HO <[email protected]>
Date:   Tue Apr 5 11:06:39 2022 +0200

    fix: add halfbarwidth conditionally to chart (#4149)

commit 78726659c0d6819c48f7d1f8e3279ace280bcb13
Author: VWSCoronaDashboard20 <[email protected]>
Date:   Mon Apr 4 13:06:09 2022 +0200

    feat: implement redirect and updated script (#4147)

    Co-authored-by: “MA” <“”>

commit 7a721ae31c70735045b01bc89d2a4859d2375ed3
Author: HO <[email protected]>
Date:   Mon Apr 4 12:04:44 2022 +0200

    Feature/update scripts (#4148)

    * feat: update scripts so we can generate data types

    * feat: revert fault change

    * feat: change docs for data types

commit 25461602320e50d495bed2931dbf5990186cff37
Author: HO <[email protected]>
Date:   Mon Apr 4 10:02:50 2022 +0200

    feat: Upgrade to latest version of Sanity and update corresponding files (#4145)

commit d6b49c24bcd043ea312afddb92e61bfd2d8dc489
Author: A <[email protected]>
Date:   Thu Mar 31 14:34:40 2022 +0200

    feature flag added (#4143)

    Co-authored-by: VWSCoronaDashboard21 <[email protected]>

commit 22b52a8d99300c1f2523075797c03c3098d40dd2
Author: A <[email protected]>
Date:   Thu Mar 31 12:49:45 2022 +0200

    add vaccine novavax (#4138)

    * add vaccine novavax

    * added novavax to sanity

    Co-authored-by: VWSCoronaDashboard21 <[email protected]>

commit 4b1a7bb4fb3ced66b7486dc795dd8b7e6f07132d
Author: VWSCoronaDashboard22 <[email protected]>
Date:   Thu Mar 31 10:57:27 2022 +0200

    Expanded timeframe options for most charts (#4142)

commit a73541c8670c4bc9dde383f6340419221f423e98
Author: HO <[email protected]>
Date:   Thu Mar 31 10:21:10 2022 +0200

    Update scripts in monorepo and subprojects (#4141)

    * feat: update scripts

    - Updated scripts
    - Added shortcut scripts
    - Updated docs
    - Updated linter

    * fix: added missing changes

    * feat: rename lokalize scripts

    * feat: updated github workflow with new scripts

commit ab2367ee69719cc20b32bff12e721841a000d095
Author: VWSCoronaDashboard22 <[email protected]>
Date:   Wed Mar 30 14:42:56 2022 +0200

    Added component for rich content input types to display styled validation messages (#4139)

commit 412a3ea33defe05ed2f1d0cb5c68bdd69fcdf968
Author: VWSCoronaDashboard22 <[email protected]>
Date:   Wed Mar 30 14:20:44 2022 +0200

    Added timeframe options of one week and six months (#4140)

    * Added timeframe options of one week and six months

    * Added new timeframe options to sanity

commit 75a3176c44ac48a4ff32a6a42b9fb9e7265b029d
Author: J <[email protected]>
Date:   Wed Mar 30 09:43:26 2022 +0200

    Feature/behaviour annotations (#4128)

    * new data in schema

    * start changing timeline

    * Changing the logic and adding the dataconnection

    * Added x-axis date-range

    * Added Sanity keys

    * Fix TS warnings

    * Fixing Typescript errors

    * Fixing Typescript errors

    * Notify when wrong data is used

    * new data in schema

    * start changing timeline

    * Changing the logic and adding the dataconnection

    * Added x-axis date-range

    * Added Sanity keys

    * Fix TS warnings

    * Fixing Typescript errors

    * Fixing Typescript errors

    * Notify when wrong data is used

    * Update packages/app/src/pages/landelijk/gedrag.tsx

    Co-authored-by: MN <[email protected]>

    * Update packages/app/src/domain/behavior/behavior-line-chart-tile.tsx

    Co-authored-by: MN <[email protected]>

    * Update packages/app/src/domain/behavior/behavior-line-chart-tile.tsx

    Co-authored-by: MN <[email protected]>

    * new data in schema

    * Changing the logic and adding the dataconnection

    * Added x-axis date-range

    * Fix TS warnings

    * Fixing Typescript errors

    * Fixing Typescript errors

    * Notify when wrong data is used

    * Update packages/app/src/pages/landelijk/gedrag.tsx

    Co-authored-by: MN <[email protected]>

    * Update packages/app/src/domain/behavior/behavior-line-chart-tile.tsx

    Co-authored-by: MN <[email protected]>

    * Update packages/app/src/domain/behavior/behavior-line-chart-tile.tsx

    Co-authored-by: MN <[email protected]>

    * New sanity location

    * update sanity type errors

    Co-authored-by: MN <[email protected]>

commit 0712ba47fe8030145eb7d2b8d73a1a7d7fc71737
Author: HO <[email protected]>
Date:   Wed Mar 30 09:13:27 2022 +0200

    feat: updated imports (#4137)

    Compact imports by adding an index to modules

commit f795d6cde95ec0e12c6bc929257c63f675c1fb84
Author: VWSCoronaDashboard22 <[email protected]>
Date:   Mon Mar 28 15:46:13 2022 +0200

    Split lokalize texts into common and pages (#4119)

    * Split lokalize texts into common and pages

    * Fixed some type issues

    * More type fixes

    * Fixed repeating_shot_information_block

    * Merge branch 'develop' into feature/split-lokalize-text

    * Fixed types and references

    * Corrected references

    * Moved lokalize texts

    * Renamed some variables for consistency

    * Fixed text replace vars

commit 9c3b9c37c10cf40de236e903c7c6e5b819e66073
Author: J <[email protected]>
Date:   Fri Mar 25 11:13:44 2022 +0100

    removed date interval (#4133)

* Release/2.46.1 (#4168)

* Squashed commit of the following:

commit 4fcfd0a75cc9316edb783f72ee308be331f3304c
Author: J <[email protected]>
Date:   Mon Apr 11 10:02:31 2022 +0200

    Removed feature flag for sewer data on actueel (#4167)

commit 2b0fd136e8513ec2d2c73f9d7a19bb3ddd05b21d
Author: A <[email protected]>
Date:   Fri Apr 8 10:44:58 2022 +0200

    removed feature flag novavax (#4165)

    Co-authored-by: VWSCoronaDashboard21 <[email protected]>

commit 533312d9c93d82b803cf669ddec42125b5834ef8
Author: J <[email protected]>
Date:   Thu Apr 7 13:37:39 2022 +0200

    clear CSV (#4164)

* correct merge fails

* Fixing data driven texts variables matching with sanity keys (#4171) (#4172)

* Fixing data driven texts variables matching with sanity keys

* set right unix type

* Squashed commit of the following:

commit 6a6759ab7a649424e5a103c2dc7a019d4fb48ad5
Author: MN <[email protected]>
Date:   Thu Apr 21 08:51:49 2022 +0200

    feat: improved handling of missing data for behavior_per_age_group (#4191)

    Co-authored-by: VWSCoronaDashboard24 <[email protected]>
    Co-authored-by: J <[email protected]>

commit b85610ccdec3a07882bc4e515f249edf8e48d3d4
Author: HO <[email protected]>
Date:   Wed Apr 20 14:28:13 2022 +0200

    feat: added table header text for screenreaders (#4192)

commit a28951391d59499d3c9a3b9e64ebb559efde2e32
Author: MN <[email protected]>
Date:   Wed Apr 20 11:24:03 2022 +0200

    Revert "Feature/docker build improvements (#4187)" (#4190)

    This reverts commit be85f7a3b4f62ab88ee6cc8f3e3e95ad9e2805cc.

    Co-authored-by: VWSCoronaDashboard24 <[email protected]>

commit f27d259b8fa0dbfd3a122cd2833d12aefbc1f321
Author: HO <[email protected]>
Date:   Wed Apr 20 09:23:27 2022 +0200

    Changes applied to screenreaders (#4189)

    * feat(cor-514): descriptive tile description for screenreaders

    * feat(cor-517): replaced cell with headercell with according styling

    * feat(cor-518): add arialabel for external links and remove redundancy

    * fix: add mutations file

commit be85f7a3b4f62ab88ee6cc8f3e3e95ad9e2805cc
Author: MN <[email protected]>
Date:   Tue Apr 19 11:57:31 2022 +0200

    Feature/docker build improvements (#4187)

    * Revert "Fix/revert new build setup (#4159)"

    This reverts commit 4d01c5c71de25aac3ba8e2b8e6ed4f7a7d8b8697.

    * feat: updated Dockerfile

    * test: docker github action

    * fix: restore github action

    * fix: move chown to seperate step

    Co-authored-by: VWSCoronaDashboard24 <[email protected]>

commit d3c4aa31c116a2558cfb389caa5750a621bf6cab
Author: HO <[email protected]>
Date:   Fri Apr 15 14:55:52 2022 +0200

    Semantic adjustments (#4186)

    * feat(cor-510): semantic strong tags instead of bold

    * feat(cor-511): remove heading from links

    * fix: removed unused import

commit 55183ca5cc0ccf3f77de18093ed5e632b1e57cdb
Author: J <[email protected]>
Date:   Fri Apr 15 13:11:25 2022 +0200

    Feature/incomplete zeewolde data (#4185)

    * Research commit

    * Added logic for manual override

    * Added logic for manual override

    * Updated Lokalize key locations

    * Added to GM domain

    * Remove todo

    * Research commit

    * Added logic for manual override

    * Added logic for manual override

    * Updated Lokalize key locations

    * Added to GM domain

    * Remove todo

    * add to VR

    * Added selected installation and right start and end unix

    * fix research leftovers

    * remove unnecessary sanity move

    * move lokalize from gm to shared

    * Research commit

    * Added logic for manual override

    * Added logic for manual override

    * Remove todo

    * add to VR

    * Added selected installation and right start and end unix

    * fix research leftovers

    * remove unnecessary sanity move

    * move lokalize from gm to shared

    * Move from GM to Shared

    * Research commit

    * Added logic for manual override

    * Remove todo

    * fix research leftovers

    * move lokalize from gm to shared

    * Updated according to PR feedback

commit 07e195970ecc7d4fb0133a4a45c06f9ab6adbbbd
Author: HO <[email protected]>
Date:   Thu Apr 14 15:05:08 2022 +0200

    feat: delete third shots schemas and its relations (#4184)

commit d219c46f72e0c510ce5248b5fe74031b64085ca2
Author: MN <[email protected]>
Date:   Thu Apr 14 11:35:35 2022 +0200

    Remove vaccine_delivery & vaccine_administered_estimate from schema (#4178)

    * feat: remove vaccine_delivery from schemas

    * wip: remove vaccine_delivery

    * feat: rewrite selectDeliveryAndAdministrationData

    * fix: cleanup types

    * fix: cleanup fn params

    * fix: rename vaccine_administered to vaccineAdministered

    * fix: remove date_start_unix and date_end_unix and use date_unix instead

    * feat: remove vaccine_administered_estimate from schema

    * fix: rename to administrationData

    * fix: merge conflicts

    Co-authored-by: VWSCoronaDashboard24 <[email protected]>

commit e0ad1e737a9ddd7d8cd0a115b339fb47bb4efab3
Author: HO <[email protected]>
Date:   Thu Apr 14 11:33:01 2022 +0200

    Removed third shots and its links (#4183)

    * feat: removed third shots and its links

    * feat: added sanity mutations

commit fe95e3974921fa711ec1de7fa84b7589ae7e9991
Author: MN <[email protected]>
Date:   Thu Apr 14 09:54:04 2022 +0200

    Revert "Feature/docker build improvements (#4166)" (#4182)

    This reverts commit 02cbe2cd46bed9730215182603c7ea8d6bf2059c.

    Co-authored-by: VWSCoronaDashboard24 <[email protected]>

commit 48d15ed1a2a82d18aa180a668dc555fe672c093c
Author: J <[email protected]>
Date:   Wed Apr 13 14:23:08 2022 +0200

    Added selected graph date to metadata (#4181)

commit 02cbe2cd46bed9730215182603c7ea8d6bf2059c
Author: MN <[email protected]>
Date:   Wed Apr 13 11:35:14 2022 +0200

    Feature/docker build improvements (#4166)

    * Revert "Fix/revert new build setup (#4159)"

    This reverts commit 4d01c5c71de25aac3ba8e2b8e6ed4f7a7d8b8697.

    * feat: updated Dockerfile

    * test: docker github action

    * fix: restore github action

    Co-authored-by: VWSCoronaDashboard24 <[email protected]>

commit 20d70ec8c3712375c3fcb46f367035e23ad994ca
Author: HO <[email protected]>
Date:   Wed Apr 13 09:24:19 2022 +0200

    feat: changed the way screenreaders read the content of tooltips in choropleths (#4179)

commit ecbe05319e4bc68005a0fa7eadbe33cca30c5f2a
Author: MN <[email protected]>
Date:   Tue Apr 12 14:03:25 2022 +0200

    Build Docker on release branches (#4174)

    * feat: infra improvements

    * feat: add download step to github action

    * feat: add docker build step

    * fix: use correct yml syntax

    * fix: remove context from actions yml

    * feat: only run on release branch

    Co-authored-by: VWSCoronaDashboard24 <[email protected]>

* fix: use size for chunkIds instead of names

* Feature/cor 561 missing weekend data (#4202)

* Add excluded data for the specific metric

* Add series

* Add missing in between

* Make line dashed and fill area with dates

* Add type fix

* Solved PR feedback

(cherry picked from commit da0bda67ea5bfdf120714f568fd9841fb71c2a61)

* Changed covarage back to original key (#4205)

(cherry picked from commit 494ae3a18016b38ac5b7529610e808f666695618)

# Conflicts:
#	packages/cms/src/lokalize/key-mutations.csv

* Removed to much lines in csv for patchrelease

* Fix/vaccine coverage date (#4207)

* fix: use date_unix for vaccine coverage data

* fix: use date_unix instead of date_end_unix for vaccine coverage chart

Co-authored-by: VWSCoronaDashboard24 <[email protected]>

* Fix/cor 610 incosistent dates on topical pages headers (#4213)

* create hook for getting the last date of insertion

* Added hook to vaccinaties page

* Added all NL pages

* Added all VR pages

* Added to all GM pages

* Exclude difference data

* Improving the Hook

(cherry picked from commit 76ef6543d1c1e63dd44965b5b38d1609661d2d0e)

* COR-604 - Use new hospital_nice_choropleth key for hospital choropleths (#4215)

* fix: use correct boundry when no null values are found

* feat: update schemas with hospital_nice_graph and hospital_nice_choropleth

* feat: update schemas with hospital_nice_choropleth

* fix: use correct format for vr and gm hospital_nice

* fix: use correct hospital_nice schema gm and vr

* feat: use new json key for hospital_nice choropleths

* fix: use date_unix from gm and vr collections for choropleths

Co-authored-by: VWSCoronaDashboard24 <[email protected]>

* fix: add missing import for DAY_IN_SECONDS

* fix: remove failing test

* fix: revert Sanity key move (hospital_admissions_region_choropleth.description)

* fix: update generate types

* fix merge conflicts

* fix: remove hospital_nice_choropleth from vr schema

* COR-676 - Behavior keys optional in json schemas (#4241)

* fix: make selftest_visit_behavior optional in json schemas

* feat: make behavior json keys optional

Co-authored-by: VWSCoronaDashboard24 <[email protected]>

* updated get last date logic

(cherry picked from commit f731f7a02064026eb4fa9352a65bbd164e80d9ca)

* Fix typescript error

* Solve PR feedback

* Squashed commit of the following:

commit 77ff7813298ad16ec14df33fe6f98b2128c50295
Author: VWSCoronaDashboard25 <[email protected]>
Date:   Tue May 31 11:12:17 2022 +0200

    feature(CMS): slice first 3 path elements of for the title because they are redundant in the preview (#4272)

    closes: COR-543

    Co-authored-by: VWSCoronaDashboard25 <[email protected]>

commit f5bd004f8f688169093c7ceb9c50dbd0accac1c7
Author: MN <[email protected]>
Date:   Mon May 30 16:10:34 2022 +0200

    COR-725 unix date correction (#4255)

    * fix: use startOfDay for all graph values

    * fix: convert dates to startOfDay

    * fix: use endOfDay instead of middleOfDay for current date hook

    * fix: update tests

    Co-authored-by: VWSCoronaDashboard24 <[email protected]>

commit 6fcf9b4e1fc6a9a9b74921de1866458fd0f4f37f
Author: J <[email protected]>
Date:   Fri May 27 10:52:13 2022 +0200

    Feature/cor 750 add dotted time series style (#4267)

    * Added a dot line for the time series graph

    * Added laganda support and group scatter plot dots

commit 4eeff200484c1302a4c36698a5c30d3ecf01caa3
Author: VWSCoronaDashboard22 <[email protected]>
Date:   Wed May 25 15:22:14 2022 +0200

    Removed obsolete code for international pages (#4268)

    * Removed obsolete code for international pages

    * Removed type parameter

commit 10d97063c626167c4eda20cc4bb069fef1b4ce9e
Author: VWSCoronaDashboard25 <[email protected]>
Date:   Wed May 25 14:24:46 2022 +0200

    fix: set icon size for the top menu icons on smaller screens (#4266)

    These were forgotten with the refactor

    Co-authored-by: VWSCoronaDashboard25 <[email protected]>

commit 4f4abc9e9045f8a13de18678966c8e92c8072cb2
Author: VWSCoronaDashboard22 <[email protected]>
Date:   Wed May 25 13:27:53 2022 +0200

    Implemented redesign combobox and select list (#4264)

    * Implemented redesign combobox and select list

    * Removed unused imports

    * Removed sorting by score

    * Added padding to no results message

    * Always keep the same width for search form

    * Removed unused import

    * Fixed padding search results

commit 38ec557d8dcca63bdf40a87a39a54993d76deeb8
Author: MN <[email protected]>
Date:   Tue May 24 16:29:36 2022 +0200

    COR-736 Behavior Choropleth Tooltip (#4262)

    * fix: fall back to - when no data is available for behavior choropleth tooltip

    * fix: show 0% when data is not null but 0

    Co-authored-by: VWSCoronaDashboard24 <[email protected]>

commit cb44e92806b5a335d887ce30bbd7f74db8c69136
Author: HO <[email protected]>
Date:   Tue May 24 14:45:50 2022 +0200

    fix: revert changes, replace with empty div and pass optional props (#4263)

commit 26a07c71e2ef4bf6e8cdc27dae0176806d9e7c38
Author: MN <[email protected]>
Date:   Tue May 24 11:34:08 2022 +0200

    COR-618 Resolve duplicate IDs (#4261)

    * fix: only render mini charts once based on screen size

    * fix: use unique ids for different chart elements and accessibility-annotations

    * fix: mock useUniqueId hook

    * fix: cleanup mock after test

    Co-authored-by: VWSCoronaDashboard24 <[email protected]>

commit 64861ee575314aae0d8d6faf2c20dbb335974bfc
Author: HO <[email protected]>
Date:   Mon May 23 15:02:23 2022 +0200

    Archive page and add warning tile (#4260)

    * feat(situationsPage): archive page and add warning tile

    * feat: added new key for warning

commit 1ab4c1b2096bc7e3681f6edc8e37b24575e7cba3
Author: VWSCoronaDashboard25 <[email protected]>
Date:   Mon May 23 12:05:16 2022 +0200

    Refactor/cor 73 remove fixed width and height in icons (#4256)

    * refactor: remove width and height of icons with a viewBox

    * refactor: replace width and height of icons with a viewBox

    * refactor: set size of metadata icon in metadata instead

    Use a styled span similar to the icon in the header component

    * refactor: set size of situation icon in code

    Using the extended properties of the generated React element

    Co-authored-by: VWSCoronaDashboard25 <[email protected]>

commit 2605658f00edd7830e4e2f15795d2c28002016a6
Author: VWSCoronaDashboard22 <[email protected]>
Date:   Thu May 19 15:05:53 2022 +0200

    Added string year to age group (#4259)

commit f506760b93fcd698fdb312c1faa6027b31daca6b
Author: J <[email protected]>
Date:   Thu May 19 13:58:38 2022 +0200

    Feature/cor 615 fix two kpi tiles with one column (#4257)

    * change to grid

    * Remove extra KPI tile

    * Fix margins and paddings

commit 4d02ed502742fb416644de6a176bb7315cd587c1
Author: MN <[email protected]>
Date:   Thu May 19 13:46:30 2022 +0200

    fix: fall back to - when no data is available for behavior choropleth tooltip (#4258)

    Co-authored-by: VWSCoronaDashboard24 <[email protected]>

commit 2fd679be8c713b031b8f47e0e6acbb5898ae8e5d
Author: VWSCoronaDashboard22 <[email protected]>
Date:   Thu May 19 08:46:13 2022 +0200

    Feature/cor 733 hospital admissions per 100000 (#4254)

    * Removed user-scalable and added maximum-scale=5

    * Changed metric key and legend on hospital admissions choropleth

commit ed58ee4d00890423f15e192a0dc72e1cd1e6c2e9
Author: VWSCoronaDashboard22 <[email protected]>
Date:   Wed May 18 12:37:29 2022 +0200

    Removed user-scalable and added maximum-scale=5 (#4253)

commit eed6f66e0daf8e2c0f204a878a0e4712a27de47d
Author: HO <[email protected]>
Date:   Wed May 18 10:05:48 2022 +0200

    feat: upgrade version sanity cli (#4251)

commit 479eab055186af493ddc188d49b7864709eb77a5
Author: VWSCoronaDashboard22 <[email protected]>
Date:   Wed May 18 09:51:22 2022 +0200

    Set text y axis to bold and black (#4250)

commit 20f9d6a91fa4c44fa01e931fce14dc56549f99b6
Author: VWSCoronaDashboard22 <[email protected]>
Date:   Wed May 18 08:37:22 2022 +0200

    Ignore forced maximum when out of bounds value is outside time domain (#4246)

    * Ignore forced maximum when out of bounds value is outside time domain

    * Lint fixes

    * Added hasOutofBoudsValues to useMemo dependency array

    * Use Math.min instead of ternary operator

    * Type check calculatedForcedMaximumValue for seriesMax

commit f34638fb79a8a1dd821a2e93cdadb732b387925a
Author: MN <[email protected]>
Date:   Tue May 17 14:58:00 2022 +0200

    COR-676 - Behavior keys optional in json schemas (#4241)

    * fix: make selftest_visit_behavior optional in json schemas

    * feat: make behavior json keys optional

    Co-authored-by: VWSCoronaDashboard24 <[email protected]>

commit 390905ba1284762aea9b61bb49736dc777718028
Author: HO <[email protected]>
Date:   Tue May 17 13:57:11 2022 +0200

    Remove booster past seven days from vaccinations page (#4249)

    * feat: updated schemas

    * feat(booster): remove last seven days from booster

commit 50fc1e85cdd22452d408899a58d63a9b6414b338
Author: HO <[email protected]>
Date:   Tue May 17 09:54:11 2022 +0200

    feat(measures): change h2 to h1 for page title (#4247)

commit 7d0b918b86c6b4ca389bfa88a4598e00858a4374
Author: HO <[email protected]>
Date:   Tue May 17 09:03:53 2022 +0200

    feat: change display names to search terms (#4245)

commit 83dff1849e50b6c60cf877863c446eaabaa9047f
Author: HO <[email protected]>
Date:   Fri May 13 11:50:42 2022 +0200

    feat: flip h1 with h2 and keep styling as it is (#4244)

* Squashed commit of the following:

commit 6b825c262c7a49d370e89382d2002cc2b6f42f9e
Author: J <[email protected]>
Date:   Thu Jun 2 10:42:50 2022 +0200

    removed feature flag and added archived graphs to NL, VR and GM (#4274)

commit e6b8ae7728d9c7a6c245d813e777e147e4439514
Author: VWSCoronaDashboard22 <[email protected]>
Date:   Wed Jun 1 09:42:11 2022 +0200

    Style changes select component (#4273)

    * Style changes select component

    * Use theme variables

commit 77ff7813298ad16ec14df33fe6f98b2128c50295
Author: VWSCoronaDashboard25 <[email protected]>
Date:   Tue May 31 11:12:17 2022 +0200

    feature(CMS): slice first 3 path elements of for the title because they are redundant in the preview (#4272)

    closes: COR-543

    Co-authored-by: VWSCoronaDashboard25 <[email protected]>

commit f5bd004f8f688169093c7ceb9c50dbd0accac1c7
Author: MN <[email protected]>
Date:   Mon May 30 16:10:34 2022 +0200

    COR-725 unix date correction (#4255)

    * fix: use startOfDay for all graph values

    * fix: convert dates to startOfDay

    * fix: use endOfDay instead of middleOfDay for current date hook

    * fix: update tests

    Co-authored-by: VWSCoronaDashboard24 <[email protected]>

commit 6fcf9b4e1fc6a9a9b74921de1866458fd0f4f37f
Author: J <[email protected]>
Date:   Fri May 27 10:52:13 2022 +0200

    Feature/cor 750 add dotted time series style (#4267)

    * Added a dot line for the time series graph

    * Added laganda support and group scatter plot dots

commit 4eeff200484c1302a4c36698a5c30d3ecf01caa3
Author: VWSCoronaDashboard22 <[email protected]>
Date:   Wed May 25 15:22:14 2022 +0200

    Removed obsolete code for international pages (#4268)

    * Removed obsolete code for international pages

    * Removed type parameter

commit 10d97063c626167c4eda20cc4bb069fef1b4ce9e
Author: VWSCoronaDashboard25 <[email protected]>
Date:   Wed May 25 14:24:46 2022 +0200

    fix: set icon size for the top menu icons on smaller screens (#4266)

    These were forgotten with the refactor

    Co-authored-by: VWSCoronaDashboard25 <[email protected]>

commit 4f4abc9e9045f8a13de18678966c8e92c8072cb2
Author: VWSCoronaDashboard22 <[email protected]>
Date:   Wed May 25 13:27:53 2022 +0200

    Implemented redesign combobox and select list (#4264)

    * Implemented redesign combobox and select list

    * Removed unused imports

    * Removed sorting by score

    * Added padding to no results message

    * Always keep the same width for search form

    * Removed unused import

    * Fixed padding search results

commit 38ec557d8dcca63bdf40a87a39a54993d76deeb8
Author: MN <[email protected]>
Date:   Tue May 24 16:29:36 2022 +0200

    COR-736 Behavior Choropleth Tooltip (#4262)

    * fix: fall back to - when no data is available for behavior choropleth tooltip

    * fix: show 0% when data is not null but 0

    Co-authored-by: VWSCoronaDashboard24 <[email protected]>

commit cb44e92806b5a335d887ce30bbd7f74db8c69136
Author: HO <[email protected]>
Date:   Tue May 24 14:45:50 2022 +0200

    fix: revert changes, replace with empty div and pass optional props (#4263)

commit 26a07c71e2ef4bf6e8cdc27dae0176806d9e7c38
Author: MN <[email protected]>
Date:   Tue May 24 11:34:08 2022 +0200

    COR-618 Resolve duplicate IDs (#4261)

    * fix: only render mini charts once based on screen size

    * fix: use unique ids for different chart elements and accessibility-annotations

    * fix: mock useUniqueId hook

    * fix: cleanup mock after test

    Co-authored-by: VWSCoronaDashboard24 <[email protected]>

commit 64861ee575314aae0d8d6faf2c20dbb335974bfc
Author: HO <[email protected]>
Date:   Mon May 23 15:02:23 2022 +0200

    Archive page and add warning tile (#4260)

    * feat(situationsPage): archive page and add warning tile

    * feat: added new key for warning

commit 1ab4c1b2096bc7e3681f6edc8e37b24575e7cba3
Author: VWSCoronaDashboard25 <[email protected]>
Date:   Mon May 23 12:05:16 2022 +0200

    Refactor/cor 73 remove fixed width and height in icons (#4256)

    * refactor: remove width and height of icons with a viewBox

    * refactor: replace width and height of icons with a viewBox

    * refactor: set size of metadata icon in metadata instead

    Use a styled span similar to the icon in the header component

    * refactor: set size of situation icon in code

    Using the extended properties of the generated React element

    Co-authored-by: VWSCoronaDashboard25 <[email protected]>

commit 2605658f00edd7830e4e2f15795d2c28002016a6
Author: VWSCoronaDashboard22 <[email protected]>
Date:   Thu May 19 15:05:53 2022 +0200

    Added string year to age group (#4259)

commit f506760b93fcd698fdb312c1faa6027b31daca6b
Author: J <[email protected]>
Date:   Thu May 19 13:58:38 2022 +0200

    Feature/cor 615 fix two kpi tiles with one column (#4257)

    * change to grid

    * Remove extra KPI tile

    * Fix margins and paddings

commit 4d02ed502742fb416644de6a176bb7315cd587c1
Author: MN <[email protected]>
Date:   Thu May 19 13:46:30 2022 +0200

    fix: fall back to - when no data is available for behavior choropleth tooltip (#4258)

    Co-authored-by: VWSCoronaDashboard24 <[email protected]>

commit 2fd679be8c713b031b8f47e0e6acbb5898ae8e5d
Author: VWSCoronaDashboard22 <[email protected]>
Date:   Thu May 19 08:46:13 2022 +0200

    Feature/cor 733 hospital admissions per 100000 (#4254)

    * Removed user-scalable and added maximum-scale=5

    * Changed metric key and legend on hospital admissions choropleth

commit ed58ee4d00890423f15e192a0dc72e1cd1e6c2e9
Author: VWSCoronaDashboard22 <[email protected]>
Date:   Wed May 18 12:37:29 2022 +0200

    Removed user-scalable and added maximum-scale=5 (#4253)

commit eed6f66e0daf8e2c0f204a878a0e4712a27de47d
Author: HO <[email protected]>
Date:   Wed May 18 10:05:48 2022 +0200

    feat: upgrade version sanity cli (#4251)

commit 479eab055186af493ddc188d49b7864709eb77a5
Author: VWSCoronaDashboard22 <[email protected]>
Date:   Wed May 18 09:51:22 2022 +0200

    Set text y axis to bold and black (#4250)

commit 20f9d6a91fa4c44fa01e931fce14dc56549f99b6
Author: VWSCoronaDashboard22 <[email protected]>
Date:   Wed May 18 08:37:22 2022 +0200

    Ignore forced maximum when out of bounds value is outside time domain (#4246)

    * Ignore forced maximum when out of bounds value is outside time domain

    * Lint fixes

    * Added hasOutofBoudsValues to useMemo dependency array

    * Use Math.min instead of ternary operator

    * Type check calculatedForcedMaximumValue for seriesMax

commit f34638fb79a8a1dd821a2e93cdadb732b387925a
Author: MN <[email protected]>
Date:   Tue May 17 14:58:00 2022 +0200

    COR-676 - Behavior keys optional in json schemas (#4241)

    * fix: make selftest_visit_behavior optional in json schemas

    * feat: make behavior json keys optional

    Co-authored-by: VWSCoronaDashboard24 <[email protected]>

commit 390905ba1284762aea9b61bb49736dc777718028
Author: HO <[email protected]>
Date:   Tue May 17 13:57:11 2022 +0200

    Remove booster past seven days from vaccinations page (#4249)

    * feat: updated schemas

    * feat(booster): remove last seven days from booster

commit 50fc1e85cdd22452d408899a58d63a9b6414b338
Author: HO <[email protected]>
Date:   Tue May 17 09:54:11 2022 +0200

    feat(measures): change h2 to h1 for page title (#4247)

commit 7d0b918b86c6b4ca389bfa88a4598e00858a4374
Author: HO <[email protected]>
Date:   Tue May 17 09:03:53 2022 +0200

    feat: change display names to search terms (#4245)

commit 83dff1849e50b6c60cf877863c446eaabaa9047f
Author: HO <[email protected]>
Date:   Fri May 13 11:50:42 2022 +0200

    feat: flip h1 with h2 and keep styling as it is (#4244)

* force legends for LCPS graphs (#4286)

(cherry picked from commit 097197ce99e4a576cb1e31785bf8994e9e92036a)

* fix: only show topical mini charts when we know the correct breakpoints (#4289)

Co-authored-by: VWSCoronaDashboard24 <[email protected]>
(cherry picked from commit 42081ff9b9f022c51d09e60d2b69bf26dccde307)

* fix: positive tests page design consistancy (#4290)

(cherry picked from commit ab50b7d5c2fcaa2a2b0771d8993accd2ce9b5892)

* COR-48 Update packages + audit fix (#4296)

* chore: update styled-components and friends

* chore: update typescript for app

* chore: update typescript for cli

* chore: update ts-node, sanity, typescript

* fix: fall back to variantName in json when not provided in sanity

* chore: audit fix

* restore data-structure

Co-authored-by: VWSCoronaDashboard24 <[email protected]>

* COR-749 Fix responsive Choropleth sizing (#4293)

* fix: remove minHeight for vr and gm pages choropleth

* fix: only set minHeight when provided

* fix: remove console.log

* fix: code cleanup

Co-authored-by: VWSCoronaDashboard24 <[email protected]>

* feat: align left axis label with tick value (#4297)

- Align label next to top axis-left tick value
- Align top axis left tick value with chart line
- Some code formatting

* Scroll through list of results with keyboard (#4294)

* feat: scroll through list of results with keyboard

* feat: Add guard pattern and named functions

- Change if statement and add guard
- Add extra comment for specific calculations
- Change functions to named functions

* feat: rename function according to coding standards

* fix: stop using archived data for unarchived chart (#4302)

The graph was unarchived but still pointed to the archived dataset. This commit fixes that. And properly removes it from other calculations as well.

Co-authored-by: VWSCoronaDashboard25 <[email protected]>

* Release/2.51.2 (#4315)

* bugfix: expand the functionality of getLastInsertionDateOfPage so it covers all scenario's (removes occasional January 1st 1970 from the pages) (#4314)

Also removed some entries as 'pageMetrics' that are backend data, but no page metrics, e.g. 'code' and 'static_values.<anything>'

Co-authored-by: VWSCoronaDashboard25 <[email protected]>

* feature/COR-871-variant-page-table (#4308)

* feat: updated CovidVariantenPage page component to update layout. updated VariantNameCell component to have a hover state configurable through props. updated getVariantTableData functionality to filter out irrelevant variants and map colors between graphs and tables.

* feat: updated PercentageBar component to correctly render the background color.

* feat: updated getVariantTableData functionality to 1) filter out 'other_graph' variants; 2) create a mapped sorting of variants based on the Greek alphabet; 3) correctly map colors for the 'other_table' variant; 4) simplify the final array filtering

* feat: small consistency fix

* feat: updated VariantNameCell component to rename hasHoverState to isTooltipEnabled; updated getVariantTableData functionality to restore filtering based on historical significance

* feat: reverted strict mapping between Greek alphabet and variants; removed TODO code; 'fixed' percentage mapping; 'fixed' color and order mapping

* feat: revert back to commit 0c0083d8 with changes applied

* feat: removed TODO; fixed comments

* feat: removed TODO; fixed comments

* feat: fix linting issues

* feat: update variant sorting algorithm with dedicated util method to always sort variants not in the map (omicron sub-variants for instance) to the back of the list;

* feat: updated colors so that they are in the correct order;

* feat: updated types for the different new omicron sub-variants (leveraging _-notation rather than .-notation); introduced temporary testing colors;

* feat: updated colors; started on the variants chart;

* chore: add Sanity keys for omicron variants

* feat: updated useSeriesConfig hook in VariantStackedAreaTileWithData component to properly handle new sub-variant names for the chart (i.e. omicron ba_2_12_1_percentage);

* feat: updated graph to remove 'other_graph' variants from the graph; updated chart to add date below the chart;

* feat: updated InteractiveLegend component to add a new GappedArea component to match with the chart appearance in regards to how data series and tooltip indicators are rendered;

* feat: updated getVariantTableData functionality to sort based on reversed Greek alphabet; did some prep-work for PR #4314

* feat: updated VariantsStackedAreaTile component to pass correct properties to metadata prop;

* feat: updated TooltipList styles to only use two columns when on certain breakpoints; updated TooltipContent styles to increase the maxWidth of the component;

Co-authored-by: VWSCoronaDashboard26 <[email protected]>
Co-authored-by: VWSCoronaDashboard25 <[email protected]>

Co-authored-by: VWSCoronaDashboard25 <[email protected]>
Co-authored-by: VWSCoronaDashboard25 <[email protected]>
Co-authored-by: L R <[email protected]>
Co-authored-by: VWSCoronaDashboard26 <[email protected]>

* COR-949 Add vaccination campaign name localization (#4334)

Co-authored-by: VWSCoronaDashboard21 <[email protected]>

* feat(vaccination-grade): add new keys for archived title and description (#4336)

* Adding new icons and fixing all icons to be compliant (#4367)

* Adding new icons and fixing all icons to be compiant

* PR feedback

(cherry picked from commit 3b3ee5b75e277400c7569ce85a42cfa348237507)

* Feature/cor 959 topical page redesign (#4376)

* Made a base file for a new topicalPage to work on in this ticket.

* COR-995 Topical page redesign schema (#4355)

* feat: setup schema for topical themes

* feat: first version of topcial page schema

* feat: support for new topical.json

* feat: implement multilang, cleanup schemas

* feat: extend schema with translations and indices

* feat: add valid icon values

* feat: implement loading of TOPICAL json file data

* feat: implement selectTopcialData

* feat: extend iconset

* fix: remove anys

Co-authored-by: VWSCoronaDashboard24 <[email protected]>

* Feature/cor 959/dynamic icons (#4361)

* Get an icon dynamically

* feat: make dynamic icon work including typings

* fix: code cleanup

* feat: extend type info in icon build

* feat: add eye icon

Co-authored-by: VWSCoronaDashboard18 <[email protected]>
Co-authored-by: VWSCoronaDashboard24 <[email protected]>

* COR-990 the topical page component (#4363)

* the topical page component

* Restore old topical-tile component

* Fixed data input instead of static mockup

* fixed width and height

* set right padding for kpiIcon

* Update packages/app/src/domain/topical/components/topical-tile/index.ts

Thanks for noticing

Co-authored-by: MN <[email protected]>

* Update packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx

Nice, I bet it's from some old mockup.

Co-authored-by: MN <[email protected]>

Co-authored-by: MN <[email protected]>

* COR-993 measurement tile (#4364)

* New measurement tile because of rebase issues

* Fixed data input instead of static mokup

* feat: redirect to vr/gm page instead of topical vr/gm

* fix: redirect topical GM/VR pages

* fix: layout of searchbox and footer

* Update eye.svg and generate script after rebase (on develop with the icon PR)

* Fix typing issues on icon cahnges

* Feature/cor 959/subjects-list (#4354)

* Feature/cor 959/page header (#4356)

* add topical-header

* Updated schema for index of dynamicDescription

* Combining components and setting the right spaces

Co-authored-by: VWSCoronaDashboard21 <[email protected]>
Co-authored-by: VWSCoronaDashboard18 <[email protected]>

* remove access import

* Added currentColor to all icons (#4370)

* added theme header

* Fixing issues.

* Remove replaced Component props

* all topical tile hover and link

* (responsive) spacing

* updated trend color, Updated Topical Footer, use consistant link and hover color, add alignment to measurement tile

* Fix hover state bug in link on topical tile

* icon size and alignment

* finetuning and set non link tile

* Feature/cor 959/dynamic icons (#4361)

* Get an icon dynamically

* feat: make dynamic icon work including typings

* fix: code cleanup

* feat: extend type info in icon build

* feat: add eye icon

Co-authored-by: VWSCoronaDashboard18 <[email protected]>
Co-authored-by: VWSCoronaDashboard24 <[email protected]>

* COR-990 the topical page component (#4363)

* the topical page component

* Restore old topical-tile component

* Fixed data input instead of static mockup

* fixed width and height

* set right padding for kpiIcon

* Update packages/app/src/domain/topical/components/topical-tile/index.ts

Thanks for noticing

Co-authored-by: MN <[email protected]>

* Update packages/app/src/domain/topical/components/topical-tile/topical-tile.tsx

Nice, I bet it's from some old mockup.

Co-authored-by: MN <[email protected]>

Co-authored-by: MN <[email protected]>

* link fix

* rounded corner for icon square, spacing finetuning

* Rename menu's from 'actueel' to 'maatregelen'

* update variants icon

* added menu name

* update uppercase typo name

* removed old topical page and cleaned up after

* updated grid and removed icon from other branch

* Rename menu's from 'maatregelen' to 'samenvatting'

* Generate icons.md + add IntensiveCareOpnames icon (#4374)

* feat: add new intensive-care-opnames icon and icon documentation

* feat: add documentation about all icons

* feat: add support for new IntensiveCareOpnames icon in schemas

* fix: svg configuration for IntensiveCareOpnames

* fix: use correct filename for icon

* fix: use white bg for icons in icons.md

* fix: use white bg for icons in icons.md

Co-authored-by: VWSCoronaDashboard24 <[email protected]>

* bring removed components back for typechecking

* Add menu name change to mutations file

* fix: make icons visible on safari

* reset grid settings, nice word wrap, bring icon's back

* Measurement tile safari fix

* Restore minWidth

* navigation icon size fix

Co-authored-by: MN <[email protected]>
Co-authored-by: VWSCoronaDashboard24 <[email protected]>
Co-authored-by: AT <[email protected]>
Co-authored-by: VWSCoronaDashboard21 <[email protected]>
(cherry picked from commit c7fff4f3f99b6d9ff66a93d0c0a7256bb8245b6d)

# Conflicts:
#	packages/app/src/pages/actueel/gemeente/[code].tsx
#	packages/app/src/pages/actueel/gemeente/index.tsx
#	packages/app/src/pages/actueel/veiligheidsregio/[code].tsx
#	packages/app/src/pages/actueel/veiligheidsregio/index.tsx
#	packages/app/src/pages/index.tsx
#	packages/icons/src/svg/chevron_right.svg

* Bring back topical icons on safari (#4381)

* fix: make notification always black (#4384)

Co-authored-by: VWSCoronaDashboard24 <[email protected]>

* removed anchor tag (#4385)

* fix: use correct icon for positive tests page

* fix: remove unused import

* fix: use correct icon for all positive tests page and sidebar

* feat(sidebar): Add hover state to sidebar items (#4393)

* Revert "feature(choropleth): sort tab-order by display name (#4377)"

This reverts commit 077208fa16949dc2051e819f26b9f141c384664e.

* fix: move back sanity key

* Merge branch 'feature/cor-937-consistent-links' of github.com:minvws/nl-covid19-data-dashboard into feature/cor-937-consistent-links

* fix merge conflict combo box

* New corona variant

* Update schema for new variant

* fix: add support for BA_4_6 (#4431)

Co-authored-by: VWSCoronaDashboard24 <[email protected]>

* Updated types

* Revert sanity button

* Revert "Revert sanity button"

This reverts commit fe530cf6b4bd5cb178b507bed5d70e20d502c0f5.

* added new key to coverage tables

* release: 2.59.0

* feat(release): updated TrendIconWithIntensity to have an aria-label;

* chore(release-sync): reverted or removed certain unnecessary changes;

* task(sync): removed sorter from combo-box component; updated chunk optimisation to named rather than size;

Co-authored-by: R <[email protected]>
Co-authored-by: VWSCoronaDashboard1 <[email protected]>
Co-authored-by: VWSCoronaDashboard14 <[email protected]>
Co-authored-by: N <[email protected]>
Co-authored-by: VWSCoronaDashboard16 <[email protected]>
Co-authored-by: VWSCoronaDashboard7 <[email protected]>
Co-authored-by: HO <[email protected]>
Co-authored-by: VWSCoronaDashboard18 <[email protected]>
Co-authored-by: J <[email protected]>
Co-authored-by: VWSCoronaDashboard19 <[email protected]>
Co-authored-by: VWSCoronaDashboard22 <[email protected]>
Co-authored-by: Hasan Ozaynaci <[email protected]_not_set.invalid>
Co-authored-by: VWSCoronaDashboard22 <[email protected]>
Co-authored-by: VWSCoronaDashboard24 <[email protected]>
Co-authored-by: MN <[email protected]>
Co-authored-by: “MA” <“”>
Co-authored-by: VWSCoronaDashboard20 <[email protected]>
Co-authored-by: VWSCoronaDashboard25 <[email protected]>
Co-authored-by: VWSCoronaDashboard25 <[email protected]>
Co-authored-by: VWSCoronaDashboard21 <[email protected]>
Co-authored-by: VWSCoronaDashboard26 <[email protected]>
Co-authored-by: AT <[email protected]>
  • Loading branch information
22 people authored Dec 19, 2022
1 parent ee8ae1f commit 1d6d002
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 74 deletions.
19 changes: 4 additions & 15 deletions packages/app/next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,7 @@ const LodashModuleReplacementPlugin = require('lodash-webpack-plugin');
const withBundleAnalyzer = require('@next/bundle-analyzer')({
enabled: process.env.ANALYZE === 'true',
});
const withTranspileModules = require('next-transpile-modules')([
'd3-geo',
'd3-array',
'globby',
'internmap',
]);
const withTranspileModules = require('next-transpile-modules')(['d3-geo', 'd3-array', 'globby', 'internmap']);
const path = require('path');
const { DuplicatesPlugin } = require('inspectpack/plugin');

Expand Down Expand Up @@ -59,7 +54,7 @@ const nextConfig = {
productionBrowserSourceMaps: true,

webpack(config) {
config.optimization.chunkIds = 'size';
config.optimization.chunkIds = 'named';
config.module.rules.push({
test: /\.svg$/,
type: 'asset',
Expand All @@ -83,15 +78,9 @@ const nextConfig = {
['d3-array', '../../node_modules/d3-array'],
['d3-color', '../../node_modules/d3-scale/node_modules/d3-color'],
['d3-geo', '../../node_modules/d3-geo'],
[
'd3-interpolate',
'../../node_modules/d3-scale/node_modules/d3-interpolate',
],
['d3-interpolate', '../../node_modules/d3-scale/node_modules/d3-interpolate'],
['react-is', '../../node_modules/react-is'],
[
'unist-util-visit-parents',
'../../node_modules/unist-util-visit-parents',
],
['unist-util-visit-parents', '../../node_modules/unist-util-visit-parents'],
];

duplicatePackageResolves.forEach(([packageName, resolvedPath]) => {
Expand Down
52 changes: 10 additions & 42 deletions packages/app/src/components/combo-box/combo-box.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
import {
Combobox,
ComboboxInput,
ComboboxList,
ComboboxOption,
ComboboxPopover,
} from '@reach/combobox';
import { Combobox, ComboboxInput, ComboboxList, ComboboxOption, ComboboxPopover } from '@reach/combobox';
import css from '@styled-system/css';
import { matchSorter } from 'match-sorter';
import { useRouter } from 'next/router';
Expand All @@ -26,7 +20,6 @@ type TProps<Option extends TOption> = {
options: Option[];
placeholder: string;
onSelect: (option: Option) => void;
sorter?: (a: Option, b: Option) => number;
selectedOption?: Option;
};

Expand Down Expand Up @@ -69,25 +62,18 @@ export const ComboBox = <Option extends TOption>(props: TProps<Option>) => {
if (event.isDefaultPrevented() || !container) return;

window.requestAnimationFrame(() => {
const element: HTMLInputElement | null = container.querySelector(
'[aria-selected=true]'
);
const element: HTMLInputElement | null = container.querySelector('[aria-selected=true]');
if (element) {
const top = element.offsetTop - container.scrollTop; // Calculate the space between active element and top of the list
const bottom =
container.scrollTop +
container.clientHeight -
(element.offsetTop + element.clientHeight); // Calculate the space between active element and bottom of the list
const bottom = container.scrollTop + container.clientHeight - (element.offsetTop + element.clientHeight); // Calculate the space between active element and bottom of the list

if (bottom < 0) container.scrollTop -= bottom;
if (top < 0) container.scrollTop += top;
}
});
};

const handleInputChange = (
event: React.ChangeEvent<HTMLInputElement>
): void => {
const handleInputChange = (event: React.ChangeEvent<HTMLInputElement>): void => {
setInputValue(event.target.value);
};

Expand All @@ -96,14 +82,9 @@ export const ComboBox = <Option extends TOption>(props: TProps<Option>) => {
return;
}

const option = options.find(
(option) => option.name === name || option.displayName === name
);
const option = options.find((option) => option.name === name || option.displayName === name);

assert(
option,
`[${ComboBox.name}:${handleSelect.name}] Failed to find option for name ${name}`
);
assert(option, `[${ComboBox.name}:${handleSelect.name}] Failed to find option for name ${name}`);

props.onSelect(option);

Expand All @@ -124,21 +105,12 @@ export const ComboBox = <Option extends TOption>(props: TProps<Option>) => {
return (
<Box role="search" css={css({ '[data-reach-combobox]': { px: 3, py: 4 } })}>
<Combobox openOnFocus onSelect={handleSelect}>
<ComboboxInput
ref={inputRef}
onChange={handleInputChange}
onKeyDown={handleKeyDown}
placeholder={placeholder}
/>
<ComboboxInput ref={inputRef} onChange={handleInputChange} onKeyDown={handleKeyDown} placeholder={placeholder} />
<ComboboxPopover>
{results.length > 0 ? (
<ComboboxList ref={containerRef}>
{results.map((option, index) => (
<StyledComboboxOption
key={`${index}-${option.name}`}
value={option.displayName || option.name}
$isSelectedOption={selectedOption?.name === option.name}
/>
<StyledComboboxOption key={`${index}-${option.name}`} value={option.displayName || option.name} $isSelectedOption={selectedOption?.name === option.name} />
))}
</ComboboxList>
) : (
Expand All @@ -151,10 +123,7 @@ export const ComboBox = <Option extends TOption>(props: TProps<Option>) => {
);
};

const useSearchedAndSortedOptions = <Option extends TOption>(
term: string,
options: Option[]
): Option[] => {
const useSearchedAndSortedOptions = <Option extends TOption>(term: string, options: Option[]): Option[] => {
const throttledTerm = useThrottle(term, 100);

return useMemo(
Expand All @@ -169,8 +138,7 @@ const useSearchedAndSortedOptions = <Option extends TOption>(
const StyledComboboxOption = styled(ComboboxOption)<{
$isSelectedOption: boolean; // Prevent prop to be rendered to the DOM by using Transient prop
}>`
border-left: ${(x) =>
x.$isSelectedOption ? `5px solid ${x.theme.colors.blue8}` : '0'};
border-left: ${(x) => (x.$isSelectedOption ? `5px solid ${x.theme.colors.blue8}` : '0')};
span:first-child {
display: inline-block;
Expand Down
10 changes: 1 addition & 9 deletions packages/app/src/domain/layout/components/gm-combo-box.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,14 @@ export function GmComboBox(props: GmComboBoxProps) {
const { commonTexts } = useIntl();
const reverseRouter = useReverseRouter();
const router = useRouter();
const expStr = new RegExp(["'s-"].join(' | '), 'g');

return (
<ComboBox
placeholder={commonTexts.common.zoekveld_placeholder_gemeente}
options={gmData}
onSelect={({ gemcode }) => {
router.push(
typeof getLink === 'function'
? getLink(gemcode)
: reverseRouter.gm.index(gemcode)
);
router.push(typeof getLink === 'function' ? getLink(gemcode) : reverseRouter.gm.index(gemcode));
}}
sorter={(a, b) =>
a.name.replace(expStr, '').localeCompare(b.name.replace(expStr, ''))
}
selectedOption={gmData.find((gm) => gm.gemcode === selectedGmCode)}
/>
);
Expand Down
9 changes: 1 addition & 8 deletions packages/app/src/domain/layout/components/vr-combo-box.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,7 @@ export function VrComboBox(props: VrComboBoxProps) {
<ComboBox
placeholder={commonTexts.common.zoekveld_placeholder_regio}
options={vrData}
onSelect={(region) =>
router.push(
typeof getLink === 'function'
? getLink(region.code)
: reverseRouter.vr.index(region.code)
)
}
sorter={(a, b) => a.name.localeCompare(b.name)}
onSelect={(region) => router.push(typeof getLink === 'function' ? getLink(region.code) : reverseRouter.vr.index(region.code))}
selectedOption={vrData.find((vr) => vr.code === selectedVrCode)}
/>
);
Expand Down

0 comments on commit 1d6d002

Please sign in to comment.