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

Commit

Permalink
Feature/cor 1866 sync master to dev (#4960)
Browse files Browse the repository at this point in the history
* 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 76ef654)

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

* Fix typescript error

* Solve PR feedback

* Squashed commit of the following:

commit 77ff781
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 f5bd004
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 6fcf9b4
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 4eeff20
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 10d9706
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 4f4abc9
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 38ec557
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 cb44e92
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 26a07c7
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 64861ee
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 1ab4c1b
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 2605658
Author: VWSCoronaDashboard22 <[email protected]>
Date:   Thu May 19 15:05:53 2022 +0200

    Added string year to age group (#4259)

commit f506760
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 4d02ed5
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 2fd679b
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 ed58ee4
Author: VWSCoronaDashboard22 <[email protected]>
Date:   Wed May 18 12:37:29 2022 +0200

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

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

    feat: upgrade version sanity cli (#4251)

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

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

commit 20f9d6a
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 f34638f
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 390905b
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 50fc1e8
Author: HO <[email protected]>
Date:   Tue May 17 09:54:11 2022 +0200

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

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

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

commit 83dff18
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 6b825c2
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 e6b8ae7
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 77ff781
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 f5bd004
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 6fcf9b4
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 4eeff20
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 10d9706
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 4f4abc9
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 38ec557
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 cb44e92
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 26a07c7
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 64861ee
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 1ab4c1b
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 2605658
Author: VWSCoronaDashboard22 <[email protected]>
Date:   Thu May 19 15:05:53 2022 +0200

    Added string year to age group (#4259)

commit f506760
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 4d02ed5
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 2fd679b
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 ed58ee4
Author: VWSCoronaDashboard22 <[email protected]>
Date:   Wed May 18 12:37:29 2022 +0200

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

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

    feat: upgrade version sanity cli (#4251)

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

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

commit 20f9d6a
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 f34638f
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 390905b
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 50fc1e8
Author: HO <[email protected]>
Date:   Tue May 17 09:54:11 2022 +0200

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

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

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

commit 83dff18
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 097197c)

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

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

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

(cherry picked from commit ab50b7d)

* 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 0c0083d 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 3b3ee5b)

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

# 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 077208f.

* 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 fe530cf.

* added new key to coverage tables

* release: 2.59.0

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

* fix: Apply a new width to the warning. (#4593)

* bugfix/COR-1348-summary-page-broken-article-links (#4594)

* bugfix(summary-page): removed outdated ContentTeaser and HighlightsTile components; added new TopicalArticleTeaser component (which is a stripped down version of ContentTeaser); updated TopicalArticleList component to refer to new TopicalArticleTeaser component;

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

* fix: wrong warning type

* fix: added keys manually

* fix: show based on the Gm and not on Shared (#4627)

(cherry picked from commit 55c7039)

* hotfix(performance): added compression false flag to Next.js config as to prevent duplicate compression strategies; (#4652)

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

* fix(sanity): added new Sanity keys for breaking changes; updated key-mutations; (#4655)

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

* Feature/cor 1335 automate sanity topical dates (#4659)

* feat: setup date config logic hook

* feat: Add date logic hook to topical page

* feat: optimise find date range script

* test: update testing script

* test: updated test file

* feat: Add explanation to the math done. For reproducible code and understanding of whats going on.

* fix: add explanation to the math done in the function

* feat: added topical date config

* feat: Added fields in sanity

* feat: update sanity structure

* feat: add toggle

* feat: update typing and added document to sanity.

* feat: applying pair programming feedback

* feat: sanity tile date field

* fix: solved issues on custom sanity component.

* fix: also accept 0 as the day value.

* fix: inconsistent rendering

* fix: change iso week to just week

* Fix: remove file

* fix: merge conflict

* fix: apply descriptions based on input by communication

* fix: Update formatting

* fix: Updating dutch

* fix: PR feedback

* fix: PR feedback

* fix PR feedback, dutch grammar

* fix: PR feedback fix apply typing.

* Fix: PR feedback

(cherry picked from commit 016efc3)

# Conflicts:
#	packages/app/src/queries/query-types.ts
#	packages/cms/src/schemas/topical/theme-tile.ts

* bugfix: Redirect 3 unpublished articles to all articles page (#4665)

Co-authored-by: VWSCoronaDashboard28 <[email protected]>
(cherry picked from commit 6bd2174)

* bugfix(images): temporary revert to basic img element to see if that fixes anything; (#4660)

Co-authored-by: VWSCoronaDashboard26 <[email protected]>
(cherry picked from commit 730f510)

* feat: Remove more info section from NL behaviour page. (#4661)

Co-authored-by: VWSCoronaDashboard28 <[email protected]>
(cherry picked from commit 27db2ab)

* Revert "bugfix(images): temporary revert to basic img element to see if that fixes anything; (#4660)" (#4663)

This reverts commit 730f510.

(cherry picked from commit 78f1330)

* Feature/COR-1392-text-gm-positive-tests-is-in-bold-should-be-normal-text (#4662)

* feat: Make only variable bold and convert to markdown component.

* feat: Delete old keys

* feat: Revert addition of new keys.

* feat: One more conversion to markdown.

* feat: removed key mutations.

* feat: Delete unused keys, remove barrel file imports

* feat: Remove mutations, again.

---------

Co-authored-by: VWSCoronaDashboard28 <[email protected]>
(cherry picked from commit a799daf)

* chore(deps): bump ua-parser-js from 0.7.31 to 0.7.33 (#4631)

Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js) from 0.7.31 to 0.7.33.
- [Release notes](https://github.com/faisalman/ua-parser-js/releases)
- [Changelog](https://github.com/faisalman/ua-parser-js/blob/master/changelog.md)
- [Commits](faisalman/ua-parser-js@0.7.31...0.7.33)

---
updated-dependencies:
- dependency-name: ua-parser-js
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit aec0877)

* chore(deps): bump simple-git from 3.15.1 to 3.16.0 (#4629)

Bumps [simple-git](https://github.com/steveukx/git-js/tree/HEAD/simple-git) from 3.15.1 to 3.16.0.
- [Release notes](https://github.com/steveukx/git-js/releases)
- [Changelog](https://github.com/steveukx/git-js/blob/main/simple-git/CHANGELOG.md)
- [Commits](https://github.com/steveukx/git-js/commits/[email protected]/simple-git)

---
updated-dependencies:
- dependency-name: simple-git
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit d453d00)

* fix: description and republishing (#4671)

(cherry picked from commit 63515ff)

* feat: sync after release (#4674)

Co-authored-by: VWSCoronaDashboard27 <[email protected]>
(cherry picked from commit 45bbdd6)

* fix: solve pipeline error

(cherry picked from commit b169447)

* feat: sync after release (#4674)

Co-authored-by: VWSCoronaDashboard27 <[email protected]>
(cherry picked from commit 45bbdd6)
(cherry picked from commit d1674c8)
(cherry picked from commit 93752ee)

* Chore/COR 1431 remove recommended advices (#4681)

* chore: remove measure page

* chore: Add documentation, redirect to topical, and remove sanity keys

* fix: Typo - PR feedback

(cherry picked from commit f1d10ce)
(cherry picked from commit 48558e3)

* feature/COR-1455-remove-topical-page-measure-theme-components (#4682)

* feat(topical-page): removed measure themes section from topical page; removed all measure theme component schemas from Sanity; updated topical page groq query and query types; updated theme schema to mark tiles and other properties as not-required, allowing for 'simple' themes without tiles or links; reverted removal of sizes export from theme, as this resulted in breaking changes;

---------

Co-authored-by: VWSCoronaDashboard26 <[email protected]>
(cherry picked from commit 7d781b4)
(cherry picked from commit 3aa6757)

* Fix: remove redirects (#4685)

(cherry picked from commit b773fd8)

* bugfix(positive-tests): added self_test_overall as metric to metrics array; (#4730)

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

* Release/2.73.1 (#4765)

* feature/COR-1521-vulnerable-groups-page-optimizations-typefix (#4757)

* Removed the AgeDataType and ParsedCoverageData type based on PR feedback

* made TileData not exported anymore

---------

Co-authored-by: VWSCoronaDashboard21 <[email protected]>
(cherry picked from commit d1dcbf7)

* Bugfix/cor 1627 restore bug from cor 1521 (#4764)

* fix: solve inconsistent usage of KpiTile

* fix: other pages with percentages

* fix: remove develop check

* fix: styling

* fix: PR feedback

* fix: component name

(cherry picked from commit 41e9093)

---------

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

* Release/2.76.1 (#4784)

* feat(data-explained-redesign): Adjusts rich text alignment, removes description component. (#4783)

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

* Sanity-updates-for-COR-1618-1620-1622-1624 (#4775)

* chore: sanity update for COR-1624

* chore: Sanity update for COR-1622

* chore: Sanity update for COR-1620

* chore: Sanity update for COR-1618

* fix: incorrect CSV file

* fix: PR feedback keys

---------

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

* COR-1696 - fix birtyear ranges in age group dropdown

* feat(COR-1772): Added missing date range for second KPI

* Bugfix/cor 1769 variants table and graph 2 (#4870)

* fix(COR-1769): Removed keys from schemas

* fix(COR-1769): Removed historical significance key

* fix(COR-1769): Update getter functions

* fix(COR-1769): Remove unused code from variants chart

* fix(COR-1769): Re-add destructuring based on suggestion

---------

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

* Hotfix/cor 1769 other variants on top (#4876)

* fix(COR-1769): Put other_variants at bottom of table

* fix(COR-1769): Add comment

* fix(COR-1769): Clean up code

* fix(COR-1769): Remove unused filter

---------

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

* fix(COR-1809): Remove unused variable replacement (#4879) (#4893)

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

* fix: corona thermometer mobile (#4899)

Co-authored-by: VWSCoronaDashboard29 <B>

* fix: Set node version number to 18.18.2 (#4915)

Co-authored-by: VWSCoronaDashboard29 <B>

* feat(COR-1896): Remove campaign banner and sanity keys from vaccine page (#4956)

* feat(COR-1896): Remove campaign banner and sanity keys from vaccine page (#4956)

* feature/fix ts node esm+upgrade sharp (#4952)

* change to node 18

* fix ts-node script with esm

* update sharp to 0.32.6

* format node-version

* remove duplication

---------

Co-authored-by: J <[email protected]>
Co-authored-by: MN <[email protected]>
Co-authored-by: VWSCoronaDashboard24 <[email protected]>
Co-authored-by: HO <[email protected]>
Co-authored-by: VWSCoronaDashboard25 <[email protected]>
Co-authored-by: VWSCoronaDashboard25 <[email protected]>
Co-authored-by: VWSCoronaDashboard22 <[email protected]>
Co-authored-by: VWSCoronaDashboard22 <[email protected]>
Co-authored-by: L R <[email protected]>
Co-authored-by: VWSCoronaDashboard26 <[email protected]>
Co-authored-by: VWSCoronaDashboard21 <[email protected]>
Co-authored-by: AT <[email protected]>
Co-authored-by: VWSCoronaDashboard19 <[email protected]>
Co-authored-by: VWSCoronaDashboard27 <[email protected]>
Co-authored-by: VWSCoronaDashboard27 <[email protected]>
Co-authored-by: VWSCoronaDashboard28 <[email protected]>
Co-authored-by: AP <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Corneel Eijsbouts <[email protected]>
Co-authored-by: VWSCoronaDashboard29 <[email protected]>
Co-authored-by: VWSCoronaDashboard29 <[email protected]>
Co-authored-by: VWSCoronaDashboard30 <[email protected]>
Co-authored-by: M <[email protected]>
Co-authored-by: VWSCoronaDashboard29 <[email protected]>
Co-authored-by: VWSCoronaDashboard29 <B>
Co-authored-by: VWSCoronaDashboard29 <[email protected]>
  • Loading branch information
26 people authored Jan 8, 2024
1 parent 104f4dd commit cde7c40
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion packages/app/next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ const nextConfig = {
productionBrowserSourceMaps: true,

webpack(config) {
config.optimization.chunkIds = 'named';
config.optimization.chunkIds = 'size';
config.module.rules.push({
test: /\.svg$/,
type: 'asset',
Expand Down
1 change: 1 addition & 0 deletions packages/app/src/components/combo-box/combo-box.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ type TProps<Option extends TOption> = {
options: Option[];
placeholder: string;
onSelect: (option: Option) => void;
sorter?: (a: Option, b: Option) => number;
selectedOption?: Option;
shouldFocusInput?: boolean;
};
Expand Down
2 changes: 2 additions & 0 deletions packages/app/src/domain/layout/components/gm-combo-box.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export function GmComboBox(props: GmComboBoxProps) {
const { commonTexts } = useIntl();
const reverseRouter = useReverseRouter();
const router = useRouter();
const expStr = new RegExp(["'s-"].join(' | '), 'g');

return (
<ComboBox
Expand All @@ -24,6 +25,7 @@ export function GmComboBox(props: GmComboBoxProps) {
onSelect={({ 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)}
shouldFocusInput={shouldFocusInput}
/>
Expand Down

0 comments on commit cde7c40

Please sign in to comment.