From ee8ae1fd49f845b5c8de2a26a0f7edc3101cfb19 Mon Sep 17 00:00:00 2001
From: LR <107395524+VWSCoronaDashboard26@users.noreply.github.com>
Date: Mon, 19 Dec 2022 11:24:18 +0100
Subject: [PATCH] master (#4530)

Syncing master back to develop to keep the two branches up-to-date.
---
 packages/app/next.config.js                   |  2 +-
 .../schema/gm/hospital_nice_choropleth.json   | 45 +++++++++++++++++++
 .../schema/vr/hospital_nice_choropleth.json   | 45 +++++++++++++++++++
 .../src/components/combo-box/combo-box.tsx    |  1 +
 packages/app/src/components/trend-icon.tsx    |  2 +-
 .../domain/layout/components/gm-combo-box.tsx |  4 ++
 .../domain/layout/components/vr-combo-box.tsx |  1 +
 packages/cms/src/data/data-structure.ts       |  4 ++
 8 files changed, 102 insertions(+), 2 deletions(-)
 create mode 100644 packages/app/schema/gm/hospital_nice_choropleth.json
 create mode 100644 packages/app/schema/vr/hospital_nice_choropleth.json

diff --git a/packages/app/next.config.js b/packages/app/next.config.js
index 670b2ad80b..dc5dce6028 100644
--- a/packages/app/next.config.js
+++ b/packages/app/next.config.js
@@ -59,7 +59,7 @@ const nextConfig = {
   productionBrowserSourceMaps: true,
 
   webpack(config) {
-    config.optimization.chunkIds = 'named';
+    config.optimization.chunkIds = 'size';
     config.module.rules.push({
       test: /\.svg$/,
       type: 'asset',
diff --git a/packages/app/schema/gm/hospital_nice_choropleth.json b/packages/app/schema/gm/hospital_nice_choropleth.json
new file mode 100644
index 0000000000..96a0917a87
--- /dev/null
+++ b/packages/app/schema/gm/hospital_nice_choropleth.json
@@ -0,0 +1,45 @@
+{
+  "definitions": {
+    "value": {
+      "title": "gm_hospital_nice_choropleth_value",
+      "type": "object",
+      "additionalProperties": false,
+      "required": [
+        "admissions_on_date_of_admission",
+        "admissions_on_date_of_reporting",
+        "date_unix",
+        "date_of_insertion_unix"
+      ],
+      "properties": {
+        "date_unix": {
+          "type": "integer"
+        },
+        "admissions_on_date_of_admission": {
+          "type": "integer"
+        },
+        "admissions_on_date_of_reporting": {
+          "type": "integer"
+        },
+        "date_of_insertion_unix": {
+          "type": "integer"
+        }
+      }
+    }
+  },
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "gm_hospital_nice_choropleth",
+  "type": "object",
+  "required": ["values", "last_value"],
+  "additionalProperties": false,
+  "properties": {
+    "values": {
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/value"
+      }
+    },
+    "last_value": {
+      "$ref": "#/definitions/value"
+    }
+  }
+}
diff --git a/packages/app/schema/vr/hospital_nice_choropleth.json b/packages/app/schema/vr/hospital_nice_choropleth.json
new file mode 100644
index 0000000000..b382838a9b
--- /dev/null
+++ b/packages/app/schema/vr/hospital_nice_choropleth.json
@@ -0,0 +1,45 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "vr_hospital_nice_choropleth",
+  "type": "object",
+  "properties": {
+    "values": {
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/value"
+      }
+    },
+    "last_value": {
+      "$ref": "#/definitions/value"
+    }
+  },
+  "required": ["values", "last_value"],
+  "additionalProperties": false,
+  "definitions": {
+    "value": {
+      "title": "vr_hospital_nice_choropleth_value",
+      "type": "object",
+      "properties": {
+        "admissions_on_date_of_admission": {
+          "type": "integer"
+        },
+        "admissions_on_date_of_reporting": {
+          "type": "integer"
+        },
+        "date_unix": {
+          "type": "integer"
+        },
+        "date_of_insertion_unix": {
+          "type": "integer"
+        }
+      },
+      "required": [
+        "admissions_on_date_of_admission",
+        "admissions_on_date_of_reporting",
+        "date_unix",
+        "date_of_insertion_unix"
+      ],
+      "additionalProperties": false
+    }
+  }
+}
diff --git a/packages/app/src/components/combo-box/combo-box.tsx b/packages/app/src/components/combo-box/combo-box.tsx
index 771244ba6d..cae584b3b4 100644
--- a/packages/app/src/components/combo-box/combo-box.tsx
+++ b/packages/app/src/components/combo-box/combo-box.tsx
@@ -26,6 +26,7 @@ type TProps<Option extends TOption> = {
   options: Option[];
   placeholder: string;
   onSelect: (option: Option) => void;
+  sorter?: (a: Option, b: Option) => number;
   selectedOption?: Option;
 };
 
diff --git a/packages/app/src/components/trend-icon.tsx b/packages/app/src/components/trend-icon.tsx
index fb51f19d53..6cb7051455 100644
--- a/packages/app/src/components/trend-icon.tsx
+++ b/packages/app/src/components/trend-icon.tsx
@@ -30,7 +30,7 @@ export const TrendIcon = ({ trendDirection, ariaLabel, intensity = null, color =
 
   // Icon with intensity is used only on the homepage at the moment, for all other trend icons the default (below) are used.
   if (intensity && color && TrendDirection[trendDirection]) {
-    return <TrendIconWithIntensity color={color} direction={trendDirection} intensity={intensity} />;
+    return <TrendIconWithIntensity color={color} direction={trendDirection} intensity={intensity} aria-label={ariaLabelText} />;
   }
 
   switch (trendDirection) {
diff --git a/packages/app/src/domain/layout/components/gm-combo-box.tsx b/packages/app/src/domain/layout/components/gm-combo-box.tsx
index 90981d30bc..db997afd5d 100644
--- a/packages/app/src/domain/layout/components/gm-combo-box.tsx
+++ b/packages/app/src/domain/layout/components/gm-combo-box.tsx
@@ -15,6 +15,7 @@ export function GmComboBox(props: GmComboBoxProps) {
   const { commonTexts } = useIntl();
   const reverseRouter = useReverseRouter();
   const router = useRouter();
+  const expStr = new RegExp(["'s-"].join(' | '), 'g');
 
   return (
     <ComboBox
@@ -27,6 +28,9 @@ export function GmComboBox(props: GmComboBoxProps) {
             : reverseRouter.gm.index(gemcode)
         );
       }}
+      sorter={(a, b) =>
+        a.name.replace(expStr, '').localeCompare(b.name.replace(expStr, ''))
+      }
       selectedOption={gmData.find((gm) => gm.gemcode === selectedGmCode)}
     />
   );
diff --git a/packages/app/src/domain/layout/components/vr-combo-box.tsx b/packages/app/src/domain/layout/components/vr-combo-box.tsx
index b474a93cad..104d576605 100644
--- a/packages/app/src/domain/layout/components/vr-combo-box.tsx
+++ b/packages/app/src/domain/layout/components/vr-combo-box.tsx
@@ -27,6 +27,7 @@ export function VrComboBox(props: VrComboBoxProps) {
             : reverseRouter.vr.index(region.code)
         )
       }
+      sorter={(a, b) => a.name.localeCompare(b.name)}
       selectedOption={vrData.find((vr) => vr.code === selectedVrCode)}
     />
   );
diff --git a/packages/cms/src/data/data-structure.ts b/packages/cms/src/data/data-structure.ts
index 4998060e71..cc4603fdd1 100644
--- a/packages/cms/src/data/data-structure.ts
+++ b/packages/cms/src/data/data-structure.ts
@@ -304,6 +304,10 @@ export const dataStructure = {
       'admissions_on_date_of_admission_moving_average_rounded',
       'admissions_on_date_of_reporting',
     ],
+    hospital_nice_choropleth: [
+      "admissions_on_date_of_admission",
+      "admissions_on_date_of_reporting",
+    ],
     tested_ggd: [
       'infected',
       'infected_moving_average',