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

bugfix/COR-1705_testen-change-to-infectieradar-page #4850

Merged
merged 8 commits into from
Aug 28, 2023
Merged

bugfix/COR-1705_testen-change-to-infectieradar-page #4850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7550de2
fix(COR-1705): potential fix for lokalize issue
VWSCoronaDashboard30 Aug 28, 2023
dd334e8
fix(COR-1705): potential fix for lokalize issue
VWSCoronaDashboard30 Aug 28, 2023
16a092b
bugfix(COR-1705): yml sync-sanity-lokalize changes
VWSCoronaDashboard30 Aug 28, 2023
4aaf13a
bugfix(COR-1705): new batch of lokalize keys
VWSCoronaDashboard30 Aug 28, 2023
5ebb448
bugfix(COR-1705): fixed typecheck references
VWSCoronaDashboard30 Aug 28, 2023
d97ed48
bugfix(COR-1705): last batch of keys
VWSCoronaDashboard30 Aug 28, 2023
03fcb5e
bugfix(COR-1705): Removed extra branch-check for sync-sanity-lokalize…
VWSCoronaDashboard30 Aug 28, 2023
c4ec470
bugfix(COR-1705): PR merge conflict resolution
VWSCoronaDashboard30 Aug 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions packages/app/src/domain/infection_radar/infection-radar-per-age-group.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ interface InfectionRadarSymptomsPerAgeGroup {
values: NlInfectionradarSymptomsTrendPerAgeGroupWeeklyValue[];
timeframe: TimeframeOption;
timelineEvents?: TimelineEventConfig[];
text: SiteText['pages']['infection_radar_page']['nl'];
text: SiteText['pages']['infectie_radar_page']['nl'];
}

export function InfectionRadarSymptomsPerAgeGroup({ values, timeframe, accessibility, timelineEvents, text }: InfectionRadarSymptomsPerAgeGroup) {
Expand All @@ -37,7 +37,10 @@ export function InfectionRadarSymptomsPerAgeGroup({ values, timeframe, accessibi

/* Enrich config with dynamic data / locale */
const seriesConfig: LineSeriesDefinition<NlInfectionradarSymptomsTrendPerAgeGroupWeeklyValue>[] = BASE_SERIES_CONFIG.map((baseAgeGroup) => {
const label = baseAgeGroup.metricProperty in text.infected_per_age_group.legend ? text.infected_per_age_group.legend[baseAgeGroup.metricProperty] : baseAgeGroup.metricProperty;
const label =
baseAgeGroup.metricProperty in text.infection_radar_infected_per_age_group.legend
? text.infection_radar_infected_per_age_group.legend[baseAgeGroup.metricProperty]
: baseAgeGroup.metricProperty;

const ariaLabel = replaceVariablesInText(commonTexts.aria_labels.age_old, {
age: label,
Expand Down Expand Up @@ -68,7 +71,13 @@ export function InfectionRadarSymptomsPerAgeGroup({ values, timeframe, accessibi

return (
<ErrorBoundary>
<InteractiveLegend helpText={text.infected_per_age_group.legend_help_text} selectOptions={interactiveLegendOptions} selection={list} onToggleItem={toggle} onReset={clear} />
<InteractiveLegend
helpText={text.infection_radar_infected_per_age_group.legend_help_text}
selectOptions={interactiveLegendOptions}
selection={list}
onToggleItem={toggle}
onReset={clear}
/>
<Spacer marginBottom={space[2]} />
<TimeSeriesChart
forceLegend
Expand All @@ -80,13 +89,13 @@ export function InfectionRadarSymptomsPerAgeGroup({ values, timeframe, accessibi
formatTooltip={(data) => <TooltipSeriesList data={data} hasTwoColumns={hasTwoColumns} />}
dataOptions={{
isPercentage: true,
valueAnnotation: text.infected_per_age_group.value_annotation,
valueAnnotation: text.infection_radar_infected_per_age_group.value_annotation,
timespanAnnotations: [
{
start: underReportedDateStart,
end: Infinity,
label: text.infected_per_age_group.line_chart_legend_inaccurate_label,
shortLabel: text.infected_per_age_group.tooltip_labels.inaccurate,
label: text.infection_radar_infected_per_age_group.line_chart_legend_inaccurate_label,
shortLabel: text.infection_radar_infected_per_age_group.tooltip_labels.inaccurate,
},
],
timelineEvents,
Expand Down
2 changes: 1 addition & 1 deletion packages/app/src/pages/landelijk/infectieradar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const pageMetrics = ['self_test_overall', 'infection_radar_symptoms_per_age_grou

const selectLokalizeTexts = (siteText: SiteText) => ({
metadataTexts: siteText.pages.topical_page.nl.nationaal_metadata,
textNl: siteText.pages.infection_radar_page.nl,
textNl: siteText.pages.infectie_radar_page.nl,
});

type LokalizeTexts = ReturnType<typeof selectLokalizeTexts>;
Expand Down
88 changes: 88 additions & 0 deletions packages/cms/src/lokalize/key-mutations.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,3 +120,91 @@ timestamp,action,key,document_id,move_to
2023-08-25T09:48:12.615Z,add,pages.infection_radar_page.nl.sources.self_test.href,eMbA161XQE47KFPnazYrkV,__
2023-08-25T09:48:13.627Z,add,pages.infection_radar_page.nl.sources.self_test.text,UeL7Fz3Aoju4f93F3ItDiS,__
2023-08-28T09:22:02.230Z,add,pages.infection_radar_page.nl.title,NMSA8CUHhzxbsw88WXalQv,__
2023-08-28T09:34:34.088Z,add,pages.infectie_radar_page.nl.title,NMSA8CUHhzxbsw88WXaoeO,__
2023-08-28T09:46:17.636Z,add,pages.infectie_radar_page.nl.chart_infection_radar_age_groups.description,uHFfJYJkKtXC1Rsty6jOAv,__
2023-08-28T09:46:18.609Z,add,pages.infectie_radar_page.nl.chart_infection_radar_age_groups.source.rivm.download,uHFfJYJkKtXC1Rsty6jOQP,__
2023-08-28T09:46:19.632Z,add,pages.infectie_radar_page.nl.chart_infection_radar_age_groups.source.rivm.href,LWiFeXKdw2GKCaPW8KhVdo,__
2023-08-28T09:46:20.626Z,add,pages.infectie_radar_page.nl.chart_infection_radar_age_groups.source.rivm.text,NMSA8CUHhzxbsw88WXas1T,__
2023-08-28T09:46:21.704Z,add,pages.infectie_radar_page.nl.chart_infection_radar_age_groups.title,UeL7Fz3Aoju4f93F3Kfyk0,__
2023-08-28T09:46:22.689Z,add,pages.infectie_radar_page.nl.chart_self_tests.description,NMSA8CUHhzxbsw88WXas8g,__
2023-08-28T09:46:23.694Z,add,pages.infectie_radar_page.nl.chart_self_tests.title,eMbA161XQE47KFPnb2XHM3,__
2023-08-28T09:46:24.740Z,add,pages.infectie_radar_page.nl.chart_self_tests.tooltip_label,UeL7Fz3Aoju4f93F3KfyvE,__
2023-08-28T09:46:25.769Z,add,pages.infectie_radar_page.nl.dates,LWiFeXKdw2GKCaPW8KhVow,__
2023-08-28T09:46:26.783Z,add,pages.infectie_radar_page.nl.description,eMbA161XQE47KFPnb2XHd9,__
2023-08-28T09:46:27.810Z,add,pages.infectie_radar_page.nl.infected_per_age_group.legend.percentage_0_24,eMbA161XQE47KFPnb2XHpy,__
2023-08-28T09:46:28.835Z,add,pages.infectie_radar_page.nl.infected_per_age_group.legend.percentage_25_39,eMbA161XQE47KFPnb2XI2n,__
2023-08-28T09:46:29.845Z,add,pages.infectie_radar_page.nl.infected_per_age_group.legend.percentage_40_49,UeL7Fz3Aoju4f93F3KfzC4,__
2023-08-28T09:46:30.868Z,add,pages.infectie_radar_page.nl.infected_per_age_group.legend.percentage_50_59,NMSA8CUHhzxbsw88WXasFt,__
2023-08-28T09:46:31.884Z,add,pages.infectie_radar_page.nl.infected_per_age_group.legend.percentage_60_69,UeL7Fz3Aoju4f93F3KfzKU,__
2023-08-28T09:46:32.913Z,add,pages.infectie_radar_page.nl.infected_per_age_group.legend.percentage_70_plus,NMSA8CUHhzxbsw88WXasN6,__
2023-08-28T09:46:33.934Z,add,pages.infectie_radar_page.nl.infected_per_age_group.legend.percentage_average,LWiFeXKdw2GKCaPW8KhWBC,__
2023-08-28T09:46:34.954Z,add,pages.infectie_radar_page.nl.infected_per_age_group.legend_help_text,eMbA161XQE47KFPnb2XIfG,__
2023-08-28T09:46:36.030Z,add,pages.infectie_radar_page.nl.infected_per_age_group.line_chart_legend_inaccurate_label,wJsqoXQkxXB7L62Auea2cC,__
2023-08-28T09:46:36.997Z,add,pages.infectie_radar_page.nl.infected_per_age_group.tooltip_labels.inaccurate,LWiFeXKdw2GKCaPW8KhWMK,__
2023-08-28T09:46:38.015Z,add,pages.infectie_radar_page.nl.infected_per_age_group.value_annotation,wJsqoXQkxXB7L62Auea2n2,__
2023-08-28T09:46:39.034Z,add,pages.infectie_radar_page.nl.metadata.description,uHFfJYJkKtXC1Rsty6jPAr,__
2023-08-28T09:46:40.053Z,add,pages.infectie_radar_page.nl.metadata.title,eMbA161XQE47KFPnb2XIs5,__
2023-08-28T09:46:41.072Z,add,pages.infectie_radar_page.nl.reference.href,NMSA8CUHhzxbsw88WXasUJ,__
2023-08-28T09:46:42.098Z,add,pages.infectie_radar_page.nl.sources.rivm.aria_text,uHFfJYJkKtXC1Rsty6jPQL,__
2023-08-28T09:46:43.105Z,add,pages.infectie_radar_page.nl.sources.rivm.download,uHFfJYJkKtXC1Rsty6jPfp,__
2023-08-28T09:46:44.140Z,add,pages.infectie_radar_page.nl.sources.rivm.href,wJsqoXQkxXB7L62Auea2xs,__
2023-08-28T09:46:45.153Z,add,pages.infectie_radar_page.nl.sources.rivm.text,eMbA161XQE47KFPnb2XJ9B,__
2023-08-28T09:46:46.170Z,add,pages.infectie_radar_page.nl.sources.self_test.aria_text,wJsqoXQkxXB7L62Auea38i,__
2023-08-28T09:46:47.189Z,add,pages.infectie_radar_page.nl.sources.self_test.download,eMbA161XQE47KFPnb2XJM0,__
2023-08-28T09:46:48.739Z,add,pages.infectie_radar_page.nl.sources.self_test.href,uHFfJYJkKtXC1Rsty6jPvJ,__
2023-08-28T09:46:49.687Z,add,pages.infectie_radar_page.nl.sources.self_test.text,wJsqoXQkxXB7L62Auea3JY,__
2023-08-28T09:46:49.687Z,delete,pages.infection_radar_page.nl.chart_infection_radar_age_groups.description,wJsqoXQkxXB7L62AucKIES,__
2023-08-28T09:46:49.687Z,delete,pages.infection_radar_page.nl.chart_infection_radar_age_groups.source.rivm.download,uHFfJYJkKtXC1Rsty3F8yT,__
2023-08-28T09:46:49.688Z,delete,pages.infection_radar_page.nl.chart_infection_radar_age_groups.source.rivm.href,eMbA161XQE47KFPnazYbY4,__
2023-08-28T09:46:49.688Z,delete,pages.infection_radar_page.nl.chart_infection_radar_age_groups.source.rivm.text,NMSA8CUHhzxbsw88WW5WCb,__
2023-08-28T09:46:49.688Z,delete,pages.infection_radar_page.nl.chart_infection_radar_age_groups.title,LWiFeXKdw2GKCaPW8IXMfE,__
2023-08-28T09:46:49.689Z,delete,pages.infection_radar_page.nl.chart_self_tests.description,NMSA8CUHhzxbsw88WW5eGT,__
2023-08-28T09:46:49.689Z,delete,pages.infection_radar_page.nl.chart_self_tests.title,uHFfJYJkKtXC1Rsty3FUMv,__
2023-08-28T09:46:49.689Z,delete,pages.infection_radar_page.nl.chart_self_tests.tooltip_label,LWiFeXKdw2GKCaPW8IXkmE,__
2023-08-28T09:46:49.690Z,delete,pages.infection_radar_page.nl.dates,NMSA8CUHhzxbsw88WW5eNg,__
2023-08-28T09:46:49.690Z,delete,pages.infection_radar_page.nl.description,wJsqoXQkxXB7L62AucKpZ2,__
2023-08-28T09:46:49.691Z,delete,pages.infection_radar_page.nl.infected_per_age_group.legend.percentage_0_24,UeL7Fz3Aoju4f93F3ItCwk,__
2023-08-28T09:46:49.691Z,delete,pages.infection_radar_page.nl.infected_per_age_group.legend.percentage_25_39,wJsqoXQkxXB7L62AucKpnU,__
2023-08-28T09:46:49.691Z,delete,pages.infection_radar_page.nl.infected_per_age_group.legend.percentage_40_49,UeL7Fz3Aoju4f93F3ItD5A,__
2023-08-28T09:46:49.692Z,delete,pages.infection_radar_page.nl.infected_per_age_group.legend.percentage_50_59,wJsqoXQkxXB7L62AucKpyK,__
2023-08-28T09:46:49.692Z,delete,pages.infection_radar_page.nl.infected_per_age_group.legend.percentage_60_69,eMbA161XQE47KFPnazYrKr,__
2023-08-28T09:46:49.692Z,delete,pages.infection_radar_page.nl.infected_per_age_group.legend.percentage_70_plus,UeL7Fz3Aoju4f93F3ItDGO,__
2023-08-28T09:46:49.693Z,delete,pages.infection_radar_page.nl.infected_per_age_group.legend.percentage_average,uHFfJYJkKtXC1Rsty3FUcP,__
2023-08-28T09:46:49.693Z,delete,pages.infection_radar_page.nl.infected_per_age_group.legend_help_text,UeL7Fz3Aoju4f93F3ItDRc,__
2023-08-28T09:46:49.693Z,delete,pages.infection_radar_page.nl.infected_per_age_group.line_chart_legend_inaccurate_label,NMSA8CUHhzxbsw88WW5eZh,__
2023-08-28T09:46:49.694Z,delete,pages.infection_radar_page.nl.infected_per_age_group.tooltip_labels.inaccurate,eMbA161XQE47KFPnazYrXg,__
2023-08-28T09:46:49.694Z,delete,pages.infection_radar_page.nl.infected_per_age_group.value_annotation,LWiFeXKdw2GKCaPW8IXlCC,__
2023-08-28T09:46:49.694Z,delete,pages.infection_radar_page.nl.metadata.description,LWiFeXKdw2GKCaPW8IXlNK,__
2023-08-28T09:46:49.695Z,delete,pages.infection_radar_page.nl.metadata.title,uHFfJYJkKtXC1Rsty3FUrt,__
2023-08-28T09:46:49.695Z,delete,pages.infection_radar_page.nl.reference.href,uHFfJYJkKtXC1Rsty3FV7N,__
2023-08-28T09:46:49.696Z,delete,pages.infection_radar_page.nl.sources.rivm.aria_text,uHFfJYJkKtXC1Rsty3FVMr,__
2023-08-28T09:46:49.696Z,delete,pages.infection_radar_page.nl.sources.rivm.download,LWiFeXKdw2GKCaPW8IXlYS,__
2023-08-28T09:46:49.697Z,delete,pages.infection_radar_page.nl.sources.rivm.href,LWiFeXKdw2GKCaPW8IXlja,__
2023-08-28T09:46:49.697Z,delete,pages.infection_radar_page.nl.sources.rivm.text,NMSA8CUHhzxbsw88WW5eli,__
2023-08-28T09:46:49.697Z,delete,pages.infection_radar_page.nl.sources.self_test.aria_text,UeL7Fz3Aoju4f93F3ItDa2,__
2023-08-28T09:46:49.698Z,delete,pages.infection_radar_page.nl.sources.self_test.download,uHFfJYJkKtXC1Rsty3FVmf,__
2023-08-28T09:46:49.698Z,delete,pages.infection_radar_page.nl.sources.self_test.href,eMbA161XQE47KFPnazYrkV,__
2023-08-28T09:46:49.698Z,delete,pages.infection_radar_page.nl.sources.self_test.text,UeL7Fz3Aoju4f93F3ItDiS,__
2023-08-28T09:46:49.699Z,delete,pages.infection_radar_page.nl.title,NMSA8CUHhzxbsw88WXalQv,__
2023-08-28T10:03:46.622Z,add,pages.infectie_radar_page.nl.infection_radar_infected_per_age_group.legend.percentage_0_24,UeL7Fz3Aoju4f93F3Kg7ZG,__
2023-08-28T10:03:47.681Z,add,pages.infectie_radar_page.nl.infection_radar_infected_per_age_group.legend.percentage_25_39,eMbA161XQE47KFPnb2XbpU,__
2023-08-28T10:03:48.685Z,add,pages.infectie_radar_page.nl.infection_radar_infected_per_age_group.legend.percentage_40_49,wJsqoXQkxXB7L62AueaCHw,__
2023-08-28T10:03:49.684Z,add,pages.infectie_radar_page.nl.infection_radar_infected_per_age_group.legend.percentage_50_59,eMbA161XQE47KFPnb2Xc2J,__
2023-08-28T10:03:50.698Z,add,pages.infectie_radar_page.nl.infection_radar_infected_per_age_group.legend.percentage_60_69,wJsqoXQkxXB7L62AueaCdc,__
2023-08-28T10:03:51.698Z,add,pages.infectie_radar_page.nl.infection_radar_infected_per_age_group.legend.percentage_70_plus,LWiFeXKdw2GKCaPW8KhdQ4,__
2023-08-28T10:03:52.739Z,add,pages.infectie_radar_page.nl.infection_radar_infected_per_age_group.legend.percentage_average,UeL7Fz3Aoju4f93F3Kg7nI,__
2023-08-28T10:03:53.737Z,add,pages.infectie_radar_page.nl.infection_radar_infected_per_age_group.legend_help_text,UeL7Fz3Aoju4f93F3Kg7vi,__
2023-08-28T10:03:54.750Z,add,pages.infectie_radar_page.nl.infection_radar_infected_per_age_group.line_chart_legend_inaccurate_label,UeL7Fz3Aoju4f93F3Kg848,__
2023-08-28T10:03:55.830Z,add,pages.infectie_radar_page.nl.infection_radar_infected_per_age_group.tooltip_labels.inaccurate,uHFfJYJkKtXC1Rsty6jbUj,__
2023-08-28T10:03:56.818Z,add,pages.infectie_radar_page.nl.infection_radar_infected_per_age_group.value_annotation,eMbA161XQE47KFPnb2XcJP,__
2023-08-28T10:03:56.818Z,delete,pages.infectie_radar_page.nl.infected_per_age_group.legend.percentage_0_24,eMbA161XQE47KFPnb2XHpy,__
2023-08-28T10:03:56.819Z,delete,pages.infectie_radar_page.nl.infected_per_age_group.legend.percentage_25_39,eMbA161XQE47KFPnb2XI2n,__
2023-08-28T10:03:56.819Z,delete,pages.infectie_radar_page.nl.infected_per_age_group.legend.percentage_40_49,UeL7Fz3Aoju4f93F3KfzC4,__
2023-08-28T10:03:56.819Z,delete,pages.infectie_radar_page.nl.infected_per_age_group.legend.percentage_50_59,NMSA8CUHhzxbsw88WXasFt,__
2023-08-28T10:03:56.820Z,delete,pages.infectie_radar_page.nl.infected_per_age_group.legend.percentage_60_69,UeL7Fz3Aoju4f93F3KfzKU,__
2023-08-28T10:03:56.820Z,delete,pages.infectie_radar_page.nl.infected_per_age_group.legend.percentage_70_plus,NMSA8CUHhzxbsw88WXasN6,__
2023-08-28T10:03:56.820Z,delete,pages.infectie_radar_page.nl.infected_per_age_group.legend.percentage_average,LWiFeXKdw2GKCaPW8KhWBC,__
2023-08-28T10:03:56.820Z,delete,pages.infectie_radar_page.nl.infected_per_age_group.legend_help_text,eMbA161XQE47KFPnb2XIfG,__
2023-08-28T10:03:56.821Z,delete,pages.infectie_radar_page.nl.infected_per_age_group.line_chart_legend_inaccurate_label,wJsqoXQkxXB7L62Auea2cC,__
2023-08-28T10:03:56.821Z,delete,pages.infectie_radar_page.nl.infected_per_age_group.tooltip_labels.inaccurate,LWiFeXKdw2GKCaPW8KhWMK,__
2023-08-28T10:03:56.821Z,delete,pages.infectie_radar_page.nl.infected_per_age_group.value_annotation,wJsqoXQkxXB7L62Auea2n2,__
Loading