Archive page and add warning tile (#4260)

* feat(situationsPage): archive page and add warning tile * feat: added new key for warning
minvws · May 23, 2022 · 64861ee · 64861ee
1 parent 1ab4c1b
commit 64861ee
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 20 deletions.
diff --git 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
@@ -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
@@ -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 (
     <>
       <Head>
@@ -144,6 +150,17 @@ export function VrLayout(props: VrLayoutProps) {
                 <Menu spacing={2}>
                   <MenuRenderer items={items} />
                 </Menu>
+
+                <Box
+                  borderTopColor="border"
+                  borderTopStyle="solid"
+                  borderTopWidth={1}
+                  pt={3}
+                >
+                  <Menu>
+                    <MenuRenderer items={archivedItems} />
+                  </Menu>
+                </Box>
               </Box>
             )}
           </>

diff --git 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(
       <NlLayout>
         <TileList>
           <PageInformationBlock
-            category={caterogyTexts.category}
+            category={commonTexts.nationaal_layout.headings.archief}
             screenReaderCategory={caterogyTexts.screenReaderCategory}
             title={textShared.titel}
             icon={<Gedrag />}
@@ -95,6 +97,15 @@ export default function BrononderzoekPage(
             articles={content.articles}
           />
 
+          {textShared.belangrijk_bericht &&
+            !isEmpty(textShared.belangrijk_bericht) && (
+              <WarningTile
+                isFullWidth
+                message={textShared.belangrijk_bericht}
+                variant="emphasis"
+              />
+            )}
+
           <SituationsDataCoverageChoroplethTile
             data={choropleth.vr}
             text={textShared}

diff --git a/packages/app/src/pages/veiligheidsregio/[code]/brononderzoek.tsx b/packages/app/src/pages/veiligheidsregio/[code]/brononderzoek.tsx
@@ -1,13 +1,17 @@
 import { TimeframeOption } from '@corona-dashboard/common';
 import { Gedrag } from '@corona-dashboard/icons';
+import { isEmpty } from 'lodash';
 import { GetStaticPropsContext } from 'next';
-import { ChartTile } from '~/components/chart-tile';
-import { KpiTile } from '~/components/kpi-tile';
-import { KpiValue } from '~/components/kpi-value';
-import { Markdown } from '~/components/markdown';
-import { PageInformationBlock } from '~/components/page-information-block';
-import { TileList } from '~/components/tile-list';
-import { TwoKpiSection } from '~/components/two-kpi-section';
+import {
+  ChartTile,
+  WarningTile,
+  KpiTile,
+  KpiValue,
+  Markdown,
+  PageInformationBlock,
+  TileList,
+  TwoKpiSection,
+} from '~/components';
 import { InlineText, BoldText } from '~/components/typography';
 import { Layout } from '~/domain/layout/layout';
 import { VrLayout } from '~/domain/layout/vr-layout';
@@ -110,7 +114,7 @@ export default function BrononderzoekPage(
       <VrLayout vrName={vrName}>
         <TileList>
           <PageInformationBlock
-            category={commonTexts.nationaal_layout.headings.besmettingen}
+            category={commonTexts.nationaal_layout.headings.archief}
             screenReaderCategory={
               commonTexts.sidebar.metrics.source_investigation.title
             }
@@ -138,6 +142,15 @@ export default function BrononderzoekPage(
             warning={textShared.warning}
           />
 
+          {textShared.belangrijk_bericht &&
+            !isEmpty(textShared.belangrijk_bericht) && (
+              <WarningTile
+                isFullWidth
+                message={textShared.belangrijk_bericht}
+                variant="emphasis"
+              />
+            )}
+
           <TwoKpiSection>
             <SituationsDataCoverageTile
               data={lastValue}

diff --git a/packages/cms/src/lokalize/key-mutations.csv b/packages/cms/src/lokalize/key-mutations.csv
@@ -32,3 +32,4 @@ timestamp,action,key,document_id,move_to
 2022-05-09T08:58:28.088Z,move,accessibility.charts.hospital_admissions_region_choropleth.description,G1DXw0RdifOml06twMjbPq,common.accessibility.charts.hospital_admissions_region_choropleth.description
 2022-05-12T07:55:42.658Z,delete,common.charts.time_controls.firstOfSeptember,A5Y41hFe5J3wNnB7O7FFlP,__
 2022-05-17T11:30:05.964Z,delete,pages.vaccinationsPage.nl.booster_kpi.booster_shot_last_seven_days.description,W42pYebYgNKSplnOwA9UMB,__
+2022-05-23T10:24:35.671Z,add,pages.situationsPage.shared.belangrijk_bericht,RQYRq9yqc5kuEd5capEHG3,__