feature/COR-1784_COR-1801_vaccinations-modifications (#4887)

* feat(COR-1801): Finalized ticket * fix(zks-graphs): Fixed range dates to date (#4865) * fix(zks-graphs): Fixed range dates to date * fix(1806): Updated documentation * task: Remove add new document button in navbar (#4868) * Feature/cor 1563 refactor text keys in kpi to markdown (#4867) * fix: deleted unused component * fix: Create markdown consistency in KPI tiles * Bugfix/cor 1769 variants table and graph 2 (#4870) * fix(COR-1769): Removed keys from schemas * fix(COR-1769): Removed historical significance key * fix(COR-1769): Update getter functions * fix(COR-1769): Remove unused code from variants chart * fix(COR-1769): Re-add destructuring based on suggestion --------- Co-authored-by: VWSCoronaDashboard29 <[email protected]> * feat(COR-1784): Update schemas to match protos * feat(COR-1784): Update schemas to protos and fix * feat(COR-1784): Update branch to match old branch * feat(COR-1784): Update schema titles * feat(COR-1784): Adapt vaccine campaign tiles * feat(COR-1784): Made vaccine coverage generic * feat(COR-1784): Streamline hook * feat(COR-1784): Split autumn vaccine per age group table * feat(COR-1784): Add primary series choropleth and fix keys * feat(COR-1784): Add campaign banner component * task: Apply changes from COR-1788 * feat(COR-1784): Add campaign hero * feat(COR-1784): Update vaccine colours * feat(COR-1784): Remove barrel files * feat(COR-1784): Update schema to match protos * feat(COR-1784): Update conditional display based on feedback * feat(COR-1784): Add newline in schemafile * feat(COR-1784): Removed type indication in coverage-per-age-group * feat(COR-1784): Centralize styling * fix(COR-1784): Update types to new schemanames * feat(COR-1784): Reverted conditional component based on feedback * feat(COR-1784): Update schemas and datatypes to match protos * feat(COR-1801): Replaced the protos actual values * feat(COR-1801): Fixed typecheck issues and adjusted the municipality page * feat(COR-1784): Update vaccines page to new designs spec * feat(COR-1784): Update pageinfo block for primary series * task(COR-1784): Check in sanity key mutations * refactor(COR-1784): Refactor name from feedback * fix(COR-1784): Change date of primary series pageinfo * fix(COR-1784): Add optional to metadata * refactor(COR-1784/COR-1801): Refactored generic types usage * refactor(COR-1784/COR-1801): refactored ternary operator * refactor(COR-1784/COR-1801): Refactored the vaccine-campaign-tile * refactor(COR-1784/COR-1801): Refactored campaign banner * refactor(COR-1784/COR-1801): Refactor schemanames * fix(COR-1784/COR-1801): Fix feature flags * fix(COR-1784/COR-1801): Fix choropleth validation * refactor(COR-1784/COR-1801): Refactored schema names --------- Co-authored-by: J <[email protected]> Co-authored-by: VWSCoronaDashboard29 <[email protected]> Co-authored-by: VWSCoronaDashboard29 <[email protected]> Co-authored-by: beek <[email protected]> Co-authored-by: VWSCoronaDashboard29 <B>
minvws · Oct 2, 2023 · e960c78 · e960c78
1 parent ce5c2a3
commit e960c78
Show file tree

Hide file tree

Showing 53 changed files with 1,070 additions and 590 deletions.
diff --git a/packages/app/public/images/Najaarsronde-coronaprik-hero.svg b/packages/app/public/images/Najaarsronde-coronaprik-hero.svg
diff --git a/packages/app/schema/archived_gm/__index.json b/packages/app/schema/archived_gm/__index.json
@@ -14,6 +14,7 @@
     "name",
     "vaccine_coverage_per_age_group_archived_20220622",
     "vaccine_coverage_per_age_group_archived_20220908",
+    "vaccine_coverage_per_age_group_archived_20231004",
     "tested_overall_archived_20230331"
   ],
   "properties": {
@@ -41,6 +42,9 @@
     "vaccine_coverage_per_age_group_archived_20220908": {
       "$ref": "vaccine_coverage_per_age_group_with_booster_shot.json"
     },
+    "vaccine_coverage_per_age_group_archived_20231004": {
+      "$ref": "vaccinaties/vaccine_campaign_coverage_per_age_group.json"
+    },
     "booster_coverage_archived_20220904": {
       "$ref": "booster_coverage.json"
     },

diff --git a/...ma/gm/vaccine_coverage_per_age_group.json → ...cine_campaign_coverage_per_age_group.json b/...ma/gm/vaccine_coverage_per_age_group.json → ...cine_campaign_coverage_per_age_group.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "gm_vaccine_coverage_per_age_group",
+  "title": "archived_gm_vaccine_campaign_coverage_per_age_group",
   "type": "object",
   "required": ["values"],
   "additionalProperties": false,
@@ -14,7 +14,7 @@
   },
   "definitions": {
     "value": {
-      "title": "gm_vaccine_coverage_per_age_group_value",
+      "title": "archived_gm_vaccine_campaign_coverage_per_age_group_value",
       "additionalProperties": false,
       "type": "object",
       "required": [

diff --git a/packages/app/schema/archived_gm_collection/__index.json b/packages/app/schema/archived_gm_collection/__index.json
@@ -3,7 +3,16 @@
   "type": "object",
   "title": "archived_gm_collection",
   "additionalProperties": false,
-  "required": ["last_generated", "proto_name", "name", "code", "hospital_nice_choropleth_archived_20230830", "sewer_archived_20230623", "tested_overall_archived_20230331"],
+  "required": [
+    "last_generated",
+    "proto_name",
+    "name",
+    "code",
+    "hospital_nice_choropleth_archived_20230830",
+    "sewer_archived_20230623",
+    "tested_overall_archived_20230331",
+    "vaccine_coverage_per_age_group_choropleth_archived_20231004"
+  ],
   "properties": {
     "last_generated": {
       "type": "string"
@@ -40,6 +49,14 @@
       "items": {
         "$ref": "positive_tests/tested_overall.json"
       }
+    },
+    "vaccine_coverage_per_age_group_choropleth_archived_20231004": {
+      "type": "array",
+      "minItems": 684,
+      "maxItems": 684,
+      "items": {
+        "$ref": "vaccine_coverage_per_age_group_choropleth.json"
+      }
     }
   },
   "$defs": {

diff --git a/...ction/vaccine_coverage_per_age_group.json → ...ction/vaccine_coverage_per_age_group.json b/...ction/vaccine_coverage_per_age_group.json → ...ction/vaccine_coverage_per_age_group.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "gm_collection_vaccine_coverage_per_age_group",
+  "title": "archived_gm_collection_vaccine_coverage_per_age_group",
   "type": "object",
   "additionalProperties": false,
   "required": [

diff --git a/packages/app/schema/archived_gm_collection/vaccine_coverage_per_age_group_choropleth.json b/packages/app/schema/archived_gm_collection/vaccine_coverage_per_age_group_choropleth.json
@@ -0,0 +1,69 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "archived_gm_collection_vaccine_coverage_per_age_group_choropleth",
+  "type": "object",
+  "additionalProperties": false,
+  "required": [
+    "gmcode",
+    "vaccination_type",
+    "birthyear_range_12_plus",
+    "birthyear_range_18_plus",
+    "birthyear_range_60_plus",
+    "vaccinated_percentage_12_plus",
+    "vaccinated_percentage_12_plus_label",
+    "vaccinated_percentage_18_plus",
+    "vaccinated_percentage_18_plus_label",
+    "vaccinated_percentage_60_plus",
+    "vaccinated_percentage_60_plus_label",
+    "date_of_insertion_unix",
+    "date_unix"
+  ],
+  "properties": {
+    "gmcode": {
+      "type": "string",
+      "pattern": "^GM[0-9]+$"
+    },
+    "vaccination_type": {
+      "type": "string"
+    },
+    "birthyear_range_12_plus": {
+      "type": "string",
+      "pattern": "^[0-9]{4}-[0-9]{4}$|^-[0-9]{4}$|^[0-9]{4}-$"
+    },
+    "birthyear_range_18_plus": {
+      "type": "string",
+      "pattern": "^[0-9]{4}-[0-9]{4}$|^-[0-9]{4}$|^[0-9]{4}-$"
+    },
+    "birthyear_range_60_plus": {
+      "type": ["string", "null"],
+      "pattern": "^[0-9]{4}-[0-9]{4}$|^-[0-9]{4}$|^[0-9]{4}-$"
+    },
+    "vaccinated_percentage_12_plus": {
+      "type": ["number", "null"]
+    },
+    "vaccinated_percentage_12_plus_label": {
+      "type": ["string", "null"],
+      "pattern": "^([><][=][0-9]{1,2})$"
+    },
+    "vaccinated_percentage_18_plus": {
+      "type": ["number", "null"]
+    },
+    "vaccinated_percentage_18_plus_label": {
+      "type": ["string", "null"],
+      "pattern": "^([><][=][0-9]{1,2})$"
+    },
+    "vaccinated_percentage_60_plus": {
+      "type": ["number", "null"]
+    },
+    "vaccinated_percentage_60_plus_label": {
+      "type": ["string", "null"],
+      "pattern": "^([><][=][0-9]{1,2})$"
+    },
+    "date_unix": {
+      "type": "integer"
+    },
+    "date_of_insertion_unix": {
+      "type": "integer"
+    }
+  }
+}
diff --git a/packages/app/schema/archived_nl/__index.json b/packages/app/schema/archived_nl/__index.json
@@ -22,20 +22,31 @@
     "nursing_home_archived_20230126",
     "reproduction_archived_20230711",
     "sewer_archived_20230623",
-    "vaccine_campaigns_archived_20220908",
-    "vaccine_planned_archived_20220908",
+    "vaccine_administered_archived_20220914",
+    "vaccine_administered_doctors_archived_20220324",
+    "vaccine_administered_ggd_archived_20220324",
+    "vaccine_administered_ggd_ghor_archived_20220324",
+    "vaccine_administered_hospitals_and_care_institutions_archived_20220324",
+    "vaccine_administered_planned_archived_20220518",
+    "vaccine_administered_total_archived_20220324",
+    "vaccine_coverage_archived_20220518",
     "vaccine_coverage_per_age_group_archived_20220622",
     "vaccine_coverage_per_age_group_archived_20220908",
+    "vaccine_coverage_per_age_group_archived_20231004",
     "vaccine_coverage_per_age_group_estimated_archived_20220908",
+    "vaccine_coverage_per_age_group_estimated_autumn_2022_archived_20231004",
+    "vaccine_coverage_per_age_group_estimated_fully_vaccinated_archived_20231004",
+    "vaccine_campaigns_archived_20220908",
+    "vaccine_campaigns_archived_20231004",
+    "vaccine_planned_archived_20220908",
+    "vaccine_vaccinated_or_support_archived_20230411",
+    "vaccine_delivery_per_supplier_archived_20211101",
+    "vaccine_stock_archived_20211024",
     "tested_ggd_archived_20230321",
     "tested_overall_archived_20230331",
     "tested_per_age_group_archived_20230331",
     "vulnerable_hospital_admissions_archived_20230711",
     "vulnerable_nursing_home_archived_20230711",
-    "vaccine_vaccinated_or_support_archived_20230411",
-    "vaccine_coverage_archived_20220518",
-    "vaccine_delivery_per_supplier_archived_20211101",
-    "vaccine_stock_archived_20211024",
     "repeating_shot_administered_20220713",
     "corona_melder_app_warning_archived_20220421",
     "corona_melder_app_download_archived_20220421",
@@ -107,7 +118,10 @@
       "$ref": "sewer.json"
     },
     "vaccine_campaigns_archived_20220908": {
-      "$ref": "vaccine_campaigns.json"
+      "$ref": "vaccine_campaigns_2022.json"
+    },
+    "vaccine_campaigns_archived_20231004": {
+      "$ref": "vaccine_campaigns_2023.json"
     },
     "vaccine_planned_archived_20220908": {
       "$ref": "vaccine_planned.json"
@@ -133,9 +147,39 @@
     "vaccine_vaccinated_or_support_archived_20230411": {
       "$ref": "vaccine_vaccinated_or_support.json"
     },
+    "vaccine_administered_archived_20220914": {
+      "$ref": "vaccine_administered.json"
+    },
+    "vaccine_administered_doctors_archived_20220324": {
+      "$ref": "vaccine_administered_doctors.json"
+    },
+    "vaccine_administered_ggd_ghor_archived_20220324": {
+      "$ref": "vaccine_administered_ggd_ghor.json"
+    },
+    "vaccine_administered_ggd_archived_20220324": {
+      "$ref": "vaccine_administered_ggd.json"
+    },
+    "vaccine_administered_hospitals_and_care_institutions_archived_20220324": {
+      "$ref": "vaccine_administered_hospitals_and_care_institutions.json"
+    },
+    "vaccine_administered_total_archived_20220324": {
+      "$ref": "vaccine_administered_total.json"
+    },
+    "vaccine_administered_planned_archived_20220518": {
+      "$ref": "vaccine_administered_planned.json"
+    },
     "vaccine_coverage_archived_20220518": {
       "$ref": "vaccine_coverage.json"
     },
+    "vaccine_coverage_per_age_group_archived_20231004": {
+      "$ref": "vaccinaties/vaccine_coverage_per_age_group.json"
+    },
+    "vaccine_coverage_per_age_group_estimated_autumn_2022_archived_20231004": {
+      "$ref": "vaccine_coverage_per_age_group_estimated_autumn_2022.json"
+    },
+    "vaccine_coverage_per_age_group_estimated_fully_vaccinated_archived_20231004": {
+      "$ref": "vaccine_coverage_per_age_group_estimated_fully_vaccinated.json"
+    },
     "vaccine_delivery_per_supplier_archived_20211101": {
       "$ref": "vaccine_delivery_per_supplier.json"
     },

diff --git a/...ma/nl/vaccine_coverage_per_age_group.json → ...aties/vaccine_coverage_per_age_group.json b/...ma/nl/vaccine_coverage_per_age_group.json → ...aties/vaccine_coverage_per_age_group.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "nl_vaccine_coverage_per_age_group",
+  "title": "archived_nl_vaccine_coverage_per_age_group_autumn_2022",
   "type": "object",
   "required": ["values"],
   "additionalProperties": false,
@@ -14,7 +14,7 @@
   },
   "definitions": {
     "value": {
-      "title": "nl_vaccine_coverage_per_age_group_value",
+      "title": "archived_nl_vaccine_coverage_per_age_group_value",
       "additionalProperties": false,
       "type": "object",
       "required": [
@@ -33,17 +33,7 @@
       "properties": {
         "age_group_range": {
           "type": "string",
-          "enum": [
-            "5-11",
-            "12-17",
-            "18-29",
-            "30-39",
-            "40-49",
-            "50-59",
-            "60-69",
-            "70-79",
-            "80+"
-          ]
+          "enum": ["5-11", "12-17", "18-29", "30-39", "40-49", "50-59", "60-69", "70-79", "80+"]
         },
         "age_group_percentage": {
           "type": "number"
@@ -52,7 +42,7 @@
           "type": "integer"
         },
         "autumn_2022_vaccinated": {
-          "type":["integer", "null"]
+          "type": ["integer", "null"]
         },
         "fully_vaccinated": {
           "type": "integer"

diff --git a/...s/app/schema/nl/vaccine_administered.json → ...ema/archived_nl/vaccine_administered.json b/...s/app/schema/nl/vaccine_administered.json → ...ema/archived_nl/vaccine_administered.json
diff --git a/...hema/nl/vaccine_administered_doctors.json → ...ived_nl/vaccine_administered_doctors.json b/...hema/nl/vaccine_administered_doctors.json → ...ived_nl/vaccine_administered_doctors.json
diff --git a/...p/schema/nl/vaccine_administered_ggd.json → ...archived_nl/vaccine_administered_ggd.json b/...p/schema/nl/vaccine_administered_ggd.json → ...archived_nl/vaccine_administered_ggd.json
diff --git a/...ema/nl/vaccine_administered_ggd_ghor.json → ...ved_nl/vaccine_administered_ggd_ghor.json b/...ema/nl/vaccine_administered_ggd_ghor.json → ...ved_nl/vaccine_administered_ggd_ghor.json
diff --git a/...ered_hospitals_and_care_institutions.json → ...ered_hospitals_and_care_institutions.json b/...ered_hospitals_and_care_institutions.json → ...ered_hospitals_and_care_institutions.json
diff --git a/...hema/nl/vaccine_administered_planned.json → ...ived_nl/vaccine_administered_planned.json b/...hema/nl/vaccine_administered_planned.json → ...ived_nl/vaccine_administered_planned.json
diff --git a/...schema/nl/vaccine_administered_total.json → ...chived_nl/vaccine_administered_total.json b/...schema/nl/vaccine_administered_total.json → ...chived_nl/vaccine_administered_total.json
diff --git a/...schema/archived_nl/vaccine_campaigns.json → ...a/archived_nl/vaccine_campaigns_2022.json b/...schema/archived_nl/vaccine_campaigns.json → ...a/archived_nl/vaccine_campaigns_2022.json
@@ -1,7 +1,7 @@
 {
   "definitions": {
     "vaccine_campaign": {
-      "title": "archived_nl_vaccine_campaigns",
+      "title": "archived_nl_vaccine_campaigns_2022",
       "type": "object",
       "required": ["vaccine_campaign_order", "vaccine_campaign_name_nl", "vaccine_campaign_name_en", "vaccine_administered_total", "vaccine_administered_last_week"],
       "additionalProperties": false,
@@ -25,7 +25,7 @@
     }
   },
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "archived_nl_vaccine_campaigns",
+  "title": "archived_nl_vaccine_campaigns_2022",
   "type": "object",
   "required": ["vaccine_campaigns", "date_unix", "date_start_unix", "date_end_unix", "date_of_insertion_unix"],
   "additionalProperties": false,

diff --git a/packages/app/schema/archived_nl/vaccine_campaigns_2023.json b/packages/app/schema/archived_nl/vaccine_campaigns_2023.json
@@ -0,0 +1,52 @@
+{
+  "definitions": {
+    "vaccine_campaign": {
+      "title": "archived_nl_vaccine_campaign_2023",
+      "type": "object",
+      "required": ["vaccine_campaign_order", "vaccine_campaign_name_nl", "vaccine_campaign_name_en", "vaccine_administered_total", "vaccine_administered_last_timeframe"],
+      "additionalProperties": false,
+      "properties": {
+        "vaccine_campaign_order": {
+          "type": "integer"
+        },
+        "vaccine_campaign_name_nl": {
+          "type": "string"
+        },
+        "vaccine_campaign_name_en": {
+          "type": "string"
+        },
+        "vaccine_administered_total": {
+          "type": "integer"
+        },
+        "vaccine_administered_last_timeframe": {
+          "type": "integer"
+        }
+      }
+    }
+  },
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "archived_nl_vaccine_campaign_2023",
+  "type": "object",
+  "required": ["vaccine_campaigns", "date_unix", "date_start_unix", "date_end_unix", "date_of_insertion_unix"],
+  "additionalProperties": false,
+  "properties": {
+    "vaccine_campaigns": {
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/vaccine_campaign"
+      }
+    },
+    "date_unix": {
+      "type": "integer"
+    },
+    "date_start_unix": {
+      "type": "integer"
+    },
+    "date_end_unix": {
+      "type": "integer"
+    },
+    "date_of_insertion_unix": {
+      "type": "integer"
+    }
+  }
+}
diff --git a/packages/app/schema/archived_nl/vaccine_coverage_per_age_group.json b/packages/app/schema/archived_nl/vaccine_coverage_per_age_group.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "archived_nl_vaccine_coverage_per_age_group",
+  "title": "archived_nl_vaccine_coverage_per_age_group_primary_series_and_booster",
   "type": "object",
   "required": ["values"],
   "additionalProperties": false,

diff --git a/..._per_age_group_estimated_autumn_2022.json → ..._per_age_group_estimated_autumn_2022.json b/..._per_age_group_estimated_autumn_2022.json → ..._per_age_group_estimated_autumn_2022.json
diff --git a/...age_group_estimated_fully_vaccinated.json → ...age_group_estimated_fully_vaccinated.json b/...age_group_estimated_fully_vaccinated.json → ...age_group_estimated_fully_vaccinated.json
diff --git a/packages/app/schema/gm/__index.json b/packages/app/schema/gm/__index.json
@@ -3,19 +3,7 @@
   "type": "object",
   "title": "gm",
   "additionalProperties": false,
-  "required": [
-    "name",
-    "proto_name",
-    "code",
-    "difference",
-    "static_values",
-    "hospital_nice",
-    "sewer_installation_measurement",
-    "sewer_per_installation",
-    "sewer",
-    "vaccine_coverage_per_age_group",
-    "last_generated"
-  ],
+  "required": ["name", "proto_name", "code", "difference", "static_values", "hospital_nice", "sewer_installation_measurement", "sewer_per_installation", "sewer", "last_generated"],
   "properties": {
     "last_generated": {
       "type": "string"
@@ -46,9 +34,6 @@
     },
     "sewer_installation_measurement": {
       "$ref": "sewer_installation_measurement.json"
-    },
-    "vaccine_coverage_per_age_group": {
-      "$ref": "vaccine_coverage_per_age_group.json"
     }
   },
   "$defs": {