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

release/2.69.0 #4689

Merged
merged 26 commits into from
Mar 15, 2023
Merged
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
016efc3
Feature/cor 1335 automate sanity topical dates (#4659)
Jorrik-Klijnsma-Work Feb 15, 2023
730f510
bugfix(images): temporary revert to basic img element to see if that …
VWSCoronaDashboard26 Feb 15, 2023
27db2ab
feat: Remove more info section from NL behaviour page. (#4661)
APW26 Feb 17, 2023
78f1330
Revert "bugfix(images): temporary revert to basic img element to see …
VWSCoronaDashboard26 Feb 17, 2023
a799daf
Feature/COR-1392-text-gm-positive-tests-is-in-bold-should-be-normal-t…
APW26 Feb 20, 2023
aec0877
chore(deps): bump ua-parser-js from 0.7.31 to 0.7.33 (#4631)
dependabot[bot] Feb 21, 2023
d453d00
chore(deps): bump simple-git from 3.15.1 to 3.16.0 (#4629)
dependabot[bot] Feb 21, 2023
6bd2174
bugfix: Redirect 3 unpublished articles to all articles page (#4665)
APW26 Feb 22, 2023
ba6c454
Feature/cor 1336 add kpi value as variable to description (#4664)
Jorrik-Klijnsma-Work Feb 22, 2023
63515ff
fix: description and republishing (#4671)
Jorrik-Klijnsma-Work Feb 24, 2023
45bbdd6
feat: sync after release (#4674)
DariaKwork Feb 24, 2023
8b7c1c7
fix: description and republishing (#4671)
Jorrik-Klijnsma-Work Feb 24, 2023
d1674c8
feat: sync after release (#4674)
DariaKwork Feb 24, 2023
bae67bd
COR-1312 make link optional and remove right side (#4670)
Jorrik-Klijnsma-Work Feb 25, 2023
3a1ac22
fix: solve pipeline error (#4676)
Jorrik-Klijnsma-Work Feb 27, 2023
b723179
fix: update wrong casing for variable name (#4679)
Jorrik-Klijnsma-Work Feb 28, 2023
20b20a0
fix: PR feedback (#4678)
Jorrik-Klijnsma-Work Feb 28, 2023
f1d10ce
Chore/COR 1431 remove recommended advices (#4681)
Jorrik-Klijnsma-Work Mar 2, 2023
6bcff32
feature/COR-1435-hospitals-page-patient-influx-over-time-filter-null-…
VWSCoronaDashboard26 Mar 2, 2023
7d781b4
feature/COR-1455-remove-topical-page-measure-theme-components (#4682)
VWSCoronaDashboard26 Mar 8, 2023
b773fd8
Fix: remove redirects (#4685)
Jorrik-Klijnsma-Work Mar 9, 2023
e9c98d9
feat: manually cleaned unpublished keys (#4684)
DariaKwork Mar 9, 2023
15a1357
Task/cor 1063 sewer choropleth enhancements (#4686)
Jorrik-Klijnsma-Work Mar 15, 2023
a24b972
COR-1063 fix: removing collapsible (#4688)
Jorrik-Klijnsma-Work Mar 15, 2023
4944008
Merge branch 'develop' into release/2.69.0
VWSCoronaDashboard26 Mar 15, 2023
7fc8431
Merge branch 'master' into release/2.69.0
VWSCoronaDashboard26 Mar 15, 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
Prev Previous commit
Next Next commit
COR-1063 fix: removing collapsible (#4688)
* fix: removing collapsible

* fix: test feedback

* fix: weird autogenerated error
  • Loading branch information
Jorrik-Klijnsma-Work authored Mar 15, 2023
commit a24b97232107a9ea1fac22d9382ed84248f11f6d
3 changes: 2 additions & 1 deletion packages/app/src/domain/sewer/sewer-chart/sewer-chart.tsx
Original file line number Diff line number Diff line change
@@ -48,6 +48,7 @@ interface SewerChartProps {
dropdown_label_timeselection: string;
select_none_label: string;
};
rwziLabel?: string;
};
vrNameOrGmName?: string;
incompleteDatesAndTexts?: {
@@ -183,7 +184,7 @@ export const SewerChart = ({ accessibility, dataAverages, dataPerInstallation, t
{
type: 'line',
metricProperty: 'selected_installation_rna_normalized',
label: selectedInstallation,
label: text.rwziLabel ? `${text.rwziLabel} ${selectedInstallation}` : selectedInstallation,
color: colors.orange1,
},
{
11 changes: 1 addition & 10 deletions packages/app/src/pages/gemeente/[code]/rioolwater.tsx
Original file line number Diff line number Diff line change
@@ -2,7 +2,6 @@ import { NlSewer } from '@corona-dashboard/common';
import { Experimenteel, Rioolvirus } from '@corona-dashboard/icons';
import { isEmpty } from 'lodash';
import { GetStaticPropsContext } from 'next';
import { CollapsibleContent } from '~/components/collapsible';
import { KpiTile } from '~/components/kpi-tile';
import { KpiValue } from '~/components/kpi-value';
import { Markdown } from '~/components/markdown';
@@ -132,15 +131,6 @@ const SewerWater = (props: StaticProps<typeof getStaticProps>) => {
</Text>

<Markdown content={textGm.extra_uitleg} />

<CollapsibleContent label={commonTexts.gemeente_index.population_count_explanation_title}>
<Text>
{replaceComponentsInText(textGm.population_count_explanation, {
municipalityName: <strong>{municipalityName}</strong>,
value: <strong>{formatNumber(sewerAverages.last_value.average)}</strong>,
})}
</Text>
</CollapsibleContent>
</KpiTile>

<KpiTile
@@ -175,6 +165,7 @@ const SewerWater = (props: StaticProps<typeof getStaticProps>) => {
averagesTooltipLabel: commonTexts.common.charts.weekly_averages_label,
valueAnnotation: commonTexts.waarde_annotaties.riool_normalized,
rwziSelectDropdown: textGm.linechart_select,
rwziLabel: textShared.RWZI_label,
}}
vrNameOrGmName={municipalityName}
incompleteDatesAndTexts={textShared.zeewolde_incomplete_manualy_override}
3 changes: 2 additions & 1 deletion packages/cms/src/lokalize/key-mutations.csv
Original file line number Diff line number Diff line change
@@ -53,4 +53,5 @@ timestamp,action,key,document_id,move_to
2023-03-13T09:41:46.521Z,delete,pages.sewer_page.gm.linechart_select_rwzi.dropdown_label,XwwkMu8B8bd2jFtuxdHHPe,__
2023-03-13T09:41:46.521Z,delete,pages.sewer_page.gm.linechart_select_rwzi.select_none_label,SIWTfLRtzTv41yDNBWGVLm,__
2023-03-13T17:06:59.479Z,add,common.accessibility.charts.hospital_admissions_region_choropleth.description,YzrXb3vQYHnZxtu61Xgzap,__
2023-03-13T17:06:59.480Z,delete,accessibility.charts.hospital_admissions_region_choropleth.description,G1DXw0RdifOml06twMjbPq,__
2023-03-13T17:06:59.480Z,delete,accessibility.charts.hospital_admissions_region_choropleth.description,G1DXw0RdifOml06twMjbPq,__
2023-03-15T10:04:19.777Z,add,pages.sewer_page.shared.RWZI_label,3cSKlMyB5WS7AkuCg9V2sP,__