diff --git a/packages/app/src/domain/layout/logic/types.ts b/packages/app/src/domain/layout/logic/types.ts
index 9fe177adf1..40013040df 100644
--- a/packages/app/src/domain/layout/logic/types.ts
+++ b/packages/app/src/domain/layout/logic/types.ts
@@ -27,6 +27,7 @@ export type VrItemKeys =
| 'vaccinations';
export type VrCategoryKeys =
+ | 'archived_metrics'
| 'behaviour'
| 'early_indicators'
| 'hospitals'
diff --git a/packages/app/src/domain/layout/nl-layout.tsx b/packages/app/src/domain/layout/nl-layout.tsx
index 07444766b2..53ed72e1f4 100644
--- a/packages/app/src/domain/layout/nl-layout.tsx
+++ b/packages/app/src/domain/layout/nl-layout.tsx
@@ -45,13 +45,7 @@ export function NlLayout(props: NlLayoutProps) {
['hospitals', ['hospital_admissions', 'intensive_care_admissions']],
[
'infections',
- [
- 'positive_tests',
- 'reproduction_number',
- 'mortality',
- 'variants',
- 'source_investigation',
- ],
+ ['positive_tests', 'reproduction_number', 'mortality', 'variants'],
],
['behaviour', ['compliance']],
[
@@ -67,7 +61,12 @@ export function NlLayout(props: NlLayoutProps) {
map: [
[
'archived_metrics',
- ['coronamelder_app', 'infectious_people', 'general_practitioner_suspicions'],
+ [
+ 'source_investigation',
+ 'coronamelder_app',
+ 'infectious_people',
+ 'general_practitioner_suspicions',
+ ],
],
],
});
diff --git a/packages/app/src/domain/layout/vr-layout.tsx b/packages/app/src/domain/layout/vr-layout.tsx
index 20bd04bed0..74c9c69ec2 100644
--- a/packages/app/src/domain/layout/vr-layout.tsx
+++ b/packages/app/src/domain/layout/vr-layout.tsx
@@ -70,7 +70,7 @@ export function VrLayout(props: VrLayoutProps) {
map: [
['vaccinations', ['vaccinations']],
['hospitals', ['hospital_admissions']],
- ['infections', ['positive_tests', 'mortality', 'source_investigation']],
+ ['infections', ['positive_tests', 'mortality']],
['behaviour', ['compliance']],
[
'vulnerable_groups',
@@ -80,6 +80,12 @@ export function VrLayout(props: VrLayoutProps) {
],
});
+ const archivedItems = useSidebar({
+ layout: 'vr',
+ code: code,
+ map: [['archived_metrics', ['source_investigation']]],
+ });
+
return (
<>
@@ -144,6 +150,17 @@ export function VrLayout(props: VrLayoutProps) {
+
+
+
+
)}
diff --git a/packages/app/src/pages/landelijk/brononderzoek.tsx b/packages/app/src/pages/landelijk/brononderzoek.tsx
index 66645c3ae5..a46be035a3 100644
--- a/packages/app/src/pages/landelijk/brononderzoek.tsx
+++ b/packages/app/src/pages/landelijk/brononderzoek.tsx
@@ -1,11 +1,12 @@
import { Gedrag } from '@corona-dashboard/icons';
+import { isEmpty } from 'lodash';
import { GetStaticPropsContext } from 'next';
-import { PageInformationBlock } from '~/components/page-information-block';
-import { TileList } from '~/components/tile-list';
+import { PageInformationBlock, TileList, WarningTile } from '~/components';
import { Layout } from '~/domain/layout/layout';
import { NlLayout } from '~/domain/layout/nl-layout';
import { SituationsDataCoverageChoroplethTile } from '~/domain/situations/situations-data-coverage-choropleth-tile';
import { SituationsOverviewChoroplethTile } from '~/domain/situations/situations-overview-choropleth-tile';
+import { useIntl } from '~/intl';
import { Languages } from '~/locale';
import {
getArticleParts,
@@ -63,6 +64,7 @@ export default function BrononderzoekPage(
const { pageText, choropleth, lastGenerated, content } = props;
const { caterogyTexts, metadataTexts, textShared, textChoroplethTooltips } =
pageText;
+ const { commonTexts } = useIntl();
const metadata = {
...metadataTexts,
@@ -77,7 +79,7 @@ export default function BrononderzoekPage(
}
@@ -95,6 +97,15 @@ export default function BrononderzoekPage(
articles={content.articles}
/>
+ {textShared.belangrijk_bericht &&
+ !isEmpty(textShared.belangrijk_bericht) && (
+
+ )}
+
+ {textShared.belangrijk_bericht &&
+ !isEmpty(textShared.belangrijk_bericht) && (
+
+ )}
+